This commit was manufactured by cvs2svn to create branch 'new_xerces_work'.

Sprout from master 2002-05-21 00:13:25 UTC DJ Houghton <dj> 'Fix for bugs 16429 and 16430.'
Delete:
    bundles/org.eclipse.core.boot/.classpath
    bundles/org.eclipse.core.boot/.cvsignore
    bundles/org.eclipse.core.boot/.project
    bundles/org.eclipse.core.boot/about.html
    bundles/org.eclipse.core.boot/boot.xml
    bundles/org.eclipse.core.boot/build.properties
    bundles/org.eclipse.core.boot/plugin.properties
    bundles/org.eclipse.core.boot/plugin.xml
    bundles/org.eclipse.core.boot/splash.bmp
    bundles/org.eclipse.core.boot/src/com/ibm/oti/vm/VM.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/BootLoader.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/IPlatformConfiguration.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/IPlatformRunnable.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/package.html
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/DelegatingURLClassLoader.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/InternalBootLoader.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformClassLoader.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformConfiguration.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLBaseConnection.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLConnection.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandler.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandlerFactory.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandlerFactoryProxy.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/Policy.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/ResourceEnumeration.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/ResourceLoader.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/URLContentFilter.java
    bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/messages.properties
    tests/org.eclipse.core.tests.harness/.classpath
    tests/org.eclipse.core.tests.harness/.cvsignore
    tests/org.eclipse.core.tests.harness/.project
    tests/org.eclipse.core.tests.harness/about.html
    tests/org.eclipse.core.tests.harness/build-tests.xml
    tests/org.eclipse.core.tests.harness/build.properties
    tests/org.eclipse.core.tests.harness/plugin.xml
    tests/org.eclipse.core.tests.harness/readme.txt
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/CancelingProgressMonitor.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/CorePerformanceTest.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/DeltaDebugListener.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseTestHarnessApplication.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseWorkspaceTest.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/ExampleTest.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/ExampleWorkspaceTest.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/LoggingPerformanceTestResult.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTestResult.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTimer.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/SessionTestApplication.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/TestProgressMonitor.java
    tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/WorkspaceSessionTest.java
    tests/org.eclipse.core.tests.harness/test.xml
    tests/org.eclipse.core.tests.runtime/.classpath
    tests/org.eclipse.core.tests.runtime/.cvsignore
    tests/org.eclipse.core.tests.runtime/.project
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest1/ws/win32/jarLookupTest1.jar
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest2/jarLookupTest2.jar
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest3/ws/jarLookupTest3.jar
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest4/os/win32/x86/jarLookupTest4.jar
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/PR1GHFPFY.txt
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionPointTest/fragment/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionPointTest/plugin/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionTest/fragment/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionTest/plugin/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/libraryTest/fragment/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/libraryTest/plugin/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/fragment/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/plugin/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testa/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testb/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testc/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testd/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/PR1GHH81D.txt
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent1AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent2AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent3AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badConfigurationAttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionAttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionPointAttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionPointElementsTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragment1AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragment2AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentPluginVersionTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentVersionTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentsPluginTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentsTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary1AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary1ElementsTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary2AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary2ElementsTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary3AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginAttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginElementsTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion2Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion3Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion4Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion5Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersionTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresElementsTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport1AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport2AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport3AttributesTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImportElementsTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRuntimeElementsTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badTopLevelElementsTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentIdTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentNameTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentPluginIdTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentPluginVersionTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentVersionTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginIdTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginNameTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginVersionTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/duplicatePlugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/duplicatePlugin2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/fragment10799.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentIdTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentNameTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentPluginIdTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentPluginVersionTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentVersionTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginIdTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginNameTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginVersionTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.a.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.b.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.top.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.e_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.f_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.e_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.f_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.e_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.f_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.e_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.f_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.e_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.f_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension1Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension2Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension3Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension4Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension5Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint1Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint2Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint3Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint4Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint5Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension1Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension2Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension3Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension4Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension5Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint1Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint2Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint3Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint4Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint5Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary1Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary2Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary3Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary4Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary5Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires1Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires2Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires3Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires4Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires5Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library1Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library2Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library3Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library4Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library5Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin8.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires1Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires2Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires3Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires4Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires5Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/emptyLibraryTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/multiLibraryMultiExportTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/multiLibraryOneExportTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/noLibraryTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport1Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport2Test.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/emptyRequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export1RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export2RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export3RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export4RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match1RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match2RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match3RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match4RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match5RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match6RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/multiRequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/noRequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/oneRequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional1RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional2RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional3RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional4RequiresTest.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/plugin2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment8.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment9.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment8.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment21.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment22.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment23.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment24.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment25.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment26.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment27.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment8.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment8.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment9.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment8.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment9.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment10.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment11.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment12.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment8.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment9.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment8.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment9.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/plugin2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment10.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment11.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment12.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment2.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment3.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment4.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment5.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment6.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment7.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment8.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment9.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/plugin1.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/numberOfRequires/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/numberOfRuntimes/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin_a.jar
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin_a_external.jar
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin_b.jar
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin_c.jar
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/plugin_d.jar
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/resource.properties
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.d/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.0.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.0.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_1.0.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.2.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.2.4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.2.4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.3.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.3.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.2.4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.2.4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.a_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.a_1.2.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_1.0.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.2.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.2.4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.3.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.4/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.3.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_3.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.a_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_1.0.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.2.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.d/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.c_1.0.9/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.c_2.5.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.c_1.0.9/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.c_2.5.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.c_1.0.9/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.c_2.5.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c_2.0.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.d/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.d_2.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.0.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.0_copy/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.15/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.root/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/.plugin-path
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/b_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.3.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_1.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_1.3.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_2.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.3.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.3.2/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.4.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.1.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.1.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.1.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.1.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.1.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_2.1.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.1.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.5/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.2.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_2.1.1/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_2.1.3/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_3.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.1/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.d/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.11/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.11/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.12/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.13/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.13/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.14/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.15/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.15/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.16/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.17/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.17/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.18/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.19/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.19/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.2/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.2/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.3/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.3/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.4/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.5/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.5/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.b/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.c/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.a/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_1.0.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_1.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_2.1.0/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.d/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/Bug3093/codePluginA.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/Bug3093/plugins/pluginA/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/interestingFragmentFindTest/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/interestingPluginFindTest/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/nlFragmentFindTest/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/nlPluginFindTest/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/osFragmentFindTest/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/osPluginFindTest/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/rootFragmentFindTest/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/rootPluginFindTest/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/wsFragmentFindTest/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/wsPluginFindTest/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentD/codePluginD.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentD/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentE/bin/codePluginE.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentE/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/bin/codePluginF.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/codePluginF.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentG/codePluginG.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentG/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentH/bin/codePluginH.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentH/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentI/codePluginI.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentI/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentJ/bin/codePluginJ.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentJ/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentK/codePluginK.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentK/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentL/bin/codePluginL.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentL/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/bin/codePluginM.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/codePluginM.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/bin/codePluginN.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/codePluginN.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/bin/codePluginO.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/codePluginO.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginA/codePluginA.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginA/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginB/bin/codePluginB.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginB/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/bin/codePluginC.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/codePluginC.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginD/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginE/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginF/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginG/codePluginG.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginG/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginH/codePluginH.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginH/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginI/bin/codePluginI.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginI/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginJ/bin/codePluginJ.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginJ/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/bin/codePluginK.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/codePluginK.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/bin/codePluginL.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/codePluginL.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginM/codePluginM.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginM/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginN/bin/codePluginN.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginN/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/bin/codePluginO.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/codePluginO.jar
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentD/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentD/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentE/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentE/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentG/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentG/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentH/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentH/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentI/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentI/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentJ/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentJ/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentK/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentK/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentL/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentL/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginA/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginA/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginB/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginB/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginD/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginE/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginF/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginG/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginG/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginH/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginH/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginI/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginI/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginJ/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginJ/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginM/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginM/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginN/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginN/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/bin/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/plugin.properties
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/cmdLinePreferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/cmdLinePreferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/cmdLinePreferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/originalplugin_customization.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/cmdLinePreferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/originalpref_store.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/cmdLinePreferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/originalpref_store.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/cmdLinePreferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/originalpref_store.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/cmdLinePreferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/originalplugin_customization.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/originalpref_store.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/commandLinePreferences/cmdLinePreferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/commandLinePreferences/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/originalplugin_customization.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeaturePlugin/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferences/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferences/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferencesPlugin/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/noPreferences/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/originalplugin_customization.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalPreferences/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalPreferences/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/primaryFeaturePluginPreferences/originalplugin_customization.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/primaryFeaturePluginPreferences/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/originalpref_store.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/fragment.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/originalplugin_customization.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/originalpref_store.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeaturePlugin/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalPlugin/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/originalpref_store.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/originalpref_store.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/preferences.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/originalplugin_customization.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/originalpref_store.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/plugin.xml
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateLocalPreferences/originalpref_store.ini
    tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateLocalPreferences/plugin.xml
    tests/org.eclipse.core.tests.runtime/about.html
    tests/org.eclipse.core.tests.runtime/build.properties
    tests/org.eclipse.core.tests.runtime/plugin.xml
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/BaseExtension.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ConfigurableExtension.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/Dummy.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionDirectCompilerReferenceToOtherClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionDirectCompilerReferenceToPluginClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionIndirectReferenceToPlugin.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/PluginClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/api/ApiClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/b/PluginClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/b/api/ApiClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/ExportedClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/PluginClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/api/ApiClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/d/PluginClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/d/api/ApiClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_Base.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_DirectOtherRef.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_DirectPluginRef.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_IndirectRef.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_NoRef.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/AllTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BadPluginsTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BasicFragmentTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BasicXMLTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/CircularTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_1.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_2.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_3.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_4.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_5.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_6.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_7.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveFragmentTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveLibraryTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveRequiresTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_1.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_10.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_11.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_12.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_13.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_2.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_3.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_4.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_5.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_6.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_7.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_8.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_9.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/GetPluginPathTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/JarPluginPathTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/JarSearchTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/LoaderTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/NumberOfElementsTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ParseHelper.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLPerformanceTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLPerformanceTestConnection.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_1.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_10.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_11.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_12.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_13.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_14.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_15.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_16.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_17.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_18.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_19.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_2.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_20.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_21.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_22.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_23.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_24.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_25.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_26.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_27.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_28.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_29.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_3.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_30.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_31.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_32.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_33.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_4.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_5.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_6.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_7.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_8.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_9.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginVersionTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginVersionTest_2.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginXmlTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_1.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_10.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_2.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_3.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_4.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_5.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_6.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_7.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_8.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_9.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_1.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_10.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_11.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_12.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_13.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_14.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_15.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_16.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_17.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_18.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_19.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_2.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_20.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_21.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_22.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_3.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_4.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_5.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_6.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_7.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_8.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_9.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/TestClass.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/AllTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/CacheHelpers.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/SimpleCacheTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AllTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AuthorizationDatabaseTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/CipherStreamsTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/CipherTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformLogReader.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleA.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleCPB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleCPR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleD.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleE.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleFFB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleFFR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleGFR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleGPR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleHFB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleHPR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleIFR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleIPB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleJFB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleJPB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKFR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKPB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKPR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLFB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLPB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLPR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMFB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMFR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMPR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNFB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNFR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNPB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOFB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOFR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOPB.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOPR.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/AllTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/ApiTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPluginLocalAndPrimaryFeatureTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPluginLocalTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPrimaryFeatureTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPluginLocalAndPrimaryFeatureTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPluginLocalTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPrimaryFeatureTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLinePreferencesTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/LibraryLookupTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PluginFindTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PluginTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PreferencesRuntimeTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AutomatedTests.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/BenchPath.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/CoreExceptionTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/OperationCanceledExceptionTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PathTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PluginVersionIdentifierTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/ProgressMonitorWrapperTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/QualifiedNameTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/RuntimeTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java
    tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/model/ConfigurationElementModelTest.java

bundles/org.eclipse.core.boot/.classpath

diff --git a/bundles/org.eclipse.core.boot/.classpath b/bundles/org.eclipse.core.boot/.classpath
deleted file mode 100644
index dbbc1d8..0000000
--- a/bundles/org.eclipse.core.boot/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>

bundles/org.eclipse.core.boot/.cvsignore

diff --git a/bundles/org.eclipse.core.boot/.cvsignore b/bundles/org.eclipse.core.boot/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/bundles/org.eclipse.core.boot/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file

bundles/org.eclipse.core.boot/.project

diff --git a/bundles/org.eclipse.core.boot/.project b/bundles/org.eclipse.core.boot/.project
deleted file mode 100644
index c6103e5..0000000
--- a/bundles/org.eclipse.core.boot/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.core.boot</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.team.cvs.core.cvsnature</nature>
-	</natures>
-</projectDescription>

bundles/org.eclipse.core.boot/about.html

diff --git a/bundles/org.eclipse.core.boot/about.html b/bundles/org.eclipse.core.boot/about.html
deleted file mode 100644
index 441774f..0000000
--- a/bundles/org.eclipse.core.boot/about.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<html>
-<head>
-<title>About</title>
-<style type="text/css">
-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}
-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}
-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}
-code { font-family: "Courier New", Courier, mono; font-size: 10pt}
-sup { font-family: arial,helvetica,geneva; font-size: 10px}
-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}
-li { font-family: arial, helvetica, geneva; font-size: 10pt}
-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}
-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}
-</style>
-</head>
-<body lang="EN-US" link="blue" vlink="purple">
-<table border="0" cellspacing="5" cellpadding="2" width="100%" >
-  <tr> 
-    <td align="LEFT" valign="TOP" colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF">About This Content</font></b></td>
-  </tr>
-  <tr> 
-    <td> 
-<p>11th December, 2001</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in &quot;Content&quot;.  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a> &quot;CPL&quot;.  For purposes of the CPL, &quot;Program&quot; will mean the Content.</p>
-
-<h3>Contributions</h3>
-
-<p>If this Content is licensed to you under the terms and conditions of the CPL, any Contributions, as defined in the CPL, uploaded, submitted, or otherwise
-made available to Eclipse.org, members of Eclipse.org and/or the host of Eclipse.org web site, by you that relate to such
-Content are provided under the terms and conditions of the CPL and can be made available to others under the terms of the CPL.</p>
-
-<p>If this Content is licensed to you under license terms and conditions other than the CPL &quot;Other License&quot;, any modifications, enhancements and/or
-other code and/or documentation &quot;Modifications&quot; uploaded, submitted, or otherwise made available to Eclipse.org, members of Eclipse.org and/or the
-host of Eclipse.org, by you that relate to such Content are provided under terms and conditions of the Other License and can be made available
-to others under the terms of the Other License.  In addition, with regard to Modifications for which you are the copyright holder, you are also
-providing the Modifications under the terms and conditions of the CPL and such Modifications can be made available to others under the terms of
-the CPL.</p>
-</td></tr></table>
-</body>
-</html>
\ No newline at end of file

bundles/org.eclipse.core.boot/boot.xml

diff --git a/bundles/org.eclipse.core.boot/boot.xml b/bundles/org.eclipse.core.boot/boot.xml
deleted file mode 100644
index 4cd2900..0000000
--- a/bundles/org.eclipse.core.boot/boot.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<requires>
-   <import plugin="org.eclipse.core.runtime" version="2.0.0" match="equivalent"/>
-</requires>

bundles/org.eclipse.core.boot/build.properties

diff --git a/bundles/org.eclipse.core.boot/build.properties b/bundles/org.eclipse.core.boot/build.properties
deleted file mode 100644
index 9d41925..0000000
--- a/bundles/org.eclipse.core.boot/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.boot.jar=src/
-bin.includes=plugin.xml,boot.xml,*.jar,plugin.properties,about.html,splash.bmp
-javadoc.packages=org.eclipse.core.boot.*
-

bundles/org.eclipse.core.boot/plugin.properties

diff --git a/bundles/org.eclipse.core.boot/plugin.properties b/bundles/org.eclipse.core.boot/plugin.properties
deleted file mode 100644
index dfac5a9..0000000
--- a/bundles/org.eclipse.core.boot/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# Boot strings
-pluginName = Core Boot
-providerName = Object Technology International, Inc.
\ No newline at end of file

bundles/org.eclipse.core.boot/plugin.xml

diff --git a/bundles/org.eclipse.core.boot/plugin.xml b/bundles/org.eclipse.core.boot/plugin.xml
deleted file mode 100644
index 330fab7..0000000
--- a/bundles/org.eclipse.core.boot/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-   id="org.eclipse.core.boot"
-   name="%pluginName"
-   version="2.0.0"
-   provider-name="%providerName">
-
-<runtime>
-   <library name="boot.jar">
-      <export name="*"/>
-   </library>
-</runtime>
-
-</plugin>

bundles/org.eclipse.core.boot/splash.bmp

diff --git a/bundles/org.eclipse.core.boot/splash.bmp b/bundles/org.eclipse.core.boot/splash.bmp
deleted file mode 100644
index 3d56810..0000000
--- a/bundles/org.eclipse.core.boot/splash.bmp
+++ /dev/null
Binary files differ

bundles/org.eclipse.core.boot/src/com/ibm/oti/vm/VM.java

diff --git a/bundles/org.eclipse.core.boot/src/com/ibm/oti/vm/VM.java b/bundles/org.eclipse.core.boot/src/com/ibm/oti/vm/VM.java
deleted file mode 100644
index 3b2c8c6..0000000
--- a/bundles/org.eclipse.core.boot/src/com/ibm/oti/vm/VM.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package com.ibm.oti.vm;
-
-/*
- * Dummy class to fill in for the real J9 VM support class.
- * This class will be overridden when running the platform on J9
- * because the real class is part of the boot class path.
- */
-
-abstract public class VM {
-
-public static void enableClassHotSwap(Class clazz) {
-}
-public static void setClassPathImpl(ClassLoader cl, String path) {
-}
-
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/BootLoader.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/BootLoader.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/BootLoader.java
deleted file mode 100644
index d2db209..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/BootLoader.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.boot;
-
-import java.io.IOException;
-import java.net.URL;
-import org.eclipse.core.internal.boot.InternalBootLoader;
-
-/**
- * Special boot loader class for the Eclipse Platform. This class cannot
- * be instantiated; all functionality is provided by static methods.
- * <p>
- * The Eclipse Platform makes heavy use of Java class loaders for
- * loading plug-ins. Even the Platform Core Runtime itself, including
- * the <code>Platform</code> class, needs to be loaded by a special 
- * class loader. The upshot is that a client program (such as a Java main
- * program, a servlet) cannot directly reference even the 
- * <code>Platform</code> class. Instead, a client must use this
- * loader class for initializing the platform, invoking functionality
- * defined in plug-ins, and shutting down the platform when done.
- * </p>
- *
- * @see org.eclipse.core.runtime.Platform
- */
-public final class BootLoader {
-
-	/**
-	 * The unique identifier constant (value "<code>org.eclipse.core.boot</code>")
-	 * of the Core Boot (pseudo-) plug-in.
-	 */
-	public static final String PI_BOOT = "org.eclipse.core.boot";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "win32") indicating the platform is running on a
-	 * Window 32-bit operating system (e.g., Windows 98, NT, 2000).
-	 */
-	public static final String OS_WIN32 = "win32";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "linux") indicating the platform is running on a
-	 * Linux-based operating system.
-	 */
-	public static final String OS_LINUX = "linux";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "aix") indicating the platform is running on an
-	 * AIX-based operating system.
-	 */
-	public static final String OS_AIX = "aix";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "solaris") indicating the platform is running on a
-	 * Solaris-based operating system.
-	 */
-	public static final String OS_SOLARIS = "solaris";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "hpux") indicating the platform is running on an
-	 * HP/UX-based operating system.
-	 */
-	public static final String OS_HPUX = "hpux";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "qnx") indicating the platform is running on a
-	 * QNX-based operating system.
-	 */
-	public static final String OS_QNX = "qnx";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "macosx") indicating the platform is running on a
-	 * Mac OS X operating system.
-	 * 
-	 * @since 2.0
-	 */
-	public static final String OS_MACOSX = "macosx";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "unknown") indicating the platform is running on a
-	 * machine running an unknown operating system.
-	 */
-	public static final String OS_UNKNOWN = "unknown";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "x86") indicating the platform is running on an
-	 * x86-based architecture.
-	 */
-	public static final String ARCH_X86 = "x86";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "ppc") indicating the platform is running on an
-	 * PowerPC-based architecture.
-	 * 
-	 * @since 2.0
-	 */
-	public static final String ARCH_PPC = "ppc";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "sparc") indicating the platform is running on an
-	 * Sparc-based architecture.
-	 * 
-	 * @since 2.0
-	 */
-	public static final String ARCH_SPARC = "sparc";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "win32") indicating the platform is running on a
-	 * machine using the Windows windowing system.
-	 */
-	public static final String WS_WIN32 = "win32";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "motif") indicating the platform is running on a
-	 * machine using the Motif windowing system.
-	 */
-	public static final String WS_MOTIF = "motif";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "gtk") indicating the platform is running on a
-	 * machine using the GTK windowing system.
-	 */
-	public static final String WS_GTK = "gtk";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "photon") indicating the platform is running on a
-	 * machine using the Photon windowing system.
-	 */
-	public static final String WS_PHOTON = "photon";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "carbon") indicating the platform is running on a
-	 * machine using the Carbon windowing system (Mac OS X).
-	 * 
-	 * @since 2.0
-	 */
-	public static final String WS_CARBON = "carbon";//$NON-NLS-1$
-
-	/**
-	 * Constant string (value "unknown") indicating the platform is running on a
-	 * machine running an unknown windowing system.
-	 */
-	public static final String WS_UNKNOWN = "unknown";//$NON-NLS-1$
-
-	private static final String[] ARCH_LIST = {
-		ARCH_PPC,
-		ARCH_SPARC,
-		ARCH_X86
-	};
-	private static final String[] OS_LIST = {
-		OS_AIX,
-		OS_HPUX,
-		OS_LINUX,
-		OS_MACOSX,
-		OS_QNX,
-		OS_SOLARIS,
-		OS_WIN32
-	};
-	private static final String[] WS_LIST = {
-		WS_CARBON,
-		WS_GTK,
-		WS_MOTIF,
-		WS_PHOTON,
-		WS_WIN32
-	};
-/**
- * Private constructor to block instance creation.
- */
-private BootLoader() {
-}
-/**
- * Returns whether the given location (typically a directory in the
- * local file system) contains the saved data for a platform. The
- * saved data for the platform is recognizable by the presence of
- * a special platform metadata subdirectory; however, this metadata
- * directory is not usually created unless there is some reason to do so
- * (for example, so that an active plug-in can save its state).
- *
- * @return <code>true</code> if the location contains the 
- *		saved data for a platform, and <code>false</code> otherwise
- */
-public static boolean containsSavedPlatform(String location) {
-	return InternalBootLoader.containsSavedPlatform(location);
-}
-/**
- * Returns the command line args provided to the platform when it was first run.
- * Note that individual platform runnables may be provided with different arguments
- * if they are being run individually rather than with <code>Platform.run()</code>.
- * 
- * @return the command line used to start the platform
- */
-public static String[] getCommandLineArgs() {
-	return InternalBootLoader.getCommandLineArgs();
-}
-/**
- * Returns the current platform configuration.
- * 
- * @return platform configuration used in current instance of platform
- * @since 2.0
- */	
-public static IPlatformConfiguration getCurrentPlatformConfiguration() {
-	return InternalBootLoader.getCurrentPlatformConfiguration();
-}
-/**
- * Returns URL at which the Platform runtime executables and libraries are installed.
- * The returned value is distinct from the location of any given platform's data.
- *
- * @return the URL indicating where the platform runtime is installed.
- */
-public static URL getInstallURL() {
-	return InternalBootLoader.getInstallURL();
-}
-/**
- * Returns the string name of the current locale for use in finding files
- * whose path starts with <code>$nl$</code>.  <code>null</code> is returned
- * if the locale cannot be determined.
- *
- * @return the string name of the current locale or <code>null</code>
- */
-public static String getNL() {
-	return InternalBootLoader.getNL();
-}
-/**
- * Returns the string name of the current operating system for use in finding files
- * whose path starts with <code>$os$</code>.  <code>OS_UNKNOWN</code> is returned
- * if the operating system cannot be determined.  The value may indicate one of the following
- * operating systems known to the platform (<code>OS_WIN32</code>, <code>OS_LINUX</code>,
- * <code>OS_AIX</code>, <code>OS_SOLARIS</code>, <code>OS_HPUX</code> or
- * a user-defined string if the operating system name is specified on the command line.
- *
- * @return the string name of the current operating system
- * 
- */
-public static String getOS() {
-	return InternalBootLoader.getOS();
-}
-/**
- * Returns the string name of the current system architecture.  
- * The value is a user-defined string if the architecture is 
- * specified on the command line, otherwise it is the value 
- * returned by <code>java.lang.System.getProperty("os.arch")</code>.
- * 
- * @return the string name of the current system architecture
- * @since 2.0
- */
-public static String getOSArch() {
-	return InternalBootLoader.getOSArch();
-}
-/**
- * Returns a platform configuration object, optionally initialized with previously saved
- * configuration information.
- * 
- * @param url location of previously save configuration information. If <code>null</code>
- * is specified, an empty configuration object is returned
- * @return platform configuration used in current instance of platform
- * @since 2.0
- */	
-public static IPlatformConfiguration getPlatformConfiguration(URL url) throws IOException {
-	return InternalBootLoader.getPlatformConfiguration(url);
-}
-/**
- * Returns the complete plugin path defined by the file at the given location.
- * If the given location is <code>null</code> or does not indicate a valid 
- * plug-in path definition file, <code>null</code> is returned.
- *
- * @return the complete set of URLs which locate plug-ins
- */
-public static URL[] getPluginPath(URL pluginPathLocation) {
-	return InternalBootLoader.getPluginPath(pluginPathLocation);
-}
-/**
- * Instantiates and returns an instance of the named application's 
- * runnable entry point.
- * <code>null</code> is returned if the runnable cannot be found.
- *
- * @param applicationName the fully qualified name of an 
- * 		extension installed in the platform's <code>applications</code> 
- *		extension point (i.e., <code>org.eclipse.core.applications</code>).
- * @return a platform runnable
- * @exception Exception if there is a problem instantiating the specified runnable
- */
-public static IPlatformRunnable getRunnable(String applicationName) throws Exception {
-	return InternalBootLoader.getRunnable(applicationName);
-}
-/**
- * Instantiates and returns an instance of the named class.  The class
- * must implement <code>IPlatformRunnable</code>.
- * If the class implements <code>IExecutableExtension</code>, the created
- * instance is initialized with the given arguments.
- * <code>null</code> is returned if the runnable cannot be found.
- *
- * @param pluginId the unique identifier of the plug-in containing the given class
- * @param className the fully qualified name of the class to instantiate
- * @param args the initialization arguments passed to the new instance
- * @return a platform runnable, or <code>null</code> if the runnable cannot
- *    be found
- * @exception Exception if there is a problem instantiating the specified runnable
- */
-public static IPlatformRunnable getRunnable(String pluginId, String className, Object args) throws Exception {
-	return InternalBootLoader.getRunnable(pluginId, className, args);
-}
-/**
- * Returns the string name of the current window system for use in finding files
- * whose path starts with <code>$ws$</code>.  <code>null</code> is returned
- * if the window system cannot be determined.
- *
- * @return the string name of the current window system or <code>null</code>
- */
-public static String getWS() {
-	return InternalBootLoader.getWS();
-}
-/**
- * Returns a list of known system architectures.
- * <p>
- * Note that this list is not authoritative; there may be legal values
- * not included in this list. Indeed, the value returned by 
- * <code>getOSArch</code> may not be in this list. Also, this list may 
- * change over time as Eclipse comes to run on more operating environments.
- * </p>
- * 
- * @return the list of system architectures known to the system
- * @see #getOSArch
- * @since 2.0
- */
-public static String[] knownOSArchValues() {
-	return ARCH_LIST;
-}
-/**
- * Returns a list of known operating system names.
- * <p>
- * Note that this list is not authoritative; there may be legal values
- * not included in this list. Indeed, the value returned by 
- * <code>getOS</code> may not be in this list. Also, this list may 
- * change over time as Eclipse comes to run on more operating environments.
- * </p>
- * 
- * @return the list of operating systems known to the system
- * @see #getOS
- * @since 2.0
- */
-public static String[] knownOSValues() {
-	return OS_LIST;
-}
-/**
- * Returns a list of known windowing system names.
- * <p>
- * Note that this list is not authoritative; there may be legal values
- * not included in this list. Indeed, the value returned by 
- * <code>getWS</code> may not be in this list. Also, this list may 
- * change over time as Eclipse comes to run on more operating environments.
- * </p>
- * 
- * @return the list of window systems known to the system
- * @see #getWS
- * @since 2.0
- */
-public static String[] knownWSValues() {
-	return WS_LIST;
-}
-/**
- * Returns <code>true</code> if the platform is currently running in 
- * debug mode.  The platform is run
- * in debug mode using the "-debug" command line argument.
- *
- * @return whether or not the platform is running in debug mode
- */
-public static boolean inDebugMode() {
-	return InternalBootLoader.inDebugMode();
-}
-/**
- * Returns <code>true</code> if the platform is currently running in 
- * development mode.  That is, if special procedures are to be 
- * taken when defining plug-in class paths.  The platform is run
- * in development mode using the "-dev" command line argument.
- *
- * @return whether or not the platform is running in development mode
- */
-public static boolean inDevelopmentMode() {
-	return InternalBootLoader.inDevelopmentMode();
-}
-/**
- * Returns whether the platform is running.
- * The <code>startup</code> method starts the platform running;
- * the <code>shutdown</code> method stops it.
- *
- * @return <code>true</code> if the platform is running, 
- *		and <code>false</code> otherwise
- * @see #startup
- * @see #shutdown
- */
-public static boolean isRunning() {
-	return InternalBootLoader.isRunning();
-}
-/**
- * Launches the Platform to run a single application. 
- * This convenince method starts up the Platform,
- * runs the indicated application, and then shuts down
- * the Platform. The Platform must not be running already.
- *
- * @param applicationName The fully qualified name of an 
- * 		extension installed in the Platform plug-in's <code>applications</code> 
- *		extension-point (i.e., <code>org.eclipse.core.runtime.applications</code>).
- * @param pluginPathLocation the URL of the plug-in path; this is where
- *		the Platform is to find the code for plug-ins
- * @param location the location (usually a string path in the local file
- *		file system) for the saved platform state
- * @param args the array of command-line style argments which are passed
- *		to the Platform on initialization.  The arguments which are consumed by the
- * 		Platform's initialization are removed from the arg list.  This modified arg list is
- *		the return value of this method.  
- *@return the list of <code>args</code> which were supplied but not consumed
- *		by this method.  
- * @return the result, or <code>null</code> if none
- * @exception Exception if anything goes wrong
- * @see #startup
- */
-public static Object run(String applicationName, URL pluginPathLocation, String location, String[] args) throws Exception {
-	return InternalBootLoader.run(applicationName, pluginPathLocation, location, args, null);
-}
-/**
- * Launches the Platform to run a single application. 
- * This convenince method starts up the Platform,
- * runs the indicated application, and then shuts down
- * the Platform. The Platform must not be running already.
- *
- * @param applicationName The fully qualified name of an 
- * 		extension installed in the Platform plug-in's <code>applications</code> 
- *		extension-point (i.e., <code>org.eclipse.core.runtime.applications</code>).
- * @param pluginPathLocation the URL of the plug-in path; this is where
- *		the Platform is to find the code for plug-ins
- * @param location the location (usually a string path in the local file
- *		file system) for the saved platform state
- * @param args the array of command-line style argments which are passed
- *		to the Platform on initialization.  The arguments which are consumed by the
- * 		Platform's initialization are removed from the arg list.  This modified arg list is
- *		the return value of this method.
- * @param handler an optional handler invoked by the launched application
- *      at the point the application considers itself initialized. A typical
- *      use for the handler would be to take down any splash screen
- *      that was displayed by the caller of this method.
- *@return the list of <code>args</code> which were supplied but not consumed
- *		by this method.  
- * @return the result, or <code>null</code> if none
- * @exception Exception if anything goes wrong
- * @see #startup
- */
-public static Object run(String applicationName, URL pluginPathLocation, String location, String[] args, Runnable handler) throws Exception {
-	return InternalBootLoader.run(applicationName, pluginPathLocation, location, args, handler);
-}
-/**
- * Shuts down the Platform. The Platform must be running. In the process,
- * each active plug-in is told to shutdown via <code>Plugin.shutdown</code>.
- * <p>
- * Note that the state of the Platform is not automatically saved
- * before shutting down.
- * </p>
- * <p>
- * On return, the Platform will no longer be running (but could
- * be re-launched with another call to <code>startup</code>). 
- * Any objects handed out by running Platform, including
- * Platform runnables obtained via <code>getRunnable</code>,
- * will be permanently invalid. The effects of attempting to invoke
- * methods on invalid objects is undefined.
- * </p>
- * @exception Exception if there were problems shutting down
- */
-public static void shutdown() throws Exception {
-	InternalBootLoader.shutdown();
-}
-/**
- * Launches the Eclipse Platform. The Platform must not be running.
- * <p>
- * The location of the started Platform is defined as follows:
- * <ul>
- * <li>If the <code>location</code> argument is specified, that value is used.  
- * <li>If <code>location</code> is <code>null</code> but <code>args</code> 
- *		contains a <code>-platform &ltlocation&gt</code> pair, then the given value is used.  
- * <li> If neither is specified, <code>System.getProperty("user.dir")</code> is used.
- * </ul>
- * The plug-in path of the started Platform is defined as follows:
- * <ul>
- * <li>If the <code>pluginPathLocation</code> argument is specified, that value is tried.
- * <li>If <code>pluginPathLocation</code> is <code>null</code> but <code>args</code> 
- *		contains a <code>-plugins &ltlocation&gt</code> pair, then the given value is tried.  
- * <li>If neither value is specified or a given location does not exist, 
- * 		the Platform's location is searched.  
- * <li>Finally, the default plug-in path is used.  This value identifies the plug-ins in the 
- *		Platform's install location.
- * </ul>
- * @param pluginPathLocation the URL of the plug-in path; this is where
- *		the Platform is to find the code for plug-ins
- * @param location the location (usually a string path in the local file
- *		file system) for the saved Platform state
- * @param args the array of command-line style argments which are passed
- *		to the platform on initialization.  The arguments which are consumed by the
- * 		Platform's initialization are removed from the arg list.  This modified arg list is
- *		the return value of this method.  
- *	@return the list of <code>args</code> which were supplied but not consumed
- *		by this method.  
- * @exception Exception if there are problems starting the platform
- */
-public static String[] startup(URL pluginPathLocation, String location, String[] args) throws Exception {
-	return InternalBootLoader.startup(pluginPathLocation, location, args, null);
-}
-/**
- * Launches the Eclipse Platform. The Platform must not be running.
- * <p>
- * The location of the started Platform is defined as follows:
- * <ul>
- * <li>If the <code>location</code> argument is specified, that value is used.  
- * <li>If <code>location</code> is <code>null</code> but <code>args</code> 
- *		contains a <code>-platform &ltlocation&gt</code> pair, then the given value is used.  
- * <li> If neither is specified, <code>System.getProperty("user.dir")</code> is used.
- * </ul>
- * The plug-in path of the started Platform is defined as follows:
- * <ul>
- * <li>If the <code>pluginPathLocation</code> argument is specified, that value is tried.
- * <li>If <code>pluginPathLocation</code> is <code>null</code> but <code>args</code> 
- *		contains a <code>-plugins &ltlocation&gt</code> pair, then the given value is tried.  
- * <li>If neither value is specified or a given location does not exist, 
- * 		the Platform's location is searched.  
- * <li>Finally, the default plug-in path is used.  This value identifies the plug-ins in the 
- *		Platform's install location.
- * </ul>
- * @param pluginPathLocation the URL of the plug-in path; this is where
- *		the Platform is to find the code for plug-ins
- * @param location the location (usually a string path in the local file
- *		file system) for the saved Platform state
- * @param args the array of command-line style argments which are passed
- *		to the platform on initialization.  The arguments which are consumed by the
- * 		Platform's initialization are removed from the arg list.  This modified arg list is
- *		the return value of this method. 
- * @param handler an optional handler invoked by the launched application
- *      at the point the application considers itself initialized. A typical
- *      use for the handler would be to take down any splash screen
- *      that was displayed by the caller of this method. 
- *	@return the list of <code>args</code> which were supplied but not consumed
- *		by this method.  
- * @exception Exception if there are problems starting the platform
- */
-public static String[] startup(URL pluginPathLocation, String location, String[] args, Runnable handler) throws Exception {
-	return InternalBootLoader.startup(pluginPathLocation, location, args, handler);
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/IPlatformConfiguration.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/IPlatformConfiguration.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/IPlatformConfiguration.java
deleted file mode 100644
index 73844e3..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/IPlatformConfiguration.java
+++ /dev/null
@@ -1,505 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.boot;
- 
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * Platform configuration interface. Represents the runtime
- * configuration used by the Eclipse platform. Any configuration
- * changes do not take effect until next startup of the Eclipse
- * platform
- * 
- * @since 2.0
- */
-public interface IPlatformConfiguration {
-	
-	/**
-	 * Configuration entry representing an install site.
-	 * 
-	 * @since 2.0 
-	 */
-	public interface ISiteEntry {
-		
-		/**
-		 * Returns the URL for this site
-		 * 
-		 * @return site url
-		 * @since 2.0
-		 */		
-		public URL getURL();
-		
-		/**
-		 * Returns the policy for this site
-		 * 
-		 * @return site policy
-		 * @since 2.0
-		 */				
-		public ISitePolicy getSitePolicy();
-		
-		/**
-		 * Sets the site policy
-		 * 
-		 * @param policy site policy
-		 * @since 2.0
-		 */
-		public void setSitePolicy(ISitePolicy policy);
-		
-		/**
-		 * Returns a list of features visible on the site. Note, that this is simply a 
-		 * reflection of the site content. The features may or may not be actually configured.
-		 * 
-		 * @return an array of feature entries, or an empty array if no features are found.
-		 * A feature entry is returned as a path relative to the site URL
-		 * @since 2.0
-		 */
-		public String[] getFeatures();
-		
-		/**
-		 * Returns a list of plug-ins visible on the site. Note, that this is simply a 
-		 * reflection of the site content and the current policy for the site. The plug-ins
-		 * may or may not end up being used by Eclipse (depends on which plug-in are 
-		 * actually bound by the platform).
-		 * 
-		 * @return an array of plug-in entries, or an empty array if no plug-ins are found.
-		 * A plug-in entry is returned as a path relative to the site URL		 * 
-		 * @since 2.0
-		 */
-		public String[] getPlugins();
-		
-		/**
-		 * Returns a stamp reflecting the current state of the site. If called repeatedly,
-		 * returns the same value as long as no changes were made to the site (changes to
-		 * features or plugins).
-		 * 
-		 * @return site change stamp
-		 * @since 2.0
-		 */
-		public long getChangeStamp();
-		
-		/**
-		 * Returns a stamp reflecting the current state of the features on the site. 
-		 * If called repeatedly, returns the same value as long as no changes were made to
-		 * features on the site.
-		 * 
-		 * @return site features change stamp 
-		 * @since 2.0
-		 */
-		public long getFeaturesChangeStamp();
-		
-		/**
-		 * Returns a stamp reflecting the current state of the plug-ins on the site. 
-		 * If called repeatedly, returns the same value as long as no changes were made to
-		 * plug-ins on the site.
-		 * 
-		 * @return site plug-ins change stamp 
-		 * @since 2.0
-		 */
-		public long getPluginsChangeStamp();		
-		
-		/**
-		 * Returns an indication whether the site can be updated.
-		 * 
-		 * @return <code>true</code> if site can be updated, <code>false</code> otherwise
-		 * @since 2.0
-		 */
-		public boolean isUpdateable();			
-		
-		/**
-		 * Returns an indication whether the site represents an install site
-		 * that has been linked via a native installer (using the links/<linkfile>
-		 * mechanism)
-		 * 
-		 * @return <code>true</code> if the site is linked, <code>false</code> otherwise
-		 * @since 2.0
-		 */
-		public boolean isNativelyLinked();				
-	}
-	
-	/**
-	 * Site policy. The site policy object determines how plug-ins
-	 * contained on the site are processed during startup. In general,
-	 * there are 3 ways of configuring a site policy
-	 * <ul>
-	 * <li>explicitly specify which plug-ins are to be included at
-	 * startup (type==USER_INCLUDE). Any other plug-ins located
-	 * at the site are ignored at startup. This is typically the best
-	 * policy when using remote sites where the user wishes
-	 * to retain explicit control over the plug-ins that are included
-	 * from such site.
-	 * <li>explicitly specify which plug-ins are to be excluded at
-	 * startup (type==USER-EXCLUDE). All other plug-ins located
-	 * at the site are used at startup. This policy requires that
-	 * the site support an access "protocol" that allows plug-in
-	 * discovery. In general, these are sites defined using the "file"
-	 * URL protocol. This is typically the best policy for local
-	 * install sites (on the user system).
-	 * </ul>
-	 * 
-	 * @since 2.0
-	 */
-	public interface ISitePolicy {
-		
-		/**
-		 * Policy type constants.
-		 */
-	
-		/** 
-		 * User-defined inclusion list. The list associated with this
-		 * policy type is interpreted as path entries to included plugin.xml
-		 * or fragment.xml <b>relative</b> to the site URL
-		 */
-		public static final int USER_INCLUDE = 0;
-	
-		/**
-		 * User-defined exclusion list. The list associated with this
-		 * policy type is interpreted as path entries to excluded plugin.xml
-		 * or fragment.xml <b>relative</b> to the site URL
-		 */
-		public static final int USER_EXCLUDE = 1;
-		
-		/**
-		 * Return policy type
-		 * 
-		 * @return policy type
-		 * @since 2.0
-		 */
-		public int getType();
-		
-		/**
-		 * Return policy inclusion/ exclusion list
-		 * 
-		 * @return the list as an array
-		 * @since 2.0
-		 */
-		public String[] getList();
-		
-		/**
-		 * Set new policy list. The list entries are interpreted based on the policy
-		 * type. See description of the policy type constants for details.
-		 * 
-		 * @param list policy inclusion/ exclusion list as an array.
-		 * Returns an empty array if there are no entries.
-		 * @see USER_INCLUDE
-		 * @see USER_EXCLUDE
-		 * @since 2.0
-		 */
-		public void setList(String[] list);
-	}
-	
-	/**
-	 * Feature entry.
-	 * Represents runtime "hints" about configured features.
-	 * The information is used during startup to locate the
-	 * correct attribution information for a primary feature. Note,
-	 * that a typical configuration can declare multiple feature
-	 * entries. At execution time, only one can be selected as
-	 * the active primary feature. This is determined based on 
-	 * specified command line arguments or computed defaults.
-	 * 
-	 * @since 2.0
-	 */
-	public interface IFeatureEntry {
-		
-		/**
-		 * Returns feature identifier.
-		 * @return feature identifier
-		 * @since 2.0
-		 */
-		public String getFeatureIdentifier();
-		
-		/**
-		 * Returns the currently configured version for the feature.
-		 * @return feature version (as string), or <code>null</code>
-		 * @since 2.0
-		 */
-		public String getFeatureVersion();
-		
-		/**
-		 * Returns the application to run when this feature is the
-		 * primary feature.
-		 * @return application identifier, or <code>null</code> 
-		 * @since 2.0
-		 */
-		public String getFeatureApplication();
-		
-		/**
-		 * Returns URLs to the feature "root" locations. The root
-		 * URLs are install locations of the feature plugin and its
-		 * fragments.
-		 *
-		 * @return array of URLs, or an empty array
-		 * @since 2.0
-		 */
-		public URL[] getFeatureRootURLs();
-	}
-	
-	/**
-	 * Create a site entry
-	 *
-	 * @param url site URL
-	 * @param policy site policy
-	 * @return created site entry
-	 * @since 2.0
-	 */	
-	public ISiteEntry createSiteEntry(URL url, ISitePolicy policy);
-			
-	/**
-	 * Create a site policy. The policy determines the way the site
-	 * plug-in are processed at startpu
-	 *
-	 * @param type policy type
-	 * @param list an array of site-relative paths representing the
-	 * inclusion/ exclusion list
-	 * @return created site policy entry
-	 * @since 2.0
-	 */		
-	public ISitePolicy createSitePolicy(int type, String[] list);
-	
-	/**
-	 * Create a feature entry
-	 * @param id feature identifier. Must not be <code>null</code>.
-	 * @param version feature version (as String). Can be <code>null</code>.
-	 * @param application identifier of the application to run when 
-	 * this feature is the primary feature. Can be <code>null</code>.
-	 * If specified, the identifier must represent a valid extension 
-	 * registered in the <code>org.eclipse.core.runtime.applications</code>
-	 * extension point.
-	 * @param an array of URLs to feature root directories.
-	 * These are URLs to install locations for the feature plugin
-	 * and its fragments. Can be <code>null</code>.
-	 * @return create feature entry
-	 * @since 2.0
-	 */	
-	public IFeatureEntry createFeatureEntry(String id, String version, String application, URL[] root);
-		
-	/**
-	 * Configures the specified site entry. If a site entry with the
-	 * same site URL is already configured, the entry is <b>not</b> replaced.
-	 * 
-	 * @param entry site entry 
-	 * @since 2.0
-	 */	
-	public void configureSite(ISiteEntry entry);
-		
-	/**
-	 * Configures the specified site entry. If a site entry with the
-	 * same site URL is already configured, the replacement behavior for
-	 * the entry can be specified.
-	 * 
-	 * @param entry site entry 
-	 * @param  flag indicating whether an existing configured entry with
-	 * the same URL should be replaced (<code>true</code>) or not (<code>false</code>).
-	 * @since 2.0
-	 */	
-	public void configureSite(ISiteEntry entry, boolean replace);
-		
-	/**
-	 * Unconfigures the specified entry. Does not do anything if the entry
-	 * is not configured.
-	 * 
-	 * @param entry site entry
-	 * @since 2.0
-	 */	
-	public void unconfigureSite(ISiteEntry entry);
-		
-	/**
-	 * Returns configured site entries
-	 * 
-	 * @return array of site entries. Returns an empty array if no sites are
-	 * configured
-	 * @since 2.0
-	 */	
-	public ISiteEntry[] getConfiguredSites();
-		
-	/**
-	 * Returns a site entry matching the specified URL
-	 * 
-	 * @param url site url
-	 * @return matching site entry, or <code>null</code> if no match found
-	 * @since 2.0
-	 */	
-	public ISiteEntry findConfiguredSite(URL url);
-	
-	/**
-	 * Configures the feature entry.
-	 * If another feature entry with the same feature identifier 
-	 * already exists, it is replaced.
-	 * @param entry feature entry
-	 * @since 2.0
-	 */
-	public void configureFeatureEntry(IFeatureEntry entry);
-	
-	/**
-	 * Unconfigures the specified feature entry if it exists.
-	 * @param entry feature entry
-	 * @since 2.0
-	 */
-	public void unconfigureFeatureEntry(IFeatureEntry entry);
-	
-	/**
-	 * Returns a list of configured feature entries.
-	 * @return array or entries, or an empty array if no entries
-	 * are configured
-	 * @since 2.0
-	 */
-	public IFeatureEntry[] getConfiguredFeatureEntries();
-	
-	/**
-	 * Locates the specified feature entry.
-	 * @param id feature identifier
-	 * @return ferature entry, or <code>null</code>.
-	 * @since 2.0
-	 */
-	public IFeatureEntry findConfiguredFeatureEntry(String id);
-	
-	/**
-	 * Returns the URL location of the configuration information
-	 * 
-	 * @return configuration location URL, or <code>null</code> if the
-	 * configuration location could not be determined.
-	 * @since 2.0
-	 */
-	public URL getConfigurationLocation();
-		
-	/**
-	 * Returns a stamp reflecting the current state of the configuration. If called repeatedly,
-	 * returns the same value as long as no changes were made to the configuration (changes to
-	 * sites, features or plugins).
-	 * 
-	 * @return configuration change stamp
-	 * @since 2.0
-	 */
-	public long getChangeStamp();
-		
-	/**
-	 * Returns a stamp reflecting the current state of the features in the configuration. 
-	 * If called repeatedly, returns the same value as long as no changes were made to
-	 * features in the configuration.
-	 * 
-	 * @return configuration features change stamp 
-	 * @since 2.0
-	 */
-	public long getFeaturesChangeStamp();
-		
-	/**
-	 * Returns a stamp reflecting the current state of the plug-ins in the configuration. 
-	 * If called repeatedly, returns the same value as long as no changes were made to
-	 * plug-ins in the configuration.
-	 * 
-	 * @return configuration plug-ins change stamp 
-	 * @since 2.0
-	 */
-	public long getPluginsChangeStamp();	
-			
-		
-		
-	/**
-	 * Returns the identifier of the configured primary feature. A primary feature
-	 * is used to specify product customization information for a running instance
-	 * of Eclipse. 
-	 * 
-	 * @return primary feature identifier, or <code>null</code> if none configured
-	 * @since 2.0
-	 */
-	public String getPrimaryFeatureIdentifier();	
-	
-	/**
-	 * Computes the plug-in path for this configuration. The result includes all plug-ins
-	 * visible on each of the configured sites based on each site policy.
-	 * 
-	 * @return an array of plug-in path elements (full URL entries), or an empty array.
-	 * @since 2.0
-	 */
-	public URL[] getPluginPath();		
-				
-	/**
-	 * Returns an array of bootstrap plugin identifiers whose
-	 * location needs to be explicitly identified in the configuration.
-	 * 
-	 * @return an array of identifiers, or empty array
-	 * otherwise
-	 * @since 2.0
-	 */
-	public String[] getBootstrapPluginIdentifiers();			
-				
-	/**
-	 * Sets the location of a bootstrap plugin.
-	 * 
-	 * @see IPlatformConfiguration#getBootstrapPluginIdentifiers()
-	 * @param id plugin identifier. Must match one of the entries returned
-	 * by getBootstrapPluginIdentifiers()
-	 * @param location
-	 * @since 2.0
-	 */
-	public void setBootstrapPluginLocation(String id, URL location);	
-				
-	/**
-	 * Returns an indication whether the configuration can be updated.
-	 * 
-	 * @return <code>true</code> if configuration can be updated, <code>false</code> 
-	 * otherwise
-	 * @since 2.0
-	 */
-	public boolean isUpdateable();	
-		
-	/**
-	 * Returns an indication whether the configuration is transient. A transient
-	 * configuration typically represents a scenario where the configuration
-	 * was computed for a single instantiation of the platform and is not
-	 * guaranteed to be valid on subsequent instantiations.
-	 * 
-	 * @return <code>true</code> if configuration is transient, <code>false</code> 
-	 * otherwise
-	 * @since 2.0
-	 */
-	public boolean isTransient();		
-		
-	/**
-	 * Indicates whether the configuration is transient or not. A transient
-	 * configuration typically represents a scenario where the configuration
-	 * was computed for a single instantiation of the platform and is not
-	 * guaranteed to be valid on subsequent instantiations. This method has
-	 * no effect if called on the current platform configuration.
-	 * 
-	 * @see BootLoader#getCurrentPlatformConfiguration()
-	 * @param value <code>true</code> if configuration is transient, <code>false</code> 
-	 * otherwise
-	 * @since 2.0
-	 */
-	public void isTransient(boolean value);	
-	
-	/**
-	 * Called to refresh the configuration information. In particular,
-	 * causes change stamps to be recomputed based on the current
-	 * configuration state, and updates the lists of available plug-ins.
-	 * @since 2.0
-	 */	
-	public void refresh();
-	
-	/**
-	 * Called to save the configuration information
-	 * @since 2.0
-	 */	
-	public void save() throws IOException;
-	
-	/**
-	 * Called to save the configuration information in the
-	 * specified location
-	 * 
-	 * @param url save location.
-	 * @since 2.0
-	 */	
-	public void save(URL url) throws IOException;
-
-}
-

bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/IPlatformRunnable.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/IPlatformRunnable.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/IPlatformRunnable.java
deleted file mode 100644
index 9c912d1..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/IPlatformRunnable.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.boot;
-
-/**
- * Bootstrap type for the platform. Platform runnables represent executable 
- * entry points into plug-ins.  Runnables can be configured into the Platform's
- * <code>org.eclipse.core.runtime.applications</code> extension-point 
- * or be made available through code or extensions on other plug-in's extension-points.
- *
- * <p>
- * Clients may implement this interface.
- * </p>
- */
-public interface IPlatformRunnable {
-	
-/**
- * Exit object indicating normal termination
- */
-public static final Integer EXIT_OK = new Integer(0);
-
-/**
- * Exit object requesting platform restart
- */
-public static final Integer EXIT_RESTART = new Integer(23);
-	
-/**
- * Runs this runnable with the given args and returns a result.
- * The content of the args is unchecked and should conform to the expectations of
- * the runnable being invoked.  Typically this is a <code>String<code> array.
- * 
- * @exception Exception if there is a problem running this runnable.
- */
-public Object run(Object args) throws Exception;
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/package.html

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/package.html b/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/package.html
deleted file mode 100644
index d87fdf3..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/boot/package.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="Author" content="IBM">
-   <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
-   <title>Package-level Javadoc</title>
-</head>
-<body>
-Provides basic support for launching the Eclipse Platform.
-<h2>
-Package Specification</h2>
-The Eclipse Platform makes heavy use of Java class loaders for loading
-plug-ins. Even the Platform Core Runtime itself, including the <tt>Platform</tt>
-class, needs to be loaded by a special class loader. The upshot is that
-a client program (such as a Java main program, a servlet) cannot directly
-reference even the <tt>Platform</tt> class. Instead, a client must use
-a boot loader (provided here) for initializing the platform, invoking functionality
-defined in plug-ins, and shutting down the platform when done.
-<br>&nbsp;
-</body>
-</html>

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/DelegatingURLClassLoader.java

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
deleted file mode 100644
index 7a1b38a..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/DelegatingURLClassLoader.java
+++ /dev/null
@@ -1,802 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.net.*;
-import java.util.*;
-import java.io.*;
-import java.security.CodeSource;
-import java.security.ProtectionDomain;
-import org.eclipse.core.boot.BootLoader;
-import com.ibm.oti.vm.VM;
-
-public abstract class DelegatingURLClassLoader extends URLClassLoader {
-
-	// loader base
-	protected URL base;
-
-	// delegation chain
-	protected DelegateLoader[] imports = null;
-
-	// extra resource class loader
-	protected URLClassLoader resourceLoader = null;
-
-	// filter table
-	private Hashtable filterTable = new Hashtable();
-
-	// development mode class path additions
-	public static String devClassPath = null;
-
-	// control class load tracing
-	public static boolean DEBUG = false;
-	public static boolean DEBUG_SHOW_CREATE = true;
-	public static boolean DEBUG_SHOW_ACTIVATE = true;
-	public static boolean DEBUG_SHOW_ACTIONS = true;
-	public static boolean DEBUG_SHOW_SUCCESS = true;
-	public static boolean DEBUG_SHOW_FAILURE = true;
-	public static String[] DEBUG_FILTER_CLASS = new String[0];
-	public static String[] DEBUG_FILTER_LOADER = new String[0];
-	public static String[] DEBUG_FILTER_RESOURCE = new String[0];
-	public static String[] DEBUG_FILTER_NATIVE = new String[0];
-	
-	public static final String PLUGIN = "plugin"; //$NON-NLS-1$
-
-	private static boolean isHotSwapEnabled = InternalBootLoader.inDevelopmentMode() & ((VM.class.getModifiers() & java.lang.reflect.Modifier.ABSTRACT) == 0);
-	
-	private static String[] JAR_VARIANTS = buildJarVariants();
-	private static String[] LIBRARY_VARIANTS = buildLibraryVariants();
-
-	// DelegateLoader. Represents a single class loader this loader delegates to.
-	protected static class DelegateLoader {
-
-		private DelegatingURLClassLoader loader;
-		private boolean isExported;
-
-		public DelegateLoader(DelegatingURLClassLoader loader, boolean isExported) {
-			this.loader = loader;
-			this.isExported = isExported;
-		}
-
-		public Class loadClass(String name, DelegatingURLClassLoader current, DelegatingURLClassLoader requestor, Vector seen) {
-			if (isExported || current == requestor)
-				return loader.loadClass(name, false, requestor, seen, false);
-			else
-				return null;
-		}
-
-		public URL findResource(String name, DelegatingURLClassLoader current, DelegatingURLClassLoader requestor, Vector seen) {
-			if (isExported || current == requestor)
-				return loader.findResource(name, requestor, seen);
-			else
-				return null;
-		}
-		public Enumeration findResources(String name, DelegatingURLClassLoader current, DelegatingURLClassLoader requestor, Vector seen) {
-			if (isExported || current == requestor)
-				return loader.findResources(name, requestor, seen);
-			else
-				return null;
-		}
-	}
-
-	// unchecked DelegatingLoaderException
-	protected static class DelegatingLoaderException extends RuntimeException {
-		Exception e = null;
-
-		public DelegatingLoaderException() {
-			super();
-		}
-
-		public DelegatingLoaderException(String message) {
-			super(message);
-		}
-
-		public DelegatingLoaderException(String message, Exception e) {
-			super(message);
-			this.e = e;
-		}
-
-		public Throwable getException() {
-			return e;
-		}
-		
-		public void printStackTrace() {
-			printStackTrace(System.err);
-		}
-		
-		public void printStackTrace(PrintStream output) {
-			synchronized (output) {
-				if (e != null) {
-					output.print("org.eclipse.core.internal.boot.DelegatingLoaderException: "); //$NON-NLS-1$
-					e.printStackTrace(output);
-				} else
-					super.printStackTrace(output);
-			}
-		}
-		
-		public void printStackTrace(PrintWriter output) {
-			synchronized (output) {
-				if (e != null) {
-					output.print("org.eclipse.core.internal.boot.DelegatingLoaderException: "); //$NON-NLS-1$
-					e.printStackTrace(output);
-				} else
-					super.printStackTrace(output);
-			}
-		}
-	}
-	
-private static String[] buildJarVariants() {
-	ArrayList result = new ArrayList();
-	
-	result.add("ws/" + InternalBootLoader.getWS() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
-	result.add("os/" + InternalBootLoader.getOS() + "/" + InternalBootLoader.getOSArch() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	result.add("os/" + InternalBootLoader.getOS() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
-	String nl = InternalBootLoader.getNL();
-	nl = nl.replace('_', '/');
-	while (nl.length() > 0) {
-		result.add("nl/" + nl + "/"); //$NON-NLS-1$ //$NON-NLS-2$
-		int i = nl.lastIndexOf('/'); //$NON-NLS-1$
-		nl = (i < 0) ? "" : nl.substring(0, i); //$NON-NLS-1$
-	}
-	result.add(""); //$NON-NLS-1$
-	return (String[])result.toArray(new String[result.size()]);
-}
-
-private static String[] buildLibraryVariants() {
-	ArrayList result = new ArrayList();
-	
-	result.add("ws/" + InternalBootLoader.getWS() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
-	result.add("os/" + InternalBootLoader.getOS() + "/" + InternalBootLoader.getOSArch() + "/"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	result.add("os/" + InternalBootLoader.getOS() + "/"); //$NON-NLS-1$ //$NON-NLS-2$
-	String nl = InternalBootLoader.getNL();
-	nl = nl.replace('_', '/');
-	while (nl.length() > 0) {
-		result.add("nl/" + nl + "/"); //$NON-NLS-1$ //$NON-NLS-2$
-		int i = nl.lastIndexOf('/');
-		nl = (i < 0) ? "" : nl.substring(0, i); //$NON-NLS-1$
-	}
-	result.add (""); //$NON-NLS-1$
-	return (String[])result.toArray(new String[result.size()]);
-}
-
-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);
-
-	if (resourcePath != null && resourcePath.length > 0)
-		resourceLoader = new ResourceLoader(resourcePath);
-
-	if (codePath != null) {
-		if (codeFilters == null || codeFilters.length != codePath.length)
-			throw new DelegatingLoaderException();
-		setHotSwapPath(this, codePath);
-		for (int i = 0; i < codePath.length; i++) {
-			if (codeFilters[i] != null)
-				filterTable.put(codePath[i], codeFilters[i]);
-		}
-	}
-	if (resourcePath != null) {
-		if (resourceFilters == null || resourceFilters.length != resourcePath.length)
-			throw new DelegatingLoaderException();
-		for (int i = 0; i < resourcePath.length; i++) {
-			if (resourceFilters[i] != null)
-				filterTable.put(resourcePath[i], resourceFilters[i]);
-		}
-	}
-}
-
-/**
- * This method is to be used internally only for adding the proper class path and resource path
- * entries to the class loaders for Runtime and Xerces. They are special cases since they need
- * to be brought up before everything else. (and before the registry is loaded)
- */
-public void addURLs(URL[] codePath, URLContentFilter[] codeFilters, URL[] resourcePath, URLContentFilter[] resourceFilters) {
-	Set keys = filterTable.keySet();
-
-	codePath = mungeJarURLs(codePath);
-	resourcePath = mungeJarURLs(resourcePath);
-	if (resourcePath != null && resourcePath.length > 0)
-		resourceLoader = new ResourceLoader(resourcePath);
-
-	if (codePath != null) {
-		if (codeFilters == null || codeFilters.length != codePath.length)
-			throw new DelegatingLoaderException();
-		setHotSwapPath(this, codePath);
-		for (int i=0; i<codePath.length; i++) {
-			URL path = codePath[i];
-			if (!keys.contains(path)) {
-				addURL(path);
-				filterTable.put(path, codeFilters[i]);
-			}
-		}
-	}
-	
-	if (resourcePath != null) {
-		if (resourceFilters == null || resourceFilters.length != resourcePath.length)
-			throw new DelegatingLoaderException();
-		for (int i = 0; i < resourcePath.length; i++) {
-			URL path = resourcePath[i];
-			if (resourceFilters[i] != null && !keys.contains(path))
-				filterTable.put(path, resourceFilters[i]);
-		}
-	}
-}
-
-/**
- * strip-off jar: protocol
- */ 
-private static URL mungeJarURL(URL url) {
-	if (url.getProtocol().equals("jar")) { //$NON-NLS-1$
-		String file = url.getFile();
-		if (file.startsWith("file:")) { //$NON-NLS-1$
-			int ix = file.indexOf("!/"); //$NON-NLS-1$
-			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 given class or <code>null</code> if the class is not visible to the
- * given requestor.  The <code>inCache</code> flag controls how this action is
- * reported if in debug mode.
- */
-protected Class checkClassVisibility(Class result, DelegatingURLClassLoader requestor, boolean inCache) {
-	if (result == null)
-		return null;
-	if (isClassVisible(result, requestor)) {
-		if (DEBUG && DEBUG_SHOW_SUCCESS && debugClass(result.getName()))
-			debug("found " + result.getName() + " in " + (inCache ? "cache" : getURLforClass(result).toExternalForm())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	} else {
-		if (DEBUG && DEBUG_SHOW_ACTIONS && debugClass(result.getName()))
-			debug("skip " + result.getName() + " in " + (inCache ? "cache" : getURLforClass(result).toExternalForm())); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return null;
-	}
-	return result;
-}
-/**
- * Returns the given resource URL or <code>null</code> if the resource is not visible to the
- * given requestor.  
- */
-protected URL checkResourceVisibility(String name, URL result, DelegatingURLClassLoader requestor) {
-	if (result == null)
-		return null;
-	if (isResourceVisible(name, result, requestor)) {
-		if (DEBUG && DEBUG_SHOW_SUCCESS && debugResource(name))
-			debug("found " + result); //$NON-NLS-1$
-	} else {
-		if (DEBUG && DEBUG_SHOW_ACTIONS && debugResource(name))
-			debug("skip " + result); //$NON-NLS-1$
-		result = null;
-	}
-	return result;
-}
-protected void debug(String s) {
-	System.out.println(toString()+"^"+Integer.toHexString(Thread.currentThread().hashCode())+" "+s); //$NON-NLS-1$ //$NON-NLS-2$
-}
-protected boolean debugClass(String name) {
-	
-	if (debugLoader()) {
-		return debugMatchesFilter(name,DEBUG_FILTER_CLASS);
-	}
-	return false;
-}
-protected void debugConstruction() {
-	if (DEBUG && DEBUG_SHOW_CREATE && debugLoader()) {
-		URL[] urls = getURLs();
-		debug("Class Loader Created"); //$NON-NLS-1$
-		debug("> baseURL=" + base); //$NON-NLS-1$
-		if (urls == null || urls.length == 0)
-			debug("> empty search path"); //$NON-NLS-1$
-		else {
-			URLContentFilter filter;
-			for (int i = 0; i < urls.length; i++) {
-				debug("> searchURL=" + urls[i].toString()); //$NON-NLS-1$
-				filter = (URLContentFilter) filterTable.get(urls[i]);
-				if (filter != null)
-					debug(">    export=" + filter.toString()); //$NON-NLS-1$
-			}
-		}
-	}
-}
-protected String debugId() {
-	return ""; //$NON-NLS-1$
-}
-protected boolean debugLoader() {
-	
-	return debugMatchesFilter(debugId(),DEBUG_FILTER_LOADER);
-}
-private boolean debugMatchesFilter(String name, String[] filter) {
-
-	if (filter.length==0) return false;
-	
-	for (int i=0; i<filter.length; i++) {
-		if (filter[i].equals("*")) return true; //$NON-NLS-1$
-		if (name.startsWith(filter[i])) return true;
-	}
-	return false;
-}
-protected boolean debugNative(String name) {
-	
-	if (debugLoader()) {
-		return debugMatchesFilter(name,DEBUG_FILTER_NATIVE);
-	}
-	return false;
-}
-protected boolean debugResource(String name) {
-	
-	if (debugLoader()) {
-		return debugMatchesFilter(name,DEBUG_FILTER_RESOURCE);
-	}
-	return false;
-}
-protected void enableHotSwap(ClassLoader cl, Class clazz) {
-	if (isHotSwapEnabled)
-		VM.enableClassHotSwap(clazz);
-}
-/**
- * Looks for the requested class in the parent of this loader using
- * standard Java protocols.  If the parent is null then the system class
- * loader is consulted.  <code>null</code> is returned if the class could
- * not be found.
- */
-protected Class findClassParents(String name, boolean resolve) {
-	try {
-		ClassLoader parent = getParent();
-		if (parent == null)
-			return findSystemClass(name);
-		return parent.loadClass(name);
-	} catch (ClassNotFoundException e) {
-	}
-	return null;
-}
-/**
- * Finds and loads the class with the specified name from the URL search
- * path. Any URLs referring to JAR files are loaded and opened as needed
- * until the class is found.   Search on the parent chain and then self.
- *
- * Subclasses should implement this method.
- *
- * @param name the name of the class
- * @param resolve whether or not to resolve the class if found
- * @param requestor class loader originating the request
- * @param checkParents whether the parent of this loader should be consulted
- * @return the resulting class
- */
-protected abstract Class findClassParentsSelf(String name, boolean resolve, DelegatingURLClassLoader requestor, boolean checkParents);
-/**
- * Finds and loads the class with the specified name from the URL search
- * path. Any URLs referring to JAR files are loaded and opened as needed
- * until the class is found.  This method consults only the platform class loader.
- *
- * @param name the name of the class
- * @param resolve whether or not to resolve the class if found
- * @param requestor class loader originating the request
- * @param checkParents whether the parent of this loader should be consulted
- * @return the resulting class
- */
-protected Class findClassPlatform(String name, boolean resolve, DelegatingURLClassLoader requestor, boolean checkParents) {
-	DelegatingURLClassLoader platform = PlatformClassLoader.getDefault();
-	if (this == platform)
-		return null;
-	return platform.findClassParentsSelf(name, resolve, requestor, false);
-}
-/**
- * Finds and loads the class with the specified name from the URL search
- * path. Any URLs referring to JAR files are loaded and opened as needed
- * until the class is found.  This method considers only the classes loadable
- * by its explicit prerequisite loaders.
- *
- * @param name the name of the class
- * @param requestor class loader originating the request
- * @param seen list of delegated class loaders already searched
- * @return the resulting class
- */
-protected Class findClassPrerequisites(final String name, DelegatingURLClassLoader requestor, Vector seen) {
-	if (imports == null)
-		return null;
-	if (seen == null)
-		seen = new Vector(); // guard against delegation loops
-	seen.addElement(this);
-	// Grab onto the imports value to protect against concurrent write.
-	DelegateLoader[] loaders = imports;
-	for (int i = 0; i < loaders.length; i++) {
-		Class result = loaders[i].loadClass(name, this, requestor, seen);
-		if (result != null)
-			return result;
-	}
-	return null;
-}
-/**
- * Finds the resource with the specified name on the URL search path.
- * This method is used specifically to find the file containing a class to verify
- * that the class exists without having to load it.
- * Returns a URL for the resource.  Searches only this loader's classpath.
- * <code>null</code> is returned if the resource cannot be found.
- *
- * @param name the name of the resource
- */
-protected URL findClassResource(String name) {
-	return super.findResource(name);
-}
-/**
- * Returns the absolute path name of a native library. The VM
- * invokes this method to locate the native libraries that belong
- * to classes loaded with this class loader. If this method returns
- * <code>null</code>, the VM searches the library along the path
- * specified as the <code>java.library.path</code> property.
- *
- * @param      libname   the library name
- * @return     the absolute path of the native library
- */
-protected String findLibrary(String libName) {
-	if (libName.length() == 0)
-		return null;
-	if (libName.charAt(0) == '/' || libName.charAt(0) == '\\')
-		libName = libName.substring(1);
-	libName = System.mapLibraryName(libName);
-
-	if (DEBUG && DEBUG_SHOW_ACTIONS && debugNative(libName))
-		debug("findLibrary(" + libName + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-	if (base == null)
-		return null;
-	String libFileName = null;
-	if (base.getProtocol().equals(PlatformURLHandler.FILE)) {
-		// directly access library	
-		libFileName = (base.getFile() + libName).replace('/', File.separatorChar);
-	} else {
-		if (base.getProtocol().equals(PlatformURLHandler.PROTOCOL)) {
-			URL[] searchList = getSearchURLs (base);
-			if ((searchList != null) && (searchList.length != 0)) {
-				URL foundPath = searchVariants(searchList, LIBRARY_VARIANTS, libName);
-				if (foundPath != null) 
-					libFileName = foundPath.getFile();
-			}
-		}
-	}
-
-	if (libFileName == null)
-		return null;
-		
-	return new File(libFileName).getAbsolutePath();
-}
-/**
- * Finds the resource with the specified name on the URL search path.
- * Returns a URL for the resource. If resource is not found in own 
- * URL search path, delegates search to prerequisite loaders.
- * Null is returned if none of the loaders find the resource.
- *
- * @param name the name of the resource
- */
-public URL findResource(String name) {
-	return findResource(name, this, null);
-}
-/**
- * Delegated resource access call. 
- * Does not check prerequisite loader parent chain.
- */
-protected URL findResource(String name, DelegatingURLClassLoader requestor, Vector seen) {
-	// guard against delegation loops
-	if (seen != null && seen.contains(this))
-		return null;
-
-	if (DEBUG && DEBUG_SHOW_ACTIONS && debugResource(name))
-		debug("findResource(" + name + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	// check the normal class path for self
-	URL result = super.findResource(name);
-	result = checkResourceVisibility(name, result, requestor);
-	if (result != null)
-		return result;
-
-	// check our extra resource path if any
-	if (resourceLoader != null) {
-		result = resourceLoader.findResource(name);
-		result = checkResourceVisibility(name, result, requestor);
-		if (result != null)
-			return result;
-	}
-
-	// delegate down the prerequisite chain if we haven't found anything yet.
-	if (imports != null) {
-		if (seen == null)
-			seen = new Vector(); // guard against delegation loops
-		seen.addElement(this);
-		for (int i = 0; i < imports.length && result == null; i++)
-			result = imports[i].findResource(name, this, requestor, seen);
-	}
-	return result;
-}
-/**
- * Returns an Enumeration of URLs representing all of the resources
- * on the URL search path having the specified name.
- *
- * @param name the resource name
- */
-public Enumeration findResources(String name) throws IOException {
-	return findResources(name, this, null);
-}
-/**
- * Delegated call to locate all named resources. 
- * Does not check prerequisite loader parent chain.
- */
-private Enumeration findResources(String name, DelegatingURLClassLoader requestor, Vector seen) {
-	// guard against delegation loops
-	if (seen != null && seen.contains(this))
-		return null;
-
-	if (DEBUG && DEBUG_SHOW_ACTIONS && debugResource(name))
-		debug("findResources(" + name + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	// check own URL search path
-	Enumeration e = null;
-	try {
-		e = super.findResources(name);
-	} catch (IOException ioe) {
-		//fall through and search prerequisites
-	}
-	ResourceEnumeration result = new ResourceEnumeration(name, e, this, requestor);
-
-	// delegate down the prerequisite chain
-	if (imports != null) {
-		if (seen == null)
-			seen = new Vector(); // guard against delegation loops
-		seen.addElement(this);
-		for (int i = 0; i < imports.length; i++)
-			result.add(imports[i].findResources(name, this, requestor, seen));
-	}
-
-	return result;
-}
-protected String getFileFromURL(URL target) {
-	try {
-		URL url = InternalBootLoader.resolve(target);
-		String protocol = url.getProtocol();
-		// check only for the file protocol here.  Not interested in Jar files.
-		if (protocol.equals(PlatformURLHandler.FILE))
-			return url.getFile();
-	} catch (IOException e) {
-		//couldn't resolve the target - return null
-	}
-	return null;
-}
-
-private URL[] getSearchURLs (URL base) {
-	URL[] auxList = null;
-	ArrayList result = new ArrayList();
-
-	PlatformURLConnection c = null;
-	try {
-		c = (PlatformURLConnection) base.openConnection();
-		result.add(c.getURLAsLocal());
-	} catch (IOException e) {
-		// Catch intentionally left empty.  Skip 
-		// poorly formed URLs
-	}
-
-	try {
-		auxList = c.getAuxillaryURLs();
-		int auxLength = (auxList == null) ? 0 : auxList.length;
-	
-		// Now add the fragment URLs to the result
-		for (int i = 0; i < auxLength; i++) {
-			try {
-				c = (PlatformURLConnection) auxList[i].openConnection();
-				result.add(c.getURLAsLocal());
-			} catch (IOException e) {
-				// Catch intentionally left empty.  Skip 
-				// poorly formed URLs
-			}
-		}
-	} catch (IOException e) {
-		// Catch intentionally left empty.  Skip 
-		// poorly formed URLs
-	}
-	
-	return (URL[])result.toArray(new URL[result.size()]);
-}
-
-private URL searchVariants (URL[] basePaths, String[] variants, String path) {
-	// This method assumed basePaths are 'resolved' URLs
-	for (int i = 0; i < variants.length; i++) {
-		for (int j = 0; j < basePaths.length; j++) {
-			String fileName = basePaths[j].getFile() + variants[i] + path;
-			File file = new File(fileName);
-			if (!file.exists()) {
-				if (DEBUG && DEBUG_SHOW_FAILURE)
-					debug("not found " + file.getAbsolutePath()); //$NON-NLS-1$
-			} else {	
-				if (DEBUG && DEBUG_SHOW_SUCCESS)
-					debug("found " + path + " as " + file.getAbsolutePath()); //$NON-NLS-1$ //$NON-NLS-2$
-				try {
-					return new URL ("file:" + fileName); //$NON-NLS-1$
-				} catch (MalformedURLException e) {
-					// Intentionally ignore this exception
-					// so we continue looking for a matching
-					// URL.
-				}
-			}		
-		}
-	}
-	return null;
-}
-public URL getResource(String name) {
-	if (DEBUG && DEBUG_SHOW_ACTIONS && debugResource(name))
-		debug("getResource(" + name + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	URL result = super.getResource(name);
-	if (result == null) {
-		if (DEBUG && DEBUG_SHOW_FAILURE && debugResource(name))
-			debug("not found " + name); //$NON-NLS-1$
-	}
-	return result;
-}
-private URL getURLforClass(Class clazz) {
-	ProtectionDomain pd = clazz.getProtectionDomain();
-	if (pd != null) {
-		CodeSource cs = pd.getCodeSource();
-		if (cs != null)
-			return cs.getLocation();
-	}
-	if (DEBUG && DEBUG_SHOW_ACTIONS && debugClass(clazz.getName()))
-		debug("*** " + clazz.getName()); //$NON-NLS-1$
-	return null;
-}
-public void initializeImportedLoaders() {
-}
-/**
- * check to see if class is visible (exported)
- */
-boolean isClassVisible(Class clazz, DelegatingURLClassLoader requestor) {
-	URL lib = getURLforClass(clazz);
-	if (lib == null)
-		return true; // have a system class (see comment below)
-
-	URLContentFilter filter = (URLContentFilter) filterTable.get(lib);
-	if (filter == null) {
-		// This code path is being executed because some VMs (eg. Sun JVM)
-		// return from the class cache classes that were not loaded
-		// by this class loader. Consequently we do not find the 
-		// corresponding jar filter. This appears to be a performance
-		// optimization that we are defeating with our filtering scheme.
-		// We return the class if it is a system class (see above). Otherwise
-		// we reject the class which caused the load to be
-		// delegated down the prerequisite chain until we find the
-		// correct loader.
-		if (DEBUG && DEBUG_SHOW_ACTIONS && debugClass(clazz.getName()))
-			debug("*** Unable to find library filter for " + clazz.getName() + " from " + lib); //$NON-NLS-1$ //$NON-NLS-2$
-		return false;
-	} else
-		return filter.isClassVisible(clazz, this, requestor);
-}
-/**
- * check to see if resource is visible (exported)
- */
-boolean isResourceVisible(String name, URL resource, DelegatingURLClassLoader requestor) {
-	URL lib = null;
-	String file = resource.getFile();
-	try {
-		lib = new URL(resource.getProtocol(), resource.getHost(), file.substring(0, file.length() - name.length()));
-	} catch (MalformedURLException e) {
-		if (DEBUG)
-			debug("Unable to determine resource lib for " + name + " from " + resource); //$NON-NLS-1$ //$NON-NLS-2$
-		return false;
-	}
-
-	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); //$NON-NLS-1$ //$NON-NLS-2$
-		return false;
-	} else
-		return filter.isResourceVisible(name, this, requestor);
-}
-/**
- * Non-delegated load call.  This method is not synchronized.  Implementations of
- * findClassParentsSelf, and perhaps others, should synchronize themselves as
- * required.  Synchronizing this method is too coarse-grained.   It results in plugin
- * activation being synchronized and may cause deadlock.
- */
-protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
-	if (DEBUG && DEBUG_SHOW_ACTIONS && debugClass(name))
-		debug("loadClass(" + name + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-	Class result = loadClass(name, resolve, this, null, true);
-	if (result == null) {
-		if (DEBUG && DEBUG_SHOW_FAILURE && debugClass(name))
-			debug("not found " + name); //$NON-NLS-1$
-		throw new ClassNotFoundException(name);
-	}
-	return result;
-}
-/**
- * Delegated load call.  This method is not synchronized.  Implementations of
- * findClassParentsSelf, and perhaps others, should synchronize themselves as
- * required.  Synchronizing this method is too coarse-grained.   It results in plugin
- * activation being synchronized and may cause deadlock.
- */
-private Class loadClass(String name, boolean resolve, DelegatingURLClassLoader requestor, Vector seen, boolean checkParents) {
-	// guard against delegation loops
-	if (seen != null && seen.contains(this))
-		return null;
-
-	// look in the parents and self
-	Class result = findClassParentsSelf(name, resolve, requestor, checkParents);
-
-	// search platform
-	if (result == null)
-		result = findClassPlatform(name, resolve, requestor, false);
-
-	// search prerequisites
-	if (result == null)
-		result = findClassPrerequisites(name, requestor, seen);
-
-	// if we found a class, consider resolving it
-	if (result != null && resolve)
-		resolveClass(result);
-
-	return result;
-}
-private void setHotSwapPath(ClassLoader cl, URL[] urls) {
-	if (!isHotSwapEnabled)
-		return;
-	StringBuffer path = new StringBuffer();
-	for(int i = 0; i < urls.length; i++) {
-		String file = getFileFromURL (urls[i]);
-		if (file != null) {
-			if (file.charAt(0) == '/')
-				file = file.substring(1, file.length());
-			if (file.charAt(file.length() - 1) == '/')
-				file = file.substring(0, file.length() - 1);
-			if (path.length() > 0)
-				path.append(";"); //$NON-NLS-1$
-			path.append(file);
-		}
-	}
-	if (path.length() > 0)
-		VM.setClassPathImpl(cl, path.toString());
-}
-protected void setImportedLoaders(DelegateLoader[] loaders) {
-	
-	imports = loaders;
-	
-	if(DEBUG && DEBUG_SHOW_CREATE && debugLoader()) {
-		debug("Imports"); //$NON-NLS-1$
-		if (imports==null || imports.length==0) debug("> none"); //$NON-NLS-1$
-		else {
-			for (int i=0; i<imports.length; i++) {
-				debug("> " + imports[i].loader.toString() + " export=" + imports[i].isExported); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-}
-public String toString() {
-	return "Loader [" + debugId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/InternalBootLoader.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/InternalBootLoader.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/InternalBootLoader.java
deleted file mode 100644
index 40a0bae..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/InternalBootLoader.java
+++ /dev/null
@@ -1,874 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformRunnable;
-
-/**
- * Special boot loader class for the Eclipse Platform. This class cannot
- * be instantiated; all functionality is provided by static methods.
- * <p>
- * The Eclipse Platform makes heavy use of Java class loaders for
- * loading plug-ins. Even the Platform Core Runtime itself, including
- * the <code>Platform</code> class, needs to be loaded by a special 
- * class loader. The upshot is that a client program (such as a Java main
- * program, a servlet) cannot directly reference even the 
- * <code>Platform</code> class. Instead, a client must use this
- * loader class for initializing the platform, invoking functionality
- * defined in plug-ins, and shutting down the platform when done.
- * </p>
- *
- * @see org.eclipse.core.runtime.Platform
- */
-public final class InternalBootLoader {
-	private static boolean running = false;
-	private static boolean starting = false;
-	private static String[] commandLine;
-	private static ClassLoader loader = null;
-	private static String baseLocation = null; // -data argument (workspace location)
-	private static String installLocation = null; // -install argument (product install location)
-	private static String applicationR10 = null; // R1.0 compatibility
-	private static URL installURL = null;
-	private static boolean debugRequested = false;
-	private static String devClassPath = null;
-	private static String debugOptionsFilename = null;
-	private static Properties options = null;
-	private static boolean inDevelopmentMode = false;	
-	private static PlatformConfiguration currentPlatformConfiguration = null;
-
-	// state for tracking the Platform context (e.g., the OS, Window system, locale, architecture, ...)
-	private static String nl = null;
-	private static String ws = null;
-	private static String os = null;
-	private static String arch = null;
-	
-	private static final String PLATFORM_ENTRYPOINT = "org.eclipse.core.internal.runtime.InternalPlatform"; //$NON-NLS-1$
-	private static final String BOOTNAME = "org.eclipse.core.boot"; //$NON-NLS-1$
-	private static final String RUNTIMENAME = "org.eclipse.core.runtime"; //$NON-NLS-1$
-	private static final String PLUGINSDIR = "plugins/"; //$NON-NLS-1$
-	private static final String LIBRARY = "library"; //$NON-NLS-1$
-	private static final String EXPORT = "export"; //$NON-NLS-1$
-	private static final String EXPORT_PUBLIC = "public"; //$NON-NLS-1$
-	private static final String EXPORT_PROTECTED = "protected"; //$NON-NLS-1$
-	private static final String META_AREA = ".metadata"; //$NON-NLS-1$
-	private static final String WORKSPACE = "workspace"; //$NON-NLS-1$
-	private static final String PLUGIN_PATH = ".plugin-path"; //$NON-NLS-1$
-	private static final String BOOTDIR = PLUGINSDIR + BOOTNAME + "/"; //$NON-NLS-1$
-	private static final String RUNTIMEDIR = PLUGINSDIR + RUNTIMENAME + "/"; //$NON-NLS-1$
-	private static final String OPTIONS = ".options"; //$NON-NLS-1$
-	// While we recognize the SunOS operating system, we change
-	// this internally to be Solaris.
-	private static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$
-	// While we recognize the i386 architecture, we change
-	// this internally to be x86.
-	private static final String INTERNAL_ARCH_I386 = "i386"; //$NON-NLS-1$
-
-	/** 
-	 * Execution options for the Runtime plug-in.  They are defined here because
-	 * we need to load them into the PlatformClassLoader which is created by the
-	 * boot system.  Users should see these options as Runtime options since there
-	 * boot does not figure into normal Platform operation.
-	 */
-	private static final String PI_RUNTIME = "org.eclipse.core.runtime"; //$NON-NLS-1$
-	private static final String OPTION_STARTTIME = PI_RUNTIME + "/starttime"; //$NON-NLS-1$
-	private static final String OPTION_LOADER_DEBUG = PI_RUNTIME + "/loader/debug"; //$NON-NLS-1$
-	private static final String OPTION_LOADER_SHOW_CREATE = PI_RUNTIME + "/loader/debug/create"; //$NON-NLS-1$
-	private static final String OPTION_LOADER_SHOW_ACTIVATE = PI_RUNTIME + "/loader/debug/activateplugin"; //$NON-NLS-1$
-	private static final String OPTION_LOADER_SHOW_ACTIONS = PI_RUNTIME + "/loader/debug/actions"; //$NON-NLS-1$
-	private static final String OPTION_LOADER_SHOW_SUCCESS = PI_RUNTIME + "/loader/debug/success"; //$NON-NLS-1$
-	private static final String OPTION_LOADER_SHOW_FAILURE = PI_RUNTIME + "/loader/debug/failure"; //$NON-NLS-1$
-	private static final String OPTION_LOADER_FILTER_CLASS = PI_RUNTIME + "/loader/debug/filter/class"; //$NON-NLS-1$
-	private static final String OPTION_LOADER_FILTER_LOADER = PI_RUNTIME + "/loader/debug/filter/loader"; //$NON-NLS-1$
-	private static final String OPTION_LOADER_FILTER_RESOURCE = PI_RUNTIME + "/loader/debug/filter/resource"; //$NON-NLS-1$
-	private static final String OPTION_LOADER_FILTER_NATIVE = PI_RUNTIME + "/loader/debug/filter/native"; //$NON-NLS-1$
-	private static final String OPTION_URL_DEBUG = PI_RUNTIME+ "/url/debug"; //$NON-NLS-1$
-	private static final String OPTION_URL_DEBUG_CONNECT = PI_RUNTIME+ "/url/debug/connect"; //$NON-NLS-1$
-	private static final String OPTION_URL_DEBUG_CACHE_LOOKUP = PI_RUNTIME+ "/url/debug/cachelookup"; //$NON-NLS-1$
-	private static final String OPTION_URL_DEBUG_CACHE_COPY = PI_RUNTIME+ "/url/debug/cachecopy"; //$NON-NLS-1$
-	private static final String OPTION_UPDATE_DEBUG = PI_RUNTIME+ "/update/debug"; //$NON-NLS-1$
-	private static final String OPTION_CONFIGURATION_DEBUG = PI_RUNTIME+ "/config/debug"; //$NON-NLS-1$
-
-	// command line arguments
-	private static final String DEBUG = "-debug"; //$NON-NLS-1$
-	private static final String DATA = "-data"; //$NON-NLS-1$
-	private static final String INSTALL = "-install"; //$NON-NLS-1$
-	private static final String DEV = "-dev"; //$NON-NLS-1$
-	private static final String WS = "-ws"; //$NON-NLS-1$
-	private static final String OS = "-os"; //$NON-NLS-1$
-	private static final String ARCH = "-arch"; //$NON-NLS-1$
-	private static final String NL = "-nl"; //$NON-NLS-1$
-	
-/**
- * Private constructor to block instance creation.
- */
-private InternalBootLoader() {
-}
-private static void assertNotRunning() {
-	if (running)
-		throw new RuntimeException(Policy.bind("platform.mustNotBeRunning")); //$NON-NLS-1$
-}
-private static void assertRunning() {
-	if (!running)
-		throw new RuntimeException(Policy.bind("platform.notRunning")); //$NON-NLS-1$
-}
-/**
- * Configure the class loader for the runtime plug-in.  
- */
-private static PlatformClassLoader configurePlatformLoader() {
-	Object[] loadPath = getPlatformClassLoaderPath();
-	URL base = null;
-	try {
-		base = new URL(PlatformURLBaseConnection.PLATFORM_URL_STRING+RUNTIMEDIR);
-	} catch (MalformedURLException e) {
-		//proceed without runtime plugin in platform loader -- is this possible?
-	}
-	return new PlatformClassLoader((URL[]) loadPath[0], (URLContentFilter[]) loadPath[1], InternalBootLoader.class.getClassLoader(), base);
-}
-/**
- * @see BootLoader
- */
-public static boolean containsSavedPlatform(String location) {
-	return new File(location + "/" + META_AREA).exists(); //$NON-NLS-1$
-}
-/**
- * convert a list of comma-separated tokens into an array
- */
-private static String[] getArrayFromList(String prop) {
-	if (prop == null || prop.trim().equals("")) //$NON-NLS-1$
-		return new String[0];
-	Vector list = new Vector();
-	StringTokenizer tokens = new StringTokenizer(prop, ","); //$NON-NLS-1$
-	while (tokens.hasMoreTokens()) {
-		String token = tokens.nextToken().trim();
-		if (!token.equals("")) //$NON-NLS-1$
-			list.addElement(token);
-	}
-	return list.isEmpty() ? new String[0] : (String[]) list.toArray(new String[0]);
-}
-private static boolean getBooleanOption(String option, boolean defaultValue) {
-	String optionValue = options.getProperty(option);
-	return (optionValue == null) ? defaultValue : optionValue.equalsIgnoreCase("true"); //$NON-NLS-1$
-}
-/**
- * @see BootLoader#getCommandLineArgs
- */
-public static String[] getCommandLineArgs() {
-	return commandLine;
-}
-/**
- * @see BootLoader
- */
-public static PlatformConfiguration getCurrentPlatformConfiguration() {
-	return PlatformConfiguration.getCurrent();
-}
-/**
- * @see BootLoader
- */
-public static URL getInstallURL() {
-	if (installURL != null)
-		return installURL;
-		
-	// See if install location was explicitly specified
-	// Note: in the regular launch sequence, if the argument was not specified
-	//       on the launch, Main.java is actually defaulting this relative to
-	//       itself. The resulting behavior is consistent with the default
-	//       behavior in 1.0 (with all program files being co-located in the
-	//       eclipse/ install directory). However, the new behavior takes into 
-	//       account an update scenario where we may in fact be executing
-	//       InternalBootLoader that was loaded from some other location.
-	if (installLocation != null && !installLocation.trim().equals("")) { //$NON-NLS-1$
-		try {
-			installURL = new URL(installLocation);
-			if (debugRequested) 
-				System.out.println("Install URL:\n    "+installURL.toExternalForm()); //$NON-NLS-1$
-			return installURL;
-		} catch(MalformedURLException e) {
-			//fall through to code below
-		}
-	}
-
-	// Install location was not specified, or we failed to create a URL.
-	// Get the location of this class and compute the install location.
-	// this involves striping off last element (jar or directory) 
-	URL url = InternalBootLoader.class.getProtectionDomain().getCodeSource().getLocation();
-	String path = decode(url.getFile());
-	if (path.endsWith("/")) //$NON-NLS-1$
-		path = path.substring(0, path.length() - 1);
-	int ix = path.lastIndexOf('/');
-	//strip off boot jar/bin, boot plugin and plugins dir.  Be sure to leave a trailing /
-	path = path.substring(0, ix);
-	ix = path.lastIndexOf('/');
-	path = path.substring(0, ix);
-	ix = path.lastIndexOf('/');
-	path = path.substring(0, ix + 1);
-
-	try {
-		if (url.getProtocol().equals("jar")) //$NON-NLS-1$
-			installURL = new URL(path);
-		else 
-			installURL = new URL(url.getProtocol(), url.getHost(), url.getPort(), path);
-		if (debugRequested) 
-			System.out.println("Install URL: "+installURL.toExternalForm()); //$NON-NLS-1$
-	} catch (MalformedURLException e) {
-		throw new RuntimeException(Policy.bind("error.fatal", e.getMessage())); //$NON-NLS-1$
-	}
-	return installURL;
-}
-/**
- * Returns a string representation of the given URL String.  This converts
- * escaped sequences (%..) in the URL into the appropriate characters.
- * NOTE: due to class visibility there is a copy of this method
- *       in Main (the launcher)
- */
-public static String decode(String urlString) {
-	//try to use Java 1.4 method if available
-	try {
-		Class clazz = URLDecoder.class;
-		Method method = clazz.getDeclaredMethod("decode", new Class[] {String.class, String.class});//$NON-NLS-1$
-		//first encode '+' characters, because URLDecoder incorrectly converts 
-		//them to spaces on certain class library implementations.
-		if (urlString.indexOf('+') >= 0) {
-			int len = urlString.length();
-			StringBuffer buf = new StringBuffer(len);
-			for (int i = 0; i < len; i++) {
-				char c = urlString.charAt(i);
-				if (c == '+')
-					buf.append("%2B");//$NON-NLS-1$
-				else
-					buf.append(c);
-			}
-			urlString = buf.toString();
-		}
-		Object result = method.invoke(null, new Object[] {urlString, "UTF-8"});//$NON-NLS-1$
-		if (result != null)
-			return (String)result;
-	} catch (Exception e) {
-		//JDK 1.4 method not found or failed -- fall through to manual decode
-	}
-	//decode URL by hand
-	int len = urlString.length();
-	ByteArrayOutputStream os = new ByteArrayOutputStream(len);
-	for (int i = 0; i < len;) {
-		char c = urlString.charAt(i++);
-		if (c == '%') {
-			if (len >= i + 2) {
-				os.write(Integer.parseInt(urlString.substring(i, i + 2), 16));
-			}
-			i += 2;
-		} else {
-			os.write(c);
-		}
-	}
-	try {
-		return new String(os.toByteArray(), "UTF-8");//$NON-NLS-1$
-	} catch (UnsupportedEncodingException e) {
-		//use default encoding
-		return new String(os.toByteArray());
-	}
-}
-private static String[] getListOption(String option) {
-	String filter = options.getProperty(option);
-	if (filter == null)
-		return new String[0];
-	List result = new ArrayList(5);
-	StringTokenizer tokenizer = new StringTokenizer(filter, " ,\t\n\r\f"); //$NON-NLS-1$
-	while (tokenizer.hasMoreTokens())
-		result.add(tokenizer.nextToken());
-	return (String[]) result.toArray(new String[result.size()]);
-}
-/**
- * @see BootLoader
- */
-public static String getOSArch() {
-	return arch;
-}
-/**
- * @see BootLoader
- */
-public static String getNL() {
-	return nl;
-}
-/**
- * @see BootLoader
- */
-public static String getOS() {
-	return os;
-}
-/**
- * @see BootLoader
- */
-public static PlatformConfiguration getPlatformConfiguration(URL url) throws IOException {
-	return new PlatformConfiguration(url);
-}
-
-private static Object[] getPlatformClassLoaderPath() {
-
-	PlatformConfiguration config = getCurrentPlatformConfiguration();
-	PlatformConfiguration.BootDescriptor bd = config.getPluginBootDescriptor(RUNTIMENAME);
-	String execBase = bd.getPluginDirectoryURL().toExternalForm();
-	if (execBase == null)
-		execBase = getInstallURL() + RUNTIMEDIR;
-
-	// build a list alternating lib spec and export spec
-	ArrayList libSpecs = new ArrayList(5);
-	String[] exportAll = new String[] { "*" }; //$NON-NLS-1$
-
-	// add in any development mode class paths and the export all filter
-	if (DelegatingURLClassLoader.devClassPath != null) {
-		String[] specs = getArrayFromList(DelegatingURLClassLoader.devClassPath);
-		// convert dev class path into url strings
-		for (int j = 0; j < specs.length; j++) {
-			libSpecs.add(execBase + specs[j] + "/"); //$NON-NLS-1$
-			libSpecs.add(exportAll);
-		}
-	}
-	ArrayList list = new ArrayList(5);
-	String[] libs = bd.getLibraries();
-	for (int i=0; i<libs.length; i++) {
-		list.add(libs[i]);
-		list.add(exportAll);
-	}
-
-	// add in the class path entries spec'd in the config.
-	for (Iterator i = list.iterator(); i.hasNext();) {
-		String library = (String) i.next();
-		String[] filters = (String[]) i.next();
-
-		// convert plugin.xml library entries to url strings
-		String libSpec = execBase + library.replace(File.separatorChar, '/');
-		if (!libSpec.endsWith("/")) { //$NON-NLS-1$
-			if (libSpec.startsWith(PlatformURLHandler.PROTOCOL + PlatformURLHandler.PROTOCOL_SEPARATOR))
-				libSpec += PlatformURLHandler.JAR_SEPARATOR;
-			else
-				libSpec = PlatformURLHandler.JAR + PlatformURLHandler.PROTOCOL_SEPARATOR + libSpec + PlatformURLHandler.JAR_SEPARATOR;
-		}
-		libSpecs.add(libSpec);
-		libSpecs.add(filters);
-	}
-
-	// create path entries for libraries
-	ArrayList urls = new ArrayList(5);
-	ArrayList cfs = new ArrayList(5);
-	for (Iterator it = libSpecs.iterator(); it.hasNext();) {
-		try {
-			urls.add(new URL((String) it.next()));
-			cfs.add(new URLContentFilter((String[]) it.next()));
-		} catch (MalformedURLException e) {
-			// skip bad URLs
-		}
-	}
-
-	Object[] result = new Object[2];
-	result[0] = urls.toArray(new URL[urls.size()]);
-	result[1] = cfs.toArray(new URLContentFilter[cfs.size()]);
-	return result;
-}
-/**
- * @see BootLoader
- */
-/*
- * This method is retained for R1.0 compatibility because it is defined as API.
- * It's function matches the API description (returns <code>null</code> when
- * argument URL is <code>null</code> or cannot be read).
- */
-public static URL[] getPluginPath(URL pluginPathLocation/*R1.0 compatibility*/) {
-	InputStream input = null;
-	// first try and see if the given plugin path location exists.
-	if (pluginPathLocation == null)
-		return null;
-	try {
-		input = pluginPathLocation.openStream();
-	} catch (IOException e) {
-		//fall through
-	}
-
-	// if the given path was null or did not exist, look for a plugin path
-	// definition in the install location.
-	if (input == null)
-		try {
-			URL url = new URL(PlatformURLBaseConnection.PLATFORM_URL_STRING + PLUGIN_PATH);
-			input = url.openStream();
-		} catch (MalformedURLException e) {
-			//fall through
-		} catch (IOException e) {
-			//fall through
-		}
-
-	// nothing was found at the supplied location or in the install location
-	if (input == null)
-		return null;
-	// if we found a plugin path definition somewhere so read it and close the location.
-	URL[] result = null;
-	try {
-		try {
-			result = readPluginPath(input);
-		} finally {
-			input.close();
-		}
-	} catch (IOException e) {
-		//let it return null on failure to read
-	}
-	return result;
-}
-/**
- * @see BootLoader
- */
-public static IPlatformRunnable getRunnable(String applicationName) throws Exception {
-	assertRunning();
-	Class platform = loader.loadClass(PLATFORM_ENTRYPOINT);
-	Method method = platform.getDeclaredMethod("loaderGetRunnable", new Class[] {String.class}); //$NON-NLS-1$
-	try {
-		return (IPlatformRunnable) method.invoke(platform, new Object[] {applicationName});
-	} catch (InvocationTargetException e) {
-		if (e.getTargetException() instanceof Error)
-			throw (Error) e.getTargetException();
-		else
-			throw e;
-	}
-}
-/**
- * @see BootLoader
- */
-public static IPlatformRunnable getRunnable(String pluginId, String className, Object args) throws Exception {
-	assertRunning();
-	Class platform = loader.loadClass(PLATFORM_ENTRYPOINT);
-	Method method = platform.getDeclaredMethod("loaderGetRunnable", new Class[] {String.class, String.class, Object.class}); //$NON-NLS-1$
-	try {
-		return (IPlatformRunnable) method.invoke(platform, new Object[] {pluginId, className, args});
-	} catch (InvocationTargetException e) {
-		if (e.getTargetException() instanceof Error)
-			throw (Error) e.getTargetException();
-		else
-			throw e;
-	}
-}
-/**
- * @see BootLoader
- */
-public static String getWS() {
-	return ws;
-}
-/**
- * @see BootLoader
- */
-public static boolean inDebugMode() {
-	return debugRequested;
-}
-/**
- * @see BootLoader
- */
-public static boolean inDevelopmentMode() {
-	return inDevelopmentMode;
-}
-private static String[] initialize(URL pluginPathLocation/*R1.0 compatibility*/, String location, String[] args) throws Exception {
-	if (running)
-		throw new RuntimeException(Policy.bind("platform.running")); //$NON-NLS-1$
-	baseLocation = location;
-	String[] appArgs = processCommandLine(args);
-	// Do setupSystemContext() ASAP after processCommandLine
-	setupSystemContext();
-	// setup the devClassPath if any
-	DelegatingURLClassLoader.devClassPath = devClassPath;
-
-	// if a platform location was not found in the arguments, compute one.		
-	if (baseLocation == null) {
-		// Default location for the workspace is <user.dir>/workspace/
-		baseLocation = System.getProperty("user.dir"); //$NON-NLS-1$
-		if (!baseLocation.endsWith(File.separator))
-			baseLocation += File.separator;
-		baseLocation += WORKSPACE;
-	}
-	if (debugRequested)
-		System.out.println("Workspace location:\n   " + baseLocation); //$NON-NLS-1$
-
-	// load any debug options
-	loadOptions();
-
-	// initialize eclipse URL handling
-	String metaPath = baseLocation.replace(File.separatorChar, '/');
-	if (!metaPath.endsWith("/")) //$NON-NLS-1$
-		metaPath += "/"; //$NON-NLS-1$
-	metaPath += META_AREA;
-	PlatformURLHandlerFactory.startup(metaPath);
-	PlatformURLBaseConnection.startup(getInstallURL()); // past this point we can use eclipse:/platform/ URLs
-
-	// load platform configuration and consume configuration-related arguments (must call after URL handler initialization)
-	appArgs = PlatformConfiguration.startup(appArgs, pluginPathLocation/*R1.0 compatibility*/, applicationR10/*R1.0 compatibility*/, metaPath);
-
-	// create and configure platform class loader
-	loader = configurePlatformLoader();
-
-	return appArgs;
-}
-/**
- * @see BootLoader
- */
-public static boolean isRunning() {
-	return running;
-}
-public static boolean isStarting() {
-	return starting;
-}
-
-private static void loadOptions() {
-	// if no debug option was specified, don't even bother to try.
-	// Must ensure that the options slot is null as this is the signal to the
-	// platform that debugging is not enabled.
-	if (!debugRequested) {
-		options = null;
-		return;
-	}
-	options = new Properties();
-	URL optionsFile;
-	if (debugOptionsFilename == null) {
-		// default options location is user.dir (install location may be r/o so
-		// is not a good candidate for a trace options that need to be updatable by
-		// by the user)
-		String userDir = System.getProperty("user.dir").replace(File.separatorChar,'/'); //$NON-NLS-1$
-		if (!userDir.endsWith("/")) //$NON-NLS-1$
-			userDir += "/"; //$NON-NLS-1$
-		debugOptionsFilename = "file:" + userDir + OPTIONS; //$NON-NLS-1$
-	}
-	try {
-		optionsFile = new URL(debugOptionsFilename);
-	} catch (MalformedURLException e) {
-		System.out.println("Unable to construct URL for options file: " + debugOptionsFilename); //$NON-NLS-1$
-		e.printStackTrace(System.out);
-		return;
-	}
-	System.out.println("Debug-Options:\n    " + debugOptionsFilename); //$NON-NLS-1$
-	try {
-		InputStream input = optionsFile.openStream();
-		try {
-			options.load(input);
-		} finally {
-			input.close();
-		}
-	} catch (FileNotFoundException e) {
-		//	Its not an error to not find the options file
-	} catch (IOException e) {
-		System.out.println("Could not parse the options file: " + optionsFile); //$NON-NLS-1$
-		e.printStackTrace(System.out);
-	}
-	// trim off all the blanks since properties files don't do that.
-	for (Iterator i = options.keySet().iterator(); i.hasNext();) {
-		Object key = i.next();
-		options.put(key, ((String) options.get(key)).trim());
-	}
-	InternalBootLoader.setupOptions();
-}
-private static String[] processCommandLine(String[] args) throws Exception {
-	int[] configArgs = new int[100];
-	configArgs[0] = -1; // need to initialize the first element to something that could not be an index.
-	int configArgIndex = 0;
-	for (int i = 0; i < args.length; i++) {
-		boolean found = false;
-		// check for args without parameters (i.e., a flag arg)
-		// check if debug should be enabled for the entire platform
-		// If this is the last arg or there is a following arg (i.e., arg+1 has a leading -), 
-		// simply enable debug.  Otherwise, assume that that the following arg is
-		// actually the filename of an options file.  This will be processed below.
-		if (args[i].equalsIgnoreCase(DEBUG) && ((i + 1 == args.length) || ((i + 1 < args.length) && (args[i + 1].startsWith("-"))))) { //$NON-NLS-1$
-			found = true;
-			debugRequested = true;
-		}
-
-		// check if development mode should be enabled for the entire platform
-		// If this is the last arg or there is a following arg (i.e., arg+1 has a leading -), 
-		// simply enable development mode.  Otherwise, assume that that the following arg is
-		// actually some additional development time class path entries.  This will be processed below.
-		if (args[i].equalsIgnoreCase(DEV) && ((i + 1 == args.length) || ((i + 1 < args.length) && (args[i + 1].startsWith("-"))))) { //$NON-NLS-1$
-			inDevelopmentMode = true;
-			found = true;
-			continue;
-		}
-
-		if (found) {
-			configArgs[configArgIndex++] = i;
-			continue;
-		}
-		// check for args with parameters. If we are at the last argument or if the next one
-		// has a '-' as the first character, then we can't have an arg with a parm so continue.
-		if (i == args.length - 1 || args[i + 1].startsWith("-")) { //$NON-NLS-1$
-			continue;
-		}
-		String arg = args[++i];
-
-		// look for the debug options file location.  
-		if (args[i - 1].equalsIgnoreCase(DEBUG)) {
-			found = true;
-			debugRequested = true;
-			debugOptionsFilename = arg;
-		}
-
-		// look for the development mode and class path entries.  
-		if (args[i - 1].equalsIgnoreCase(DEV)) {
-			inDevelopmentMode = true;
-			devClassPath = arg;
-			found = true;
-			continue;
-		}
-
-		// look for the install location. 
-		if (args[i - 1].equalsIgnoreCase(INSTALL)) {
-			found = true;
-			installLocation = arg;
-		}
-
-		// look for the platform location.  Only set it if not already set. This 
-		// preserves the value set in the startup() parameter.  Be sure however
-		// to consume the command-line argument.
-		if (args[i - 1].equalsIgnoreCase(DATA)) {
-			found = true;
-			if (baseLocation == null)
-				baseLocation = arg;
-		}
-
-		// look for the window system.  
-		if (args[i - 1].equalsIgnoreCase(WS)) {
-			found = true;
-			ws = arg;
-		}
-
-		// look for the operating system
-		if (args[i - 1].equalsIgnoreCase(OS)) {
-			found = true;
-			os = arg;
-		}
-
-		// look for the system architecture
-		if (args[i - 1].equalsIgnoreCase(ARCH)) {
-			found = true;
-			arch = arg;
-		}
-
-		// look for the nationality/language
-		if (args[i - 1].equalsIgnoreCase(NL)) {
-			found = true;
-			nl = arg;
-		}
-
-		// done checking for args.  Remember where an arg was found 
-		if (found) {
-			configArgs[configArgIndex++] = i - 1;
-			configArgs[configArgIndex++] = i;
-		}
-	}
-
-	// remove all the arguments consumed by this argument parsing
-	if (configArgIndex == 0)
-		return args;
-	String[] passThruArgs = new String[args.length - configArgIndex];
-	configArgIndex = 0;
-	int j = 0;
-	for (int i = 0; i < args.length; i++) {
-		if (i == configArgs[configArgIndex])
-			configArgIndex++;
-		else
-			passThruArgs[j++] = args[i];
-	}
-	return passThruArgs;
-}
-private static URL[] readPluginPath(InputStream input) {
-	Properties ini = new Properties();
-	try {
-		ini.load(input);
-	} catch (IOException e) {
-		return null;
-	}
-	Vector result = new Vector(5);
-	for (Enumeration groups = ini.propertyNames(); groups.hasMoreElements();) {
-		String group = (String) groups.nextElement();
-		for (StringTokenizer entries = new StringTokenizer(ini.getProperty(group), ";"); entries.hasMoreElements();) { //$NON-NLS-1$
-			String entry = (String) entries.nextElement();
-			if (!entry.equals("")) //$NON-NLS-1$
-				try {
-					result.addElement(new URL(entry));
-				} catch (MalformedURLException e) {
-					//intentionally ignore bad URLs
-					System.err.println(Policy.bind("ignore.plugin", entry)); //$NON-NLS-1$
-				}
-		}
-	}
-	return (URL[]) result.toArray(new URL[result.size()]);
-}
-public static URL resolve(URL url) throws IOException {
-	if (!url.getProtocol().equals(PlatformURLHandler.PROTOCOL))
-		return url;
-	URLConnection connection = url.openConnection();
-	if (connection instanceof PlatformURLConnection)
-		return ((PlatformURLConnection) connection).getResolvedURL();
-	else
-		return url;
-}
-/**
- * @see BootLoader
- * Retained for compatibility with R1.0 launchers
- */
-public static Object run(String applicationName/*R1.0 compatibility*/, URL pluginPathLocation/*R1.0 compatibility*/, String location, String[] args) throws Exception {
-	return run(applicationName, pluginPathLocation, location, args, null);
-}
-/**
- * @see BootLoader
- */
-public static Object run(String applicationName/*R1.0 compatibility*/, URL pluginPathLocation/*R1.0 compatibility*/, String location, String[] args, Runnable handler) throws Exception {
-	Object result = null;
-	applicationR10 = applicationName; // for R1.0 compatibility
-	String[] applicationArgs = startup(pluginPathLocation, location, args, handler);
-	
-	String application = getCurrentPlatformConfiguration().getApplicationIdentifier();
-	IPlatformRunnable runnable = getRunnable(application);
-	if (runnable == null)
-		throw new IllegalArgumentException(Policy.bind("application.notFound", application)); //$NON-NLS-1$
-	try {
-		result = runnable.run(applicationArgs);
-	} catch (Throwable e) {
-		e.printStackTrace();
-		throw new InvocationTargetException(e);
-	} finally {
-		shutdown();
-		return result;
-	}
-}
-/**
- * Setup the debug flags for the given debug options.  This method will likely
- * be called twice.  Once when loading the options file from the command
- * line or install dir and then again when we have loaded options from the
- * specific platform metaarea. 
- */
-public static void setupOptions() {
-	// if no debug option was specified, don't even bother to try.
-	// Must ensure that the options slot is null as this is the signal to the
-	// platform that debugging is not enabled.
-	if (!debugRequested)
-		return;
-	options.put(OPTION_STARTTIME, Long.toString(System.currentTimeMillis()));
-	DelegatingURLClassLoader.DEBUG = getBooleanOption(OPTION_LOADER_DEBUG, false);
-	DelegatingURLClassLoader.DEBUG_SHOW_CREATE = getBooleanOption(OPTION_LOADER_SHOW_CREATE, true);
-	DelegatingURLClassLoader.DEBUG_SHOW_ACTIVATE = getBooleanOption(OPTION_LOADER_SHOW_ACTIVATE, true);
-	DelegatingURLClassLoader.DEBUG_SHOW_ACTIONS = getBooleanOption(OPTION_LOADER_SHOW_ACTIONS, true);
-	DelegatingURLClassLoader.DEBUG_SHOW_SUCCESS = getBooleanOption(OPTION_LOADER_SHOW_SUCCESS, true);
-	DelegatingURLClassLoader.DEBUG_SHOW_FAILURE = getBooleanOption(OPTION_LOADER_SHOW_FAILURE, true);
-	DelegatingURLClassLoader.DEBUG_FILTER_CLASS = getListOption(OPTION_LOADER_FILTER_CLASS);
-	DelegatingURLClassLoader.DEBUG_FILTER_LOADER = getListOption(OPTION_LOADER_FILTER_LOADER);
-	DelegatingURLClassLoader.DEBUG_FILTER_RESOURCE = getListOption(OPTION_LOADER_FILTER_RESOURCE);
-	DelegatingURLClassLoader.DEBUG_FILTER_NATIVE = getListOption(OPTION_LOADER_FILTER_NATIVE);
-	PlatformURLConnection.DEBUG = getBooleanOption(OPTION_URL_DEBUG, false);
-	PlatformURLConnection.DEBUG_CONNECT = getBooleanOption(OPTION_URL_DEBUG_CONNECT, true);
-	PlatformURLConnection.DEBUG_CACHE_LOOKUP = getBooleanOption(OPTION_URL_DEBUG_CACHE_LOOKUP, true);
-	PlatformURLConnection.DEBUG_CACHE_COPY = getBooleanOption(OPTION_URL_DEBUG_CACHE_COPY, true);
-	PlatformConfiguration.DEBUG = getBooleanOption(OPTION_CONFIGURATION_DEBUG,false);
-}
-/**
- * Initializes the execution context for this run of the platform.  The context
- * includes information about the locale, operating system and window system.
- */
-private static void setupSystemContext() {
-	if (nl == null)
-		nl = Locale.getDefault().toString();
-
-	if (os == null) {
-		String name = System.getProperty("os.name");//$NON-NLS-1$
-		String[] os_list = BootLoader.knownOSValues();
-		for (int i = 0; os == null && i < os_list.length; i++)
-			if (name.regionMatches(true, 0, os_list[i], 0, 3))
-				os = os_list[i];
-		// EXCEPTION: All mappings of SunOS convert to Solaris
-		if (os == null)
-			os = name.equalsIgnoreCase(INTERNAL_OS_SUNOS) ? BootLoader.OS_SOLARIS : BootLoader.OS_UNKNOWN;
-	}
-
-	if (ws == null) {
-		// setup default values for known OSes if nothing was specified
-		if (os.equals(BootLoader.OS_WIN32))
-			ws = BootLoader.WS_WIN32;
-		else if (os.equals(BootLoader.OS_LINUX))
-			ws = BootLoader.WS_MOTIF;
-		else if (os.equals(BootLoader.OS_MACOSX))
-			ws = BootLoader.WS_CARBON;
-		else
-			ws = BootLoader.WS_UNKNOWN;
-	}
-
-	if (arch == null) {
-		String name = System.getProperty("os.arch");//$NON-NLS-1$
-		// Map i386 architecture to x86
-		if (name.equalsIgnoreCase(INTERNAL_ARCH_I386))
-			arch = BootLoader.ARCH_X86;
-		String[] arch_list = BootLoader.knownOSArchValues();
-		for (int i = 0; arch == null && i < arch_list.length; i++)
-			if (name.equalsIgnoreCase(arch_list[i]))
-				arch = arch_list[i];
-		if (arch == null)
-			arch = name;
-	}
-}
-/**
- * @see BootLoader
- */
-public static void shutdown() throws Exception {
-	assertRunning();
-	// no matter what happens, record that its no longer running
-	running = false;
-	Class platform = loader.loadClass(PLATFORM_ENTRYPOINT);
-	Method method = platform.getDeclaredMethod("loaderShutdown", new Class[0]); //$NON-NLS-1$
-	try {
-		method.invoke(platform, new Object[0]);
-	} catch (InvocationTargetException e) {
-		if (e.getTargetException() instanceof Error)
-			throw (Error) e.getTargetException();
-		else
-			throw e;
-	} finally {
-		PlatformURLHandlerFactory.shutdown();
-		PlatformConfiguration.shutdown();
-		loader = null;
-	}
-}
-/**
- * @see BootLoader
- * Retained for compatibility with R1.0 launchers
- */
-public static String[] startup(URL pluginPathLocation/*R1.0 compatibility*/, String location, String[] args) throws Exception {
-	return startup(pluginPathLocation, location, args, null); 
-}
-/**
- * @see BootLoader
- */
-public static String[] startup(URL pluginPathLocation/*R1.0 compatibility*/, String location, String[] args, Runnable handler) throws Exception {
-	assertNotRunning();
-	starting = true;
-	commandLine = args;
-	String[] applicationArgs = initialize(pluginPathLocation, location, args);
-	Class platform = loader.loadClass(PLATFORM_ENTRYPOINT);
-	Method method = platform.getDeclaredMethod("loaderStartup", new Class[] { URL[].class, String.class, Properties.class, String[].class, Runnable.class }); //$NON-NLS-1$
-	try {
-		URL[] pluginPath = getCurrentPlatformConfiguration().getPluginPath();
-		method.invoke(platform, new Object[] { pluginPath, baseLocation, options, args, handler });
-	} catch (InvocationTargetException e) {
-		if (e.getTargetException() instanceof Error)
-			throw (Error) e.getTargetException();
-		else
-			throw e;
-	}
-	// only record the platform as running if everything went swimmingly
-	running = true;
-	starting = false;
-	return applicationArgs;
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformClassLoader.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformClassLoader.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformClassLoader.java
deleted file mode 100644
index 59d9731..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformClassLoader.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.net.URL;
- 
-/**
- * This is the singleton platform loader. It searches jars and
- * directories containing the base runtime support.
- */
-public final class PlatformClassLoader extends DelegatingURLClassLoader {
-	private static PlatformClassLoader singleton = null;
-/**
- * Creates the default instance of PlatformClassLoader according to the
- * given classpath, filters and parent.
- */
-public PlatformClassLoader(URL[] searchPath, URLContentFilter[] filters, ClassLoader parent, URL base) {
-	super(searchPath, filters, null, null, parent);
-	this.base = base;
-	if (singleton == null)
-		singleton = this;
-	debugConstruction(); // must have initialized loader
-}
-protected String debugId() {
-	return "PLATFORM"; //$NON-NLS-1$
-}
-/**
- * Finds and loads the class with the specified name from the URL search
- * path. Any URLs referring to JAR files are loaded and opened as needed
- * until the class is found. Only our own URL search path and that of our parent
- * is used.  This method consults this loader's parent first but only if <code>checkParents</code>
- * is <code>true</code>.  Following that, this loader's own search path is checked. 
- * <code>null</code> is returned if the class cannot be found.
- 
- * @param name the name of the class
- * @param resolve whether to resolve any loaded class
- * @param requestor class loader originating the request
- * @param checkParents whether to check the parent loader
- * @return the resulting class
- */
-protected Class findClassParentsSelf(final String name, boolean resolve, DelegatingURLClassLoader requestor, boolean checkParents) {
-	Class result = null;
-	synchronized (this) {
-		// check the cache.  If we find something, check to see if its visible.
-		// If it is, return it.  If not, return null if we are not checking parents.  There is
-		// no point in looking in self as the class was already in the cache.
-		result = findLoadedClass(name);
-		if (result != null) {
-			result = checkClassVisibility(result, requestor, true);
-			if (result != null || !checkParents)
-				return result;
-		}
-
-		// if it wasn't in the cache or was not visible, check the parents (if requested)
-		if (checkParents) {
-			result = findClassParents(name, resolve);
-			if (result != null)
-				return result;
-		}
-		try {
-			result = super.findClass(name);
-			// If the class is loaded in this classloader register it with
-			// the hot swap support.  Need to do this regardless of visibility
-			// because the class was actually loaded.
-			if (result == null)
-				return null;
-			enableHotSwap(this, result);
-			return checkClassVisibility(result, requestor, false);
-		} catch (ClassNotFoundException e) {
-			return null;
-		}
-	}
-}
-/**
- * Returns the default/singleton instance of PlatformClassLoader.
- * The class loader must have been explicitly created previously
- * otherwise this method returns <code>null</code>.
- */
-public static PlatformClassLoader getDefault() {
-	return singleton;	
-}
-/**
- * Sets the list of imported loaders.  If the supplied list is <code>null</code>
- * then this loader's list of imports is cleared.
- */
-public synchronized void setImports(DelegatingURLClassLoader[] loaders) {
-	if (loaders == null) {
-		imports = null;
-		return;
-	}
-	DelegateLoader[] delegates = new DelegateLoader[loaders.length];
-	for (int i = 0; i < loaders.length; i++)
-		delegates[i] = new DelegateLoader(loaders[i], false);
-	imports = delegates;
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformConfiguration.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformConfiguration.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformConfiguration.java
deleted file mode 100644
index 8680307..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformConfiguration.java
+++ /dev/null
@@ -1,2773 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.boot.IPlatformConfiguration;
-import org.eclipse.core.boot.IPlatformConfiguration.*;
-import sun.security.action.GetPropertyAction;
-
-public class PlatformConfiguration implements IPlatformConfiguration {
-
-	private static PlatformConfiguration currentPlatformConfiguration = null;
-
-	private URL configLocation;
-	private URL rootLocation;
-	private HashMap sites;
-	private HashMap externalLinkSites; // used to restore prior link site state
-	private HashMap cfgdFeatures;
-	private HashMap bootPlugins;
-	private String defaultFeature;
-	private long lastChangeStamp;
-	private long changeStamp;
-	private boolean changeStampIsValid = false;
-	private long lastFeaturesChangeStamp;
-	private long featuresChangeStamp;
-	private boolean featuresChangeStampIsValid = false;
-	private long lastPluginsChangeStamp;
-	private long pluginsChangeStamp;
-	private boolean pluginsChangeStampIsValid = false;
-	private boolean featureChangesConfigured = false;
-	private boolean transientConfig = false;
-	private File cfgLockFile;
-	private RandomAccessFile cfgLockFileRAF;
-	private BootDescriptor runtimeDescriptor; 
-	private BootDescriptor xmlDescriptor; 
-	
-	private static String cmdConfiguration = null;
-	private static String cmdFeature = null;
-	private static String cmdApplication = null;
-	private static URL cmdPlugins = null;
-	private static boolean cmdInitialize = false;
-	private static boolean cmdFirstUse = false;
-	private static boolean cmdUpdate = false;
-	private static boolean cmdNoUpdate = false; 
-	private static boolean cmdDev = false;
-
-	static boolean DEBUG = false;
-	
-	private static final String BOOT_XML = "boot.xml"; //$NON-NLS-1$
-	private static final String BOOT_PLUGIN_ID = "org.eclipse.core.boot"; //$NON-NLS-1$
-	private static final String RUNTIME_PLUGIN_ID = "org.eclipse.core.runtime"; //$NON-NLS-1$
-	private static final String XML_PLUGIN_ID = "org.apache.xerces"; //$NON-NLS-1$
-
-	private static final String ECLIPSE = "eclipse"; //$NON-NLS-1$
-	private static final String PLUGINS = "plugins"; //$NON-NLS-1$
-	private static final String FEATURES = "features"; //$NON-NLS-1$
-	private static final String CONFIG_DIR = ".config"; //$NON-NLS-1$
-	private static final String CONFIG_FILE = CONFIG_DIR + "/platform.cfg"; //$NON-NLS-1$
-	private static final String CONFIG_FILE_INIT = "install.ini"; //$NON-NLS-1$
-	private static final String CONFIG_FILE_LOCK_SUFFIX = ".lock"; //$NON-NLS-1$
-	private static final String CONFIG_FILE_TEMP_SUFFIX = ".tmp"; //$NON-NLS-1$
-	private static final String CONFIG_FILE_BAK_SUFFIX = ".bak"; //$NON-NLS-1$
-	private static final String CHANGES_MARKER = ".newupdates";  //$NON-NLS-1$
-	private static final String LINKS = "links"; //$NON-NLS-1$
-	private static final String PLUGIN_XML = "plugin.xml"; //$NON-NLS-1$
-	private static final String FRAGMENT_XML = "fragment.xml"; //$NON-NLS-1$
-	private static final String FEATURE_XML = "feature.xml"; //$NON-NLS-1$
-	
-	private static final String[] BOOTSTRAP_PLUGINS = {"org.eclipse.core.boot"}; //$NON-NLS-1$
-	private static final String CFG_BOOT_PLUGIN = "bootstrap"; //$NON-NLS-1$
-	private static final String CFG_SITE = "site"; //$NON-NLS-1$
-	private static final String CFG_URL = "url"; //$NON-NLS-1$
-	private static final String CFG_POLICY = "policy"; //$NON-NLS-1$
-	private static final String[] CFG_POLICY_TYPE = {"USER-INCLUDE", "USER-EXCLUDE"}; //$NON-NLS-1$ //$NON-NLS-2$
-	private static final String CFG_POLICY_TYPE_UNKNOWN = "UNKNOWN"; //$NON-NLS-1$
-	private static final String CFG_LIST = "list"; //$NON-NLS-1$
-	private static final String CFG_STAMP = "stamp"; //$NON-NLS-1$
-	private static final String CFG_FEATURE_STAMP = "stamp.features"; //$NON-NLS-1$
-	private static final String CFG_PLUGIN_STAMP = "stamp.plugins"; //$NON-NLS-1$
-	private static final String CFG_UPDATEABLE = "updateable"; //$NON-NLS-1$
-	private static final String CFG_LINK_FILE = "linkfile"; //$NON-NLS-1$
-	private static final String CFG_FEATURE_ENTRY = "feature"; //$NON-NLS-1$
-	private static final String CFG_FEATURE_ENTRY_DEFAULT = "feature.default.id"; //$NON-NLS-1$
-	private static final String CFG_FEATURE_ENTRY_ID = "id"; //$NON-NLS-1$
-	private static final String CFG_FEATURE_ENTRY_VERSION = "version"; //$NON-NLS-1$
-	private static final String CFG_FEATURE_ENTRY_APPLICATION = "application"; //$NON-NLS-1$
-	private static final String CFG_FEATURE_ENTRY_ROOT = "root"; //$NON-NLS-1$
-	
-	private static final String INIT_DEFAULT_FEATURE_ID = "feature.default.id"; //$NON-NLS-1$
-	private static final String INIT_DEFAULT_FEATURE_APPLICATION = "feature.default.application"; //$NON-NLS-1$
-	private static final String DEFAULT_FEATURE_ID = "org.eclipse.platform"; //$NON-NLS-1$
-	private static final String DEFAULT_FEATURE_APPLICATION = "org.eclipse.ui.workbench"; //$NON-NLS-1$
-	
-	private static final String CFG_VERSION = "version"; //$NON-NLS-1$
-	private static final String CFG_TRANSIENT = "transient"; //$NON-NLS-1$
-	private static final String VERSION = "1.0"; //$NON-NLS-1$
-	private static final String EOF = "eof"; //$NON-NLS-1$
-	private static final int CFG_LIST_LENGTH = 10;
-	
-	private static final int DEFAULT_POLICY_TYPE = ISitePolicy.USER_EXCLUDE;
-	private static final String[] DEFAULT_POLICY_LIST = new String[0];
-	
-	private static final String LINK_PATH = "path"; //$NON-NLS-1$
-	private static final String LINK_READ = "r"; //$NON-NLS-1$
-	private static final String LINK_READ_WRITE = "rw"; //$NON-NLS-1$
-	
-	private static final String CMD_CONFIGURATION = "-configuration"; //$NON-NLS-1$
-	private static final String CMD_FEATURE = "-feature"; //$NON-NLS-1$
-	private static final String CMD_APPLICATION = "-application"; //$NON-NLS-1$
-	private static final String CMD_PLUGINS = "-plugins"; //$NON-NLS-1$
-	private static final String CMD_UPDATE = "-update"; //$NON-NLS-1$
-	private static final String CMD_INITIALIZE = "-initialize"; //$NON-NLS-1$
-	private static final String CMD_FIRSTUSE = "-firstuse"; //$NON-NLS-1$
-	private static final String CMD_NO_UPDATE = "-noupdate"; //$NON-NLS-1$
-	private static final String CMD_NEW_UPDATES = "-newUpdates";  //$NON-NLS-1$
-	private static final String CMD_DEV = "-dev"; // triggers -noupdate //$NON-NLS-1$
-	
-	private static final String RECONCILER_APP = "org.eclipse.update.core.reconciler"; //$NON-NLS-1$
-	
-	private static final char[] HEX = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
-	
-	public class SiteEntry implements IPlatformConfiguration.ISiteEntry {
-
-		private URL url; // this is the external URL for the site
-		private URL resolvedURL; // this is the resolved URL used internally
-		private ISitePolicy policy;
-		private boolean updateable = true;
-		private ArrayList features;
-		private ArrayList plugins;
-		private PlatformConfiguration parent;
-		private long lastChangeStamp;
-		private long changeStamp;
-		private boolean changeStampIsValid = false;
-		private long lastFeaturesChangeStamp;
-		private long featuresChangeStamp;
-		private boolean featuresChangeStampIsValid = false;
-		private long lastPluginsChangeStamp;
-		private long pluginsChangeStamp;
-		private boolean pluginsChangeStampIsValid = false;
-		private String linkFileName = null;
-
-		private SiteEntry() {
-		}
-		private SiteEntry(URL url, ISitePolicy policy, PlatformConfiguration parent) {
-			if (url==null)
-				throw new IllegalArgumentException();
-				
-			if (policy==null)
-				throw new IllegalArgumentException();
-				
-			if (parent==null)
-				throw new IllegalArgumentException();
-				
-			this.url = url;
-			this.policy = policy;
-			this.parent = parent;
-			this.features = null;
-			this.plugins = null;
-			this.resolvedURL = this.url;
-			if (url.getProtocol().equals(PlatformURLHandler.PROTOCOL)) {
-				try {
-					resolvedURL = ((PlatformURLConnection)url.openConnection()).getResolvedURL();
-				} catch(IOException e) {
-					// will use the baseline URL ...
-				}
-			}
-		}
-
-		/*
-		 * @see ISiteEntry#getURL()
-		 */
-		public URL getURL() {
-			return url;
-		}
-
-		/*
-		* @see ISiteEntry#getSitePolicy()
-		*/
-		public ISitePolicy getSitePolicy() {
-			return policy;
-		}
-
-		/*
-		 * @see ISiteEntry#setSitePolicy(ISitePolicy)
-		 */
-		public synchronized void setSitePolicy(ISitePolicy policy) {				
-			if (policy==null)
-				throw new IllegalArgumentException();
-			this.policy = policy;
-		}
-		
-		/*
-		 * @see ISiteEntry#getFeatures()
-		 */
-		public String[] getFeatures() {
-			return getDetectedFeatures();
-		}
-		
-		/*
-		 * @see ISiteEntry#getPlugins()
-		 */
-		public String[] getPlugins() {
-			
-			ISitePolicy policy = getSitePolicy();
-			
-			if (policy.getType()==ISitePolicy.USER_INCLUDE)
-				return policy.getList();
-				
-			if (policy.getType()==ISitePolicy.USER_EXCLUDE) {
-				ArrayList detectedPlugins = new ArrayList(Arrays.asList(getDetectedPlugins()));
-				String[] excludedPlugins = policy.getList();
-				for (int i=0; i<excludedPlugins.length; i++) {
-					if (detectedPlugins.contains(excludedPlugins[i]))
-						detectedPlugins.remove(excludedPlugins[i]);
-				}
-				return (String[])detectedPlugins.toArray(new String[0]);
-			}
-			
-			// bad policy type
-			return new String[0];
-		}
-		
-		/*
-		 * @see ISiteEntry#getChangeStamp()
-		 */
-		public long getChangeStamp() {
-			if (!changeStampIsValid)				
-				computeChangeStamp();
-			return changeStamp;
-		}
-		
-		/*
-		 * @see ISiteEntry#getFeaturesChangeStamp()
-		 */
-		public long getFeaturesChangeStamp() {
-			if (!featuresChangeStampIsValid)				
-				computeFeaturesChangeStamp();
-			return featuresChangeStamp;
-		}
-		
-		/*
-		 * @see ISiteEntry#getPluginsChangeStamp()
-		 */
-		public long getPluginsChangeStamp() {
-			if (!pluginsChangeStampIsValid)
-				computePluginsChangeStamp();				
-			return pluginsChangeStamp;
-		}
-		
-		/*
-		 * @see ISiteEntry#isUpdateable()
-		 */
-		public boolean isUpdateable() {
-			return updateable;
-		}
-		
-		/*
-		 * @see ISiteEntry#isNativelyLinked()
-		 */
-		public boolean isNativelyLinked() {
-			return isExternallyLinkedSite();
-		}
-		
-		private String[] detectFeatures() {
-			
-			// invalidate stamps ... we are doing discovery
-			changeStampIsValid = false;
-			featuresChangeStampIsValid = false;
-			parent.changeStampIsValid = false;
-			parent.featuresChangeStampIsValid = false;
-			
-			features = new ArrayList();
-				
-			if (!supportsDetection(resolvedURL))
-				return new String[0];
-
-			// locate feature entries on site
-			File siteRoot = new File(resolvedURL.getFile().replace('/', File.separatorChar));
-			File root = new File(siteRoot, FEATURES);
-
-			String[] list = root.list();
-			String path;
-			File plugin;
-			for (int i = 0; list != null && i < list.length; i++) {
-				path = list[i] + File.separator + FEATURE_XML;
-				plugin = new File(root, path);
-				if (!plugin.exists()) {
-					continue;
-				}
-				features.add(FEATURES + "/" + path.replace(File.separatorChar, '/')); //$NON-NLS-1$
-			}
-			if (DEBUG) {
-				debug(resolvedURL.toString()+" located  "+features.size()+" feature(s)"); //$NON-NLS-1$ //$NON-NLS-2$
-			}				
-				
-			return (String[])features.toArray(new String[0]);
-		}
-		
-		private String[] detectPlugins() {
-				
-			// invalidate stamps ... we are doing discovery
-			changeStampIsValid = false;
-			pluginsChangeStampIsValid = false;
-			parent.changeStampIsValid = false;
-			parent.pluginsChangeStampIsValid = false;
-			
-			plugins = new ArrayList();
-			
-			if (!supportsDetection(resolvedURL))
-				return new String[0];
-								
-			// locate plugin entries on site
-			File root =
-				new File(resolvedURL.getFile().replace('/', File.separatorChar) + PLUGINS);
-			String[] list = root.list();
-			String path;
-			File plugin;
-			for (int i = 0; list != null && i < list.length; i++) {
-				path = list[i] + File.separator + PLUGIN_XML;
-				plugin = new File(root, path);
-				if (!plugin.exists()) {
-					path = list[i] + File.separator + FRAGMENT_XML;
-					plugin = new File(root, path);
-					if (!plugin.exists())
-						continue;
-				}
-				plugins.add(PLUGINS + "/" + path.replace(File.separatorChar, '/')); //$NON-NLS-1$
-			}
-			if (DEBUG) {
-				debug(resolvedURL.toString()+" located  "+plugins.size()+" plugin(s)"); //$NON-NLS-1$ //$NON-NLS-2$
-			}								
-				
-			return (String[])plugins.toArray(new String[0]);
-		}
-		
-		private synchronized String[] getDetectedFeatures() {
-			if (features == null)
-				return detectFeatures();
-			else
-				return (String[])features.toArray(new String[0]);
-		}
-		
-		private synchronized String[] getDetectedPlugins() {
-			if (plugins == null)
-				return detectPlugins();
-			else 
-				return (String[])plugins.toArray(new String[0]);
-		}
-		
-		private URL getResolvedURL() {
-			return resolvedURL;
-		}
-		
-		private void computeChangeStamp() {
-			computeFeaturesChangeStamp();
-			computePluginsChangeStamp();
-			changeStamp = resolvedURL.hashCode() ^ featuresChangeStamp ^ pluginsChangeStamp;
-			changeStampIsValid = true;
-		}
-		
-		private synchronized void computeFeaturesChangeStamp() {
-			if (featuresChangeStampIsValid)
-				return;
-								
-			long start = 0;
-			if (DEBUG)
-				start = (new Date()).getTime();
-			String[] features = getFeatures();
-			featuresChangeStamp = computeStamp(features);
-			featuresChangeStampIsValid = true;
-			if (DEBUG) {
-				long end = (new Date()).getTime();
-				debug(resolvedURL.toString()+" feature stamp: "+featuresChangeStamp+((featuresChangeStamp==lastFeaturesChangeStamp)?" [no changes]":" [was "+lastFeaturesChangeStamp+"]") + " in "+(end-start)+"ms"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-			}
-		}
-		
-		private synchronized void computePluginsChangeStamp() {
-			if (pluginsChangeStampIsValid)
-				return;
-					
-			long start = 0;
-			if (DEBUG)
-				start = (new Date()).getTime();
-			String[] plugins = getPlugins();
-			pluginsChangeStamp = computeStamp(plugins);
-			pluginsChangeStampIsValid = true;
-			if (DEBUG) {
-				long end = (new Date()).getTime();
-				debug(resolvedURL.toString()+" plugin stamp: "+pluginsChangeStamp+((pluginsChangeStamp==lastPluginsChangeStamp)?" [no changes]":" [was "+lastPluginsChangeStamp+"]") + " in "+(end-start)+"ms"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
-			}
-		}
-		
-		private long computeStamp(String[] targets) {
-			
-			long result = 0;
-			if (!supportsDetection(resolvedURL)) {
-				// NOTE:  this path should not be executed until we support running
-				//        from an arbitrary URL (in particular from http server). For
-				//        now just compute stamp across the list of names. Eventually
-				//        when general URLs are supported we need to do better (factor
-				//        in at least the existence of the target). However, given this
-				//        code executes early on the startup sequence we need to be
-				//        extremely mindful of performance issues.
-				for (int i=0; i<targets.length; i++)
-					result ^= targets[i].hashCode();
-				if (DEBUG)
-					debug("*WARNING* computing stamp using URL hashcodes only"); //$NON-NLS-1$
-			} else {
-				// compute stamp across local targets		
-				String rootPath = resolvedURL.getFile().replace('/',File.separatorChar);
-				if (!rootPath.endsWith(File.separator))
-					rootPath += File.separator;
-				File rootFile = new File(rootPath);
-				if (rootFile.exists()) {
-					File f = null;
-					for (int i=0; i<targets.length; i++) {
-						f = new File(rootFile,targets[i]);
-						if (f.exists())
-							result ^= f.getAbsolutePath().hashCode() ^ f.lastModified() ^ f.length();
-					}
-				}
-			}
-			
-			return result;
-		}
-		
-		private boolean isExternallyLinkedSite() {
-			return (linkFileName!=null && !linkFileName.trim().equals("")); //$NON-NLS-1$
-		}
-		
-		private synchronized void refresh() {
-			// reset computed values. Will be updated on next access.		
-			lastChangeStamp = changeStamp;
-			lastFeaturesChangeStamp = featuresChangeStamp;
-			lastPluginsChangeStamp = pluginsChangeStamp;
-			changeStampIsValid = false;
-			featuresChangeStampIsValid = false;
-			pluginsChangeStampIsValid = false;
-			features = null;
-			plugins = null;
-		}
-
-	}
-
-	public class SitePolicy implements IPlatformConfiguration.ISitePolicy {
-
-		private int type;
-		private String[] list;
-
-		private SitePolicy() {
-		}
-		private SitePolicy(int type, String[] list) {
-			if (type != ISitePolicy.USER_INCLUDE
-				&& type != ISitePolicy.USER_EXCLUDE)
-				throw new IllegalArgumentException();
-			this.type = type;
-
-			if (list == null)
-				this.list = new String[0];
-			else
-				this.list = list;
-		}
-
-		/*
-		 * @see ISitePolicy#getType()
-		 */
-		public int getType() {
-			return type;
-		}
-
-		/*
-		* @see ISitePolicy#getList()
-		*/
-		public String[] getList() {
-			return list;
-		}
-
-		/*
-		 * @see ISitePolicy#setList(String[])
-		 */
-		public synchronized void setList(String[] list) {
-			if (list == null)
-				this.list = new String[0];
-			else
-				this.list = list;
-		}
-
-	}
-	
-	private class FeatureEntry implements IPlatformConfiguration.IFeatureEntry {
-		private String id;
-		private String version;
-		private String application;
-		private URL[] root;
-		
-		private FeatureEntry(String id, String version, String application, URL[] root) {
-			if (id == null)
-				throw new IllegalArgumentException();
-			this.id = id;
-			this.version = version;
-			this.application = application;
-			this.root = (root==null ? new URL[0] : root);
-		}
-				
-		/*
-		 * @see IFeatureEntry#getFeatureIdentifier()
-		 */
-		public String getFeatureIdentifier() {
-			return id;
-		}
-		
-		/*
-		 * @see IFeatureEntry#getFeatureVersion()
-		 */
-		public String getFeatureVersion() {
-			return version;
-		}
-		
-		/*
-		 * @see IFeatureEntry#getFeatureApplication()
-		 */
-		public String getFeatureApplication() {
-			return application;
-		}
-		
-		/*
-		 * @see IFeatureEntry#getFeatureRootURLs()
-		 */
-		public URL[] getFeatureRootURLs() {
-			return root;
-		}
-	}
-	
-	private class VersionedIdentifier {
-		private String identifier = ""; //$NON-NLS-1$
-		private int major = 0;
-		private int minor = 0;
-		private int service = 0;
-		private String qualifier = ""; //$NON-NLS-1$
-	
-		private static final String VER_SEPARATOR = "."; //$NON-NLS-1$
-		private static final String ID_SEPARATOR = "_"; //$NON-NLS-1$
-		
-		public static final int LESS_THAN = -1;
-		public static final int EQUAL = 0;
-		public static final int EQUIVALENT = 1;
-		public static final int COMPATIBLE = 2;
-		public static final int GREATER_THAN = 3;
-		
-		public VersionedIdentifier(String s) {		
-			if (s==null || (s=s.trim()).equals(""))  //$NON-NLS-1$
-				return;
-		
-			int loc = s.lastIndexOf(ID_SEPARATOR);
-			if (loc != -1) {
-				this.identifier = s.substring(0, loc);
-				String version = s.substring(loc+1);
-				parseVersion(version);
-			} else
-			 this.identifier = s;		
-		}
-		
-		public boolean equalIdentifiers(VersionedIdentifier id) {
-			if (id == null)
-				return identifier == null;
-			else
-				return id.identifier.equals(identifier);
-		}		
-		
-		public int compareVersion(VersionedIdentifier id) {
-
-			if (id == null) {
-				if (major==0 && minor==0 && service==0) return -1;
-				else return 1;
-			}
-
-			if (major > id.major) return GREATER_THAN;
-			if (major < id.major) return LESS_THAN;
-			if (minor > id.minor) return COMPATIBLE;
-			if (minor < id.minor) return LESS_THAN;	
-			if (service > id.service) return EQUIVALENT;
-			if (service < id.service) return LESS_THAN;
-			return compareQualifiers(qualifier, id.qualifier);
-		}
-
-		private int compareQualifiers(String q1, String q2) {
-			int result = q1.compareTo(q2);
-			if (result<0)
-				return LESS_THAN;
-			else if (result>0)
-				return EQUIVALENT;
-			else
-				return EQUAL;
-		}	
-		
-		private void parseVersion(String v) {				
-			if( v == null || (v=v.trim()).equals("")) //$NON-NLS-1$
-				return;
-		
-			try{
-				StringTokenizer st = new StringTokenizer(v, VER_SEPARATOR);
-				ArrayList elements = new ArrayList(4);
-
-				while(st.hasMoreTokens()) {
-					elements.add(st.nextToken());
-				}
-
-				if (elements.size()>=1) this.major = (new Integer((String)elements.get(0))).intValue();
-				if (elements.size()>=2) this.minor = (new Integer((String)elements.get(1))).intValue();
-				if (elements.size()>=3) this.service = (new Integer((String)elements.get(2))).intValue();
-				if (elements.size()>=4) this.qualifier = removeWhiteSpace((String)elements.get(3));
-		
-			} catch (Exception e) {
-				// use what we got so far ...
-			}
-		}
-		
-		private String removeWhiteSpace(String s) {
-			char[] chars = s.trim().toCharArray();
-			boolean whitespace = false;
-			for(int i=0; i<chars.length; i++) {
-				if (Character.isWhitespace(chars[i])) {
-					chars[i] = '_';
-					whitespace = true;
-				}
-			}
-			return whitespace ? new String(chars) : s;
-		}
-	}
-	
-	/*
-	 * Element selector for use with "tiny" parser. Parser callers supply 
-	 * concrete selectors
-	 */	
-	public interface Selector {
-	
-		/*
-		 * Method is called to pre-select a specific xml type. Pre-selected
-		 * elements are then fully parsed and result in calls to full
-		 * select method.
-		 * @return <code>true</code> is the element should be considered,
-		 * <code>false</code> otherwise
-		 */
-		public boolean select(String entry);
-	
-		/*
-		 * Method is called with a fully parsed element.
-		 * @return <code>true</code> to select this element and terminate the parse,
-		 * <code>false</code> otherwise
-		 */
-		public boolean select(String element, HashMap attributes);
-	}
-
-	/*
-	 * "Tiny" xml parser. Performs a rudimentary parse of a well-formed xml file.
-	 * Is specifically geared to parsing plugin.xml files of "bootstrap" plug-ins
-	 * during the platform startup sequence before full xml plugin is available.
-	 */
-	public static class Parser {
-		
-		private ArrayList elements = new ArrayList();
-	
-		/*
-		 * Construct parser for the specified file
-		 */
-		public Parser(File file) {
-			try {
-				load(new FileInputStream(file));
-			} catch (Exception e) {
-				// continue ... actual parsing will report errors
-			}	
-		}
-	
-		/*
-		 * Construct parser for the specified URL
-		 */
-		public Parser(URL url) {
-			try {
-				load(url.openStream());
-			} catch (Exception e) {
-				// continue ... actual parsing will report errors
-			}
-		}		
-	
-		/*
-		 * Return selected elements as an (attribute-name, attribute-value) map.
-		 * The name of the selected element is returned as the value of entry with
-		 * name "<element>".
-		 * @return attribute map for selected element, or <code>null</code>
-		 */
-		public HashMap getElement(Selector selector) {
-			if (selector == null)
-				return null;
-			
-			int result;
-			String element;
-			for (int i=0; i<elements.size(); i++) {
-				// make pre-parse selector call
-				element = (String)elements.get(i);
-				if (selector.select(element)) {
-					// parse selected entry
-					HashMap attributes = new HashMap();
-					String elementName;
-					int j;
-					// parse out element name
-					for (j = 0; j<element.length(); j++) {
-						if (Character.isWhitespace(element.charAt(j)))
-							break;
-					}
-					if (j>=element.length()) {
-						elementName = element;
-					} else {
-						elementName = element.substring(0,j);
-						element = element.substring(j);
-						// parse out attributes
-						StringTokenizer t = new StringTokenizer(element,"=\""); //$NON-NLS-1$
-						boolean isKey = true;
-						String key = ""; //$NON-NLS-1$
-						while(t.hasMoreTokens()) {
-							String token = t.nextToken().trim();
-							if (!token.equals("")) { //$NON-NLS-1$
-								// collect (key, value) pairs
-								if (isKey) {
-									key = token;
-									isKey = false;
-								} else {
-									attributes.put(key, token);
-									isKey = true;
-								}
-							}
-						}
-					}
-					// make post-parse selector call
-					if (selector.select(elementName, attributes)) {
-						attributes.put("<element>", elementName); //$NON-NLS-1$
-						return attributes;
-					}
-				}			
-			}			
-			return null;
-		}
-	
-		private void load(InputStream is) {
-			if (is == null)
-				return;
-			
-			// read file	
-			StringBuffer xml = new StringBuffer(4096);
-			char[] iobuf = new char[4096];
-			InputStreamReader r = null;
-			try {
-				r = new InputStreamReader(is);
-				int len = r.read(iobuf, 0, iobuf.length);
-				while (len != -1) {
-					xml.append(iobuf, 0, len);
-					len = r.read(iobuf, 0, iobuf.length);
-				}
-			} catch (Exception e) {
-				return;
-			} finally {
-				if (r != null) try {
-					r.close();
-				} catch (IOException e) {
-					// ignore
-				}
-			}
-		
-			// parse out element tokens	
-			String xmlString = xml.toString();
-			StringTokenizer t = new StringTokenizer(xmlString,"<>"); //$NON-NLS-1$
-			while(t.hasMoreTokens()) {
-				String token = t.nextToken().trim();
-				if (!token.equals("")) //$NON-NLS-1$
-					elements.add(token);
-			}
-		}
-	}
-	
-	public static class BootDescriptor {
-		private String id;
-		private String version;
-		private String[] libs;
-		private URL dir;
-		
-		public BootDescriptor(String id, String version, String[] libs, URL dir) {
-			this.id = id;
-			this.version = version;
-			this.libs = libs;
-			this.dir = dir;
-		}
-		
-		public String getId() {
-			return id;
-		}
-		
-		public String getVersion() {
-			return version;
-		}
-		
-		public String[] getLibraries() {
-			return libs;
-		}
-		
-		public URL getPluginDirectoryURL() {
-			return dir;
-		}
-	}
-
-	private PlatformConfiguration(String configArg, String metaPath, URL pluginPath) throws IOException {
-		this.sites = new HashMap();
-		this.externalLinkSites = new HashMap();
-		this.cfgdFeatures = new HashMap();
-		this.bootPlugins = new HashMap();
-						
-		// Determine configuration URL to use (based on command line argument)	
-		URL configURL = null;
-		if (configArg != null && !configArg.trim().equals("")) { //$NON-NLS-1$
-			configURL = new URL(configArg);
-		}
-
-		// initialize configuration		
-		boolean createRootSite = (pluginPath == null);
-		initializeCurrent(configURL, metaPath, createRootSite);
-						
-		// merge in any plugin-path entries (converted to site(s))
-		if (pluginPath != null) {
-			updateConfigurationFromPlugins(pluginPath);
-		}
-		
-		// pick up any first-time default settings (relative to install location)
-		loadInitializationAttributes();		
-		
-		// Detect external links. These are "soft link" to additional sites. The link
-		// files are usually provided by external installation programs. They are located
-		// relative to this configuration URL.
-		configureExternalLinks();
-		
-		// Validate sites in the configuration. Causes any sites that do not exist to
-		// be removed from the configuration
-		validateSites();
-		
-		// compute differences between configuration and actual content of the sites
-		// (base sites and link sites)
-		computeChangeStamp();
-		
-		// determine which plugins we will use to start the rest of the "kernel"
-		// (need to get core.runtime matching the executing core.boot and
-		// xerces matching the selected core.runtime)
-		locateDefaultPlugins();
-	}
-	
-	PlatformConfiguration(URL url) throws IOException {
-		this.sites = new HashMap();
-		this.externalLinkSites = new HashMap();
-		this.cfgdFeatures = new HashMap();
-		this.bootPlugins = new HashMap();
-		initialize(url);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#createSiteEntry(URL, ISitePolicy)
-	 */
-	public ISiteEntry createSiteEntry(URL url, ISitePolicy policy) {
-		return new PlatformConfiguration.SiteEntry(url, policy, this);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#createSitePolicy(int, String[])
-	 */
-	public ISitePolicy createSitePolicy(int type, String[] list) {
-		return new PlatformConfiguration.SitePolicy(type, list);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#createFeatureEntry(String, String, String, URL)
-	 */
-	public IFeatureEntry createFeatureEntry(
-		String id,
-		String version,
-		String application,
-		URL[] root) {
-		return new PlatformConfiguration.FeatureEntry(id, version, application, root);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#configureSite(ISiteEntry)
-	 */
-	public void configureSite(ISiteEntry entry) {
-		configureSite(entry, false);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#configureSite(ISiteEntry, boolean)
-	 */
-	public synchronized void configureSite(ISiteEntry entry, boolean replace) {
-
-		if (entry == null)
-			return;
-
-		URL url = entry.getURL();
-		if (url == null)
-			return;
-		String key = url.toExternalForm();
-
-		if (sites.containsKey(key) && !replace)
-			return;
-
-		sites.put(key, entry);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#unconfigureSite(ISiteEntry)
-	 */
-	public synchronized void unconfigureSite(ISiteEntry entry) {
-		if (entry == null)
-			return;
-
-		URL url = entry.getURL();
-		if (url == null)
-			return;
-		String key = url.toExternalForm();
-
-		sites.remove(key);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#getConfiguredSites()
-	 */
-	public ISiteEntry[] getConfiguredSites() {
-		if (sites.size() == 0)
-			return new ISiteEntry[0];
-
-		return (ISiteEntry[]) sites.values().toArray(new ISiteEntry[0]);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#findConfiguredSite(URL)
-	 */
-	public ISiteEntry findConfiguredSite(URL url) {
-		if (url == null)
-			return null;
-		String key = url.toExternalForm();
-
-		ISiteEntry result = (ISiteEntry) sites.get(key);
-		if (result == null) // retry with decoded URL string
-			result = (ISiteEntry) sites.get(URLDecoder.decode(key));
-		return result;
-	}
-	
-	/*
-	 * @see IPlatformConfiguration#configureFeatureEntry(IFeatureEntry)
-	 */
-	public synchronized void configureFeatureEntry(IFeatureEntry entry) {
-		if (entry == null)
-			return;
-
-		String key = entry.getFeatureIdentifier();
-		if (key == null)
-			return;
-
-		cfgdFeatures.put(key, entry);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#unconfigureFeatureEntry(IFeatureEntry)
-	 */
-	public synchronized void unconfigureFeatureEntry(IFeatureEntry entry) {
-		if (entry == null)
-			return;
-
-		String key = entry.getFeatureIdentifier();
-		if (key == null)
-			return;
-
-		cfgdFeatures.remove(key);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#getConfiguredFeatureEntries()
-	 */
-	public IFeatureEntry[] getConfiguredFeatureEntries() {
-		if (cfgdFeatures.size() == 0)
-			return new IFeatureEntry[0];
-
-		return (IFeatureEntry[]) cfgdFeatures.values().toArray(new IFeatureEntry[0]);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#findConfiguredFeatureEntry(String)
-	 */
-	public IFeatureEntry findConfiguredFeatureEntry(String id) {
-		if (id == null)
-			return null;
-
-		return (IFeatureEntry) cfgdFeatures.get(id);
-	}
-
-	/*
-	 * @see IPlatformConfiguration#getConfigurationLocation()
-	 */
-	public URL getConfigurationLocation() {
-		return configLocation;
-	}
-	
-	/*
-	 * @see IPlatformConfiguration#getChangeStamp()
-	 */
-	public long getChangeStamp() {
-		if (!changeStampIsValid)				
-			computeChangeStamp();
-		return changeStamp;
-	}
-
-	/*
-	 * @see IPlatformConfiguration#getFeaturesChangeStamp()
-	 */
-	public long getFeaturesChangeStamp() {
-		if (!featuresChangeStampIsValid)				
-			computeFeaturesChangeStamp();
-		return featuresChangeStamp;
-	}
-
-	/*
-	 * @see IPlatformConfiguration#getPluginsChangeStamp()
-	 */
-	public long getPluginsChangeStamp() {
-		if (!pluginsChangeStampIsValid)
-			computePluginsChangeStamp();				
-		return pluginsChangeStamp;
-	}
-	
-	/*
-	 * @see IPlatformConfiguration#getApplicationIdentifier()
-	 */
-	public String getApplicationIdentifier() {
-		
-		if (cmdInitialize) {
-			// we are running post-install initialization. Force
-			// running of the reconciler
-			return RECONCILER_APP;
-		}
-		
-		if (featuresChangeStamp != lastFeaturesChangeStamp) {
-			// we have detected feature changes ... see if we need to reconcile
-			boolean update = !cmdNoUpdate || cmdUpdate;
-			if (update)
-				return RECONCILER_APP;
-		}
-
-		// "normal" startup ... run specified application
-		return getApplicationIdentifierInternal();
-	}
-	
-	private String getApplicationIdentifierInternal() {
-		
-		if (cmdApplication != null) // application was specified
-			return cmdApplication;
-		else {			
-			// if -feature was not specified use the default feature
-			String feature = cmdFeature;
-			if (feature == null)
-				feature = defaultFeature;
-			
-			// lookup application for feature (specified or defaulted)
-			if (feature != null) {
-				IFeatureEntry fe = findConfiguredFeatureEntry(feature);
-				if (fe != null) {
-					if (fe.getFeatureApplication() != null)
-						return fe.getFeatureApplication();
-				}
-			}
-		}
-		
-		// return hardcoded default if we failed
-		return DEFAULT_FEATURE_APPLICATION;
-	}
-
-	/*
-	 * @see IPlatformConfiguration#getPrimaryFeatureIdentifier()
-	 */
-	public String getPrimaryFeatureIdentifier() {
-		
-		if (cmdFeature != null) // -feature was specified on command line
-			return cmdFeature; 
-		
-		// feature was not specified on command line
-		if (defaultFeature != null)
-			return defaultFeature; // return customized default if set
-		else
-			return DEFAULT_FEATURE_ID; // return hardcoded default
-	}
-
-	/*
-	 * @see IPlatformConfiguration#getPluginPath()
-	 */
-	public URL[] getPluginPath() {
-		ArrayList path = new ArrayList();
-		if (DEBUG)
-			debug("computed plug-in path:"); //$NON-NLS-1$
-			
-		ISiteEntry[] sites = getConfiguredSites();
-		URL pathURL;
-		for (int i=0; i<sites.length; i++) {
-			String[] plugins = sites[i].getPlugins();
-			for (int j=0; j<plugins.length; j++) {
-				try {
-					pathURL = new URL(((SiteEntry)sites[i]).getResolvedURL(),plugins[j]);
-					path.add(pathURL);
-					if (DEBUG)
-						debug("   "+pathURL.toString()); //$NON-NLS-1$
-				} catch(MalformedURLException e) {
-					// skip entry ...
-					if (DEBUG)
-						debug("   bad URL: "+e); //$NON-NLS-1$
-				}
-			}
-		}			
-		return (URL[])path.toArray(new URL[0]);
-	}
-	
-	/*
-	 * @see IPlatformConfiguration#getBootstrapPluginIdentifiers()
-	 */
-	public String[] getBootstrapPluginIdentifiers() {
-		return BOOTSTRAP_PLUGINS;
-	}
-
-	/*
-	 * @see IPlatformConfiguration#setBootstrapPluginLocation(String, URL)
-	 */
-	public void setBootstrapPluginLocation(String id, URL location) {
-		String[] ids = getBootstrapPluginIdentifiers();
-		for (int i=0; i<ids.length; i++) {
-			if (ids[i].equals(id)) {
-				bootPlugins.put(id, location.toExternalForm());
-				break;
-			}
-		}
-	}
-		
-	/*
-	 * @see IPlatformConfiguration#isUpdateable()
-	 */
-	public boolean isUpdateable() {
-		return true;
-	}
-	
-	/*
-	 * @see IPlatformConfiguration#isTransient()
-	 */
-	public boolean isTransient() {
-		return transientConfig;
-	}
-	
-	/*
-	 * @see IPlatformConfiguration#isTransient(boolean)
-	 */
-	public void isTransient(boolean value) {
-		if (this != BootLoader.getCurrentPlatformConfiguration())
-			transientConfig = value;
-	}
-	
-	/*
-	 * @see IPlatformConfiguration#refresh()
-	 */
-	public synchronized void refresh() {
-		// Reset computed values. Will be lazily refreshed
-		// on next access
-		ISiteEntry[] sites = getConfiguredSites();
-		for (int i = 0; i < sites.length; i++) {
-			// reset site entry
-			((SiteEntry)sites[i]).refresh();
-		}		
-		// reset configuration entry.
-		lastChangeStamp = changeStamp;
-		lastFeaturesChangeStamp = featuresChangeStamp;
-		lastPluginsChangeStamp = pluginsChangeStamp;
-		changeStampIsValid = false;
-		featuresChangeStampIsValid = false;
-		pluginsChangeStampIsValid = false;
-	}
-
-	/*
-	 * @see IPlatformConfiguration#save()
-	 */
-	public void save() throws IOException {
-		if (isUpdateable())
-			save(configLocation);
-	}
-	
-	/*
-	 * @see IPlatformConfiguration#save(URL)
-	 */
-	public synchronized void save(URL url) throws IOException {		
-		if (url == null)
-			throw new IOException(Policy.bind("cfig.unableToSave.noURL")); //$NON-NLS-1$
-			
-		PrintWriter w = null;
-		OutputStream os = null;
-		if (!url.getProtocol().equals("file")) { //$NON-NLS-1$
-			// not a file protocol - attempt to save to the URL
-			URLConnection uc = url.openConnection();
-			uc.setDoOutput(true);
-			os = uc.getOutputStream();
-			w = new PrintWriter(os);
-			try {
-				write(w);
-			} finally {
-				w.close();
-			}
-		} else {
-			// file protocol - do safe i/o
-			File cfigFile = new File(url.getFile().replace('/',File.separatorChar));
-			File cfigDir = cfigFile.getParentFile();
-			if (cfigDir!=null)
-				cfigDir.mkdirs();
-				
-			// first save the file as temp
-			File cfigTmp = new File(cfigFile.getAbsolutePath()+CONFIG_FILE_TEMP_SUFFIX);
-			os = new FileOutputStream(cfigTmp); 
-			w = new PrintWriter(os);
-			try {
-				write(w);
-			} finally {
-				w.close();
-			}
-			
-			// make sure we actually succeeded saving the whole configuration.
-			InputStream is = new FileInputStream(cfigTmp);
-			Properties tmpProps = new Properties();
-			try {
-				tmpProps.load(is);
-				if (!EOF.equals(tmpProps.getProperty(EOF))) {
-					throw new IOException(Policy.bind("cfig.unableToSave",cfigTmp.getAbsolutePath())); //$NON-NLS-1$
-				}				
-			} finally {
-				is.close();
-			}
-			
-			// make the saved config the "active" one
-			File cfigBak = new File(cfigFile.getAbsolutePath()+CONFIG_FILE_BAK_SUFFIX);
-			cfigBak.delete(); // may have old .bak due to prior failure
-
-			if (cfigFile.exists()) 
-				cfigFile.renameTo(cfigBak);
-				
-			// at this point we have old config (if existed) as "bak" and the 
-			// new config as "tmp". 
-			boolean ok = cfigTmp.renameTo(cfigFile);
-			if (ok) {
-				// at this point we have the new config "activated", and the old
-				// config (if it existed) as "bak"
-				cfigBak.delete(); // clean up
-			} else {
-				// this codepath represents a tiny failure window. The load processing
-				// on startup will detect missing config and will attempt to start
-				// with "tmp" (latest), then "bak" (the previous). We can also end up
-				// here if we failed to rename the current config to "bak". In that
-				// case we will restart with the previous state.
-				throw new IOException(Policy.bind("cfig.unableToSave",cfigTmp.getAbsolutePath())); //$NON-NLS-1$
-			}	
-		}
-	}
-	
-	public BootDescriptor getPluginBootDescriptor(String id) {		
-		// return the plugin descriptor for the specified plugin. This method
-		// is used during boot processing to obtain information about "kernel" plugins
-		// whose class loaders must be created prior to the plugin registry being 
-		// available (ie. loaders needed to create the plugin registry).
-
-		if (RUNTIME_PLUGIN_ID.equals(id))
-			return runtimeDescriptor;
-		else if (XML_PLUGIN_ID.equals(id))
-			return xmlDescriptor;
-		else
-			return null;
-	}
-	
-		
-	static PlatformConfiguration getCurrent() {
-		return currentPlatformConfiguration;
-	}
-	
-	/**
-	 * Create and initialize the current platform configuration
-	 * @param cmdArgs command line arguments (startup and boot arguments are
-	 * already consumed)
-	 * @param r10plugins plugin-path URL as passed on the BootLoader.run(...)
-	 * or BootLoader.startup(...) method. Supported for R1.0 compatibility
-	 * @param r10apps application identifies as passed on the BootLoader.run(...)
-	 * method. Supported for R1.0 compatibility.
-	 * @param metaPath path to the platform metadata area
-	 */
-	static synchronized String[] startup(String[] cmdArgs, URL r10plugins, String r10app, String metaPath) throws Exception {			
-		
-		// if BootLoader was invoked directly (rather than via Main), it is possible
-		// to have the plugin-path and application set in 2 ways: (1) via an explicit
-		// argument on the invocation method, or (2) via a command line argument (passed
-		// into this method as the argument String[]). If specified, the explicit
-		// values are used even if the command line arguments were specified as well.
-		cmdPlugins = r10plugins; // R1.0 compatibility
-		cmdApplication = r10app; // R1.0 compatibility
-		
-		// process command line arguments
-		String[] passthruArgs = processCommandLine(cmdArgs);
-		if (cmdDev)
-			cmdNoUpdate = true; // force -noupdate when in dev mode (eg. PDE)
-		
-		// create current configuration
-		if (currentPlatformConfiguration == null)
-			currentPlatformConfiguration = new PlatformConfiguration(cmdConfiguration, metaPath, cmdPlugins);
-				
-		// check if we will be forcing reconciliation
-		passthruArgs = checkForFeatureChanges(passthruArgs, currentPlatformConfiguration);
-		
-		// check if we should indicate new changes
-		passthruArgs = checkForNewUpdates(currentPlatformConfiguration, passthruArgs);
-				
-		return passthruArgs;
-	}
-		
-	static synchronized void shutdown() throws IOException {
-
-		// save platform configuration
-		PlatformConfiguration config = getCurrent();
-		if (config != null) {
-			try {
-				config.save();
-			} catch(IOException e) {
-				if (DEBUG)
-					debug("Unable to save configuration "+e.toString()); //$NON-NLS-1$
-				// will recover on next startup
-			}
-			config.clearConfigurationLock();
-		}
-	}
-
-	private synchronized void initializeCurrent(URL url, String metaPath, boolean createRootSite) throws IOException {
-		
-		boolean concurrentUse = false;
-		
-		if (cmdInitialize) {
-			// we are running post-install initialization (-install command
-			// line argument). Ignore any configuration URL passed in. 
-			// Force the configuration to be saved in the install location.
-			// Allow an existing configuration to be re-initialized.
-			url = new URL(BootLoader.getInstallURL(),CONFIG_FILE); // if we fail here, return exception
-			concurrentUse = getConfigurationLock(url);
-			if (createRootSite) 
-				configureSite(getRootSite());
-			if (DEBUG)
-				debug("Initializing configuration " + url.toString()); //$NON-NLS-1$
-			configLocation = url;
-			verifyPath(configLocation);	
-			return;
-		}
-
-		if (url != null) {		
-			// configuration URL was specified. Use it (if exists), or create one
-			// in specified location
-			
-			// check concurrent use lock
-			concurrentUse = getConfigurationLock(url);
-			
-			// try loading the configuration
-			try {
-				load(url);
-				if (DEBUG)
-					debug("Using configuration " + url.toString()); //$NON-NLS-1$
-			} catch(IOException e) {
-				cmdFirstUse = true;
-				if (createRootSite)
-					configureSite(getRootSite());
-				if (DEBUG)
-					debug("Creating configuration " + url.toString());	//$NON-NLS-1$
-			}
-			configLocation = url;
-			verifyPath(configLocation);	
-			return;
-			
-		} else {
-			// configuration URL was not specified. Default behavior is to look
-			// for configuration in the workspace meta area. If not found, look
-			// for pre-initialized configuration in the installation location.
-			// If it is found it is used as the initial configuration. Otherwise
-			// a new configuration is created. In either case the resulting
-			// configuration is written into the platform .metadata area
-			
-			// first determine configuration location in .metadata
-			metaPath = metaPath.replace(File.separatorChar, '/');
-			if (!metaPath.endsWith("/")) //$NON-NLS-1$
-				metaPath += "/"; //$NON-NLS-1$
-			URL cfigURL = new URL("file",null,0,metaPath+CONFIG_FILE);	// if we fail here, return exception //$NON-NLS-1$
-
-			// check concurrent use lock
-			concurrentUse = getConfigurationLock(cfigURL);
-			
-			// if we can load it, use it
-			try {
-				load(cfigURL);
-				configLocation = cfigURL;
-				verifyPath(configLocation);	
-				if (DEBUG)
-					debug("Using configuration " + configLocation.toString()); //$NON-NLS-1$
-				return;			
-			} catch(IOException e) {
-				cmdFirstUse = true; // we are creating new configuration
-			}
-			
-			// failed to load, see if we can find pre-initialized configuration.
-			// Don't attempt this initialization when self-hosting (is unpredictable)
-			if (createRootSite) {
-				try {
-					url = new URL(BootLoader.getInstallURL(),CONFIG_FILE);
-					load(url);
-					// pre-initialized config loaded OK ... copy any remaining update metadata
-					copyInitializedState(BootLoader.getInstallURL(), metaPath, CONFIG_DIR);
-					configLocation = cfigURL; // config in .metadata is the right URL
-					verifyPath(configLocation);				
-					if (DEBUG) {
-						debug("Using configuration " + configLocation.toString()); //$NON-NLS-1$
-						debug("Initialized from    " + url.toString()); //$NON-NLS-1$
-					}
-					return;			
-				} catch(IOException e) {
-					// continue ...
-				}
-			}
-			
-			// if load failed, initialize with default site info
-			if (createRootSite)
-				configureSite(getRootSite());
-			configLocation = cfigURL;
-			verifyPath(configLocation);
-			if (DEBUG)
-				debug("Creating configuration " + configLocation.toString()); //$NON-NLS-1$
-			return;
-		}
-	}
-	
-	private synchronized void initialize(URL url) throws IOException {
-		if (url == null) {
-			if (DEBUG)
-				debug("Creating empty configuration object"); //$NON-NLS-1$
-			return;
-		}
-			
-		load(url);
-		configLocation = url;
-		if (DEBUG)
-			debug("Using configuration " + configLocation.toString()); //$NON-NLS-1$
-	}
-	
-	private ISiteEntry getRootSite() {
-		// create default site entry for the root				
-		ISitePolicy defaultPolicy = createSitePolicy(DEFAULT_POLICY_TYPE, DEFAULT_POLICY_LIST);
-		URL siteURL = null;
-		try {
-			siteURL = new URL(PlatformURLBaseConnection.PLATFORM_URL_STRING); // try using platform-relative URL
-		} catch (MalformedURLException e) {
-			siteURL = BootLoader.getInstallURL(); // ensure we come up ... use absolute file URL
-		}
-		ISiteEntry defaultSite = createSiteEntry(siteURL, defaultPolicy);
-		return defaultSite;
-	}
-	
-	private boolean getConfigurationLock(URL url) {
-		if (configurationInWorkspace(url))
-			return false;
-		
-		if (!url.getProtocol().equals("file")) //$NON-NLS-1$
-			return false;
-			
-		verifyPath(url);
-		String cfgName = url.getFile().replace('/',File.separatorChar);
-		String lockName = cfgName + CONFIG_FILE_LOCK_SUFFIX;
-		cfgLockFile = new File(lockName);
-		
-		//if the lock file already exists, try to delete,
-		//assume failure means another eclipse has it open
-		if (cfgLockFile.exists())
-			cfgLockFile.delete();
-		if (cfgLockFile.exists()) {
-			throw new RuntimeException(Policy.bind("cfig.inUse", cfgName, lockName)); //$NON-NLS-1$
-		}
-		
-		// OK so far ... open the lock file so other instances will fail
-		try {
-			cfgLockFileRAF = new RandomAccessFile(cfgLockFile, "rw"); //$NON-NLS-1$
-			cfgLockFileRAF.writeByte(0);
-		} catch (IOException e) {
-			throw new RuntimeException(Policy.bind("cfig.failCreateLock", cfgName)); //$NON-NLS-1$
-		}
-				
-		return false;
-	}
-	
-	private void clearConfigurationLock() {
-		try {
-			if (cfgLockFileRAF != null) {
-				cfgLockFileRAF.close();
-				cfgLockFileRAF = null;
-			}
-		} catch (IOException e) {
-			// ignore ...
-		}
-		if (cfgLockFile != null) {
-			cfgLockFile.delete();
-			cfgLockFile = null;
-		}
-	}
-	
-	private boolean configurationInWorkspace(URL url) {
-		// the configuration file is now in the workspace, so return true
-		return true;
-	}
-			
-	private void computeChangeStamp() {
-		computeFeaturesChangeStamp();
-		computePluginsChangeStamp();
-		changeStamp = featuresChangeStamp ^ pluginsChangeStamp;
-		changeStampIsValid = true;
-	}
-		
-	private void computeFeaturesChangeStamp() {
-		if (featuresChangeStampIsValid)
-			return;
-				
-		long result = 0;
-		ISiteEntry[] sites = getConfiguredSites();
-		for (int i=0; i<sites.length; i++) {
-			result ^= sites[i].getFeaturesChangeStamp();
-		}
-		featuresChangeStamp = result;
-		featuresChangeStampIsValid = true;
-	}
-		
-	private void computePluginsChangeStamp() {
-		if (pluginsChangeStampIsValid)
-			return;
-				
-		long result = 0;
-		ISiteEntry[] sites = getConfiguredSites();
-		for (int i=0; i<sites.length; i++) {
-			result ^= sites[i].getPluginsChangeStamp();
-		}
-		pluginsChangeStamp = result;
-		pluginsChangeStampIsValid = true;
-	}
-	
-	private void configureExternalLinks() {
-		URL linkURL = BootLoader.getInstallURL();		
-		if (!supportsDetection(linkURL))
-			return;
-		
-		try {
-			linkURL = new URL(linkURL, LINKS + "/"); //$NON-NLS-1$
-		} catch (MalformedURLException e) {
-			// skip bad links ...
-			if (DEBUG)
-				debug("Unable to obtain link URL"); //$NON-NLS-1$
-			return;
-		}
-		
-		File linkDir = new File(linkURL.getFile());
-		File[] links = linkDir.listFiles();
-		if (links==null || links.length==0) {
-			if (DEBUG)
-				debug("No links detected in "+linkURL.toExternalForm()); //$NON-NLS-1$
-			return;
-		}
-		
-		for (int i=0; i<links.length; i++) {
-			if (links[i].isDirectory())
-				continue;
-			if (DEBUG)
-				debug("Link file "+links[i].getAbsolutePath()); //$NON-NLS-1$
-			Properties props = new Properties();
-			FileInputStream is = null;
-			try {
-				is = new FileInputStream(links[i]);
-				props.load(is);			
-				configureExternalLinkSites(links[i],props);				
-			} catch(IOException e) {
-				// skip bad links ...
-				if (DEBUG)
-					debug("   unable to load link file "+e); //$NON-NLS-1$
-				continue;
-			} finally {
-				if (is != null) {
-					try {
-						is.close();
-					} catch(IOException e) {
-						// ignore ...
-					}
-				}
-			}
-		}		
-	}
-	
-	private void configureExternalLinkSites(File linkFile, Properties props) {
-		String path = props.getProperty(LINK_PATH);
-		if (path==null) {
-			if (DEBUG)
-				debug("   no path definition"); //$NON-NLS-1$
-			return;
-		}
-		
-		String link;
-		boolean updateable = true;
-		URL siteURL;
-		SiteEntry linkSite;
-		ISitePolicy linkSitePolicy = createSitePolicy(DEFAULT_POLICY_TYPE, DEFAULT_POLICY_LIST);
-		
-		// parse out link information
-		if (path.startsWith(LINK_READ+" ")) { //$NON-NLS-1$
-			updateable = false;
-			link = path.substring(2).trim();
-		} else if (path.startsWith(LINK_READ_WRITE+" ")) { //$NON-NLS-1$
-			link = path.substring(3).trim();
-		} else {
-			link = path;
-		}
-		
-		// 	make sure we have a valid link specification
-		try {
-			if (!link.endsWith(File.separator))
-				link += File.separator;
-			File target = new File(link + ECLIPSE);
-			link = "file:" + target.getAbsolutePath().replace(File.separatorChar,'/'); //$NON-NLS-1$
-			if (!link.endsWith("/")) //$NON-NLS-1$
-				link += "/"; // sites must be directories //$NON-NLS-1$
-			siteURL = new URL(link);
-		} catch(MalformedURLException e) {
-			// ignore bad links ...
-			if (DEBUG)
-				debug("  bad URL "+e); //$NON-NLS-1$
-			return;
-		}
-			
-		// process the link		
-		linkSite = (SiteEntry) externalLinkSites.get(siteURL);
-		if (linkSite != null) {
-			// we already have a site for this link target, update it if needed
-			linkSite.updateable = updateable; 
-			linkSite.linkFileName = linkFile.getAbsolutePath();
-		} else {
-			// this is a link to a new target so create site for it
-			linkSite = (SiteEntry) createSiteEntry(siteURL, linkSitePolicy);
-			linkSite.updateable = updateable;
-			linkSite.linkFileName = linkFile.getAbsolutePath();
-		}
-		
-		// configure the new site
-		// NOTE: duplicates are not replaced (first one in wins) 
-		configureSite(linkSite);
-		if (DEBUG)
-			debug("   "+(updateable?"R/W -> ":"R/O -> ")+siteURL.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	}
-	
-	/*
-	 * compute site(s) from plugin-path and merge into specified configuration
-	 */
-	private void updateConfigurationFromPlugins(URL file) throws IOException {
-		
-		// get the actual plugin path
-		URL[] pluginPath = BootLoader.getPluginPath(file);
-		if (pluginPath == null || pluginPath.length == 0)
-			return;
-			
-		// create a temp configuration and populate it based on plugin path
-		PlatformConfiguration tempConfig = new PlatformConfiguration((URL)null);
-		for (int i=0; i<pluginPath.length; i++) {
-			String entry = pluginPath[i].toExternalForm();
-			String sitePortion;
-			String pluginPortion;
-			int ix;
-			if (entry.endsWith("/")) { //$NON-NLS-1$
-				// assume directory path in the form <site>/plugins/
-				// look for -------------------------------^
-				ix = findEntrySeparator(entry,2); // second from end
-				sitePortion = entry.substring(0,ix+1);
-				pluginPortion = entry.substring(ix+1);
-				if (!pluginPortion.equals("plugins/")) //$NON-NLS-1$
-					continue; // unsupported entry ... skip it ("fragments/" are handled)
-				pluginPortion = null;
-			} else {
-				// assume full path in the form <site>/<pluginsDir>/<some.plugin>/plugin.xml
-				// look for --------------------------^
-				ix = findEntrySeparator(entry, 3); // third from end
-				sitePortion = entry.substring(0,ix+1);
-				pluginPortion = entry.substring(ix+1);
-			}
-			if (ix == -1)
-				continue; // bad entry ... skip it
-				
-			URL siteURL = null;
-			try {
-				siteURL = new URL(sitePortion);
-				if (siteURL.getProtocol().equals("file")) { //$NON-NLS-1$
-					File sf = new File(siteURL.getFile());
-					String sfn = sf.getAbsolutePath().replace(File.separatorChar,'/');
-					if (!sfn.endsWith("/")) //$NON-NLS-1$
-						sfn += "/"; //$NON-NLS-1$
-					siteURL = new URL("file:"+sfn); //$NON-NLS-1$
-				}
-			} catch (MalformedURLException e) {
-				continue; // bad entry ... skip it
-			}
-			
-			// configure existing site or create a new one for the entry
-			ISiteEntry site = tempConfig.findConfiguredSite(siteURL);
-			ISitePolicy policy;
-			if (site == null) {
-				// new site
-				if (pluginPortion == null) 
-					policy = tempConfig.createSitePolicy(ISitePolicy.USER_EXCLUDE, null);
-				else 
-					policy = tempConfig.createSitePolicy(ISitePolicy.USER_INCLUDE, new String[] { pluginPortion });
-				site = tempConfig.createSiteEntry(siteURL,policy);
-				tempConfig.configureSite(site);
-			} else {
-				// existing site
-				policy = site.getSitePolicy();
-				if (policy.getType() == ISitePolicy.USER_EXCLUDE)
-					continue; // redundant entry ... skip it
-				if (pluginPortion == null) {
-					// directory entry ... change policy to exclusion (with empty list)
-					policy = tempConfig.createSitePolicy(ISitePolicy.USER_EXCLUDE, null);
-				} else {
-					// explicit entry ... add it to the inclusion list
-					ArrayList list = new ArrayList(Arrays.asList(policy.getList()));
-					list.add(pluginPortion);
-					policy = tempConfig.createSitePolicy(ISitePolicy.USER_INCLUDE,(String[])list.toArray(new String[0]));
-				}	
-				site.setSitePolicy(policy);
-			}				
-		}
-		
-		// merge resulting site(s) into the specified configuration		
-		ISiteEntry[] tempSites = tempConfig.getConfiguredSites();
-		for (int i=0; i<tempSites.length; i++) {
-			configureSite(tempSites[i], true /*replace*/);
-		}
-	}
-	
-	private void validateSites() {
-								
-		// check to see if all sites are valid. Remove any sites that do not exist.
-		SiteEntry[] list = (SiteEntry[]) sites.values().toArray(new SiteEntry[0]);
-		for (int i = 0; i < list.length; i++) {
-			URL siteURL = list[i].getResolvedURL();
-			if (!supportsDetection(siteURL))
-				continue;	
-						
-			File siteRoot = new File(siteURL.getFile().replace('/', File.separatorChar));
-			if (!siteRoot.exists()) {
-				unconfigureSite(list[i]);
-				if (DEBUG)
-					debug("Site " + siteURL + " does not exist ... removing from configuration"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-	}
-	
-	private void copyInitializedState(URL source, String target, String dir) {		
-		try {
-			if (!source.getProtocol().equals("file")) //$NON-NLS-1$
-				return; // need to be able to do "dir"
-			
-			copy(new File(source.getFile()), new File(target), dir);
-				
-		} catch(IOException e) {
-			// this is an optimistic copy. If we fail, the state will be reconciled
-			// when the update manager is triggered.
-		}	
-	}
-	
-	private void copy(File srcDir, File tgtDir, String extraPath) throws IOException {
-		File src = new File(srcDir, extraPath);
-		File tgt = new File(tgtDir, extraPath);
-		
-		if (src.isDirectory()) {
-			// copy content of directories
-			tgt.mkdir();
-			String[] list = src.list();
-			if (list==null)
-				return;
-			for (int i=0; i<list.length; i++) {
-				copy(srcDir, tgtDir, extraPath + File.separator + list[i]);
-			}
-		} else {
-			// copy individual files
-			FileInputStream is = null;
-			FileOutputStream os = null;
-			try {
-				is = new FileInputStream(src);
-				os = new FileOutputStream(tgt);
-				byte[] buff = new byte[1024];
-				int count = is.read(buff);
-				while (count != -1) {
-					os.write(buff, 0, count);
-					count = is.read(buff);
-				}
-			} catch(IOException e) {
-				// continue ... update reconciler will have to reconstruct state
-			} finally {
-				if (is != null) try { is.close(); } catch(IOException e) {
-					// ignore ...
-				}
-				if (os != null) try { os.close(); } catch(IOException e) {
-					// ignore ...
-				}
-			}			
-		}		
-	}
-	
-	private void load(URL url) throws IOException {		
-		
-		if (url == null) 
-			throw new IOException(Policy.bind("cfig.unableToLoad.noURL")); //$NON-NLS-1$
-		
-		// try to load saved configuration file (watch for failed prior save())
-		Properties props = null;
-		IOException originalException = null;
-		try {
-			props = loadProperties(url, null); // try to load config file
-		} catch(IOException e1) {
-			originalException = e1;
-			try {
-				props = loadProperties(url, CONFIG_FILE_TEMP_SUFFIX); // check for failures on save
-			} catch(IOException e2) {
-				try {
-					props = loadProperties(url, CONFIG_FILE_BAK_SUFFIX); // check for failures on save
-				} catch(IOException e3) {
-					throw originalException; // we tried, but no config here ...
-				}
-			}
-		}
-		
-		// check version
-		String v = props.getProperty(CFG_VERSION);
-		if (!VERSION.equals(v)) {			
-			throw new IOException(Policy.bind("cfig.badVersion",v)); //$NON-NLS-1$
-		}
-				
-		// load simple properties
-		defaultFeature = loadAttribute(props, CFG_FEATURE_ENTRY_DEFAULT, null);
-		
-		String flag = loadAttribute(props, CFG_TRANSIENT, null);
-		if (flag != null) {
-			if (flag.equals("true")) //$NON-NLS-1$
-				transientConfig = true;
-			else
-				transientConfig = false;
-		}
-		
-		String stamp = loadAttribute(props, CFG_STAMP, null);
-		if (stamp != null) {
-			try {
-				lastChangeStamp = Long.parseLong(stamp);
-			} catch(NumberFormatException e) {
-				// ignore bad attribute ...
-			}
-		}
-		
-		stamp = loadAttribute(props, CFG_FEATURE_STAMP, null);
-		if (stamp != null) {
-			try {
-				lastFeaturesChangeStamp = Long.parseLong(stamp);
-			} catch(NumberFormatException e) {
-				// ignore bad attribute ...
-			}
-		}
-		
-		stamp = loadAttribute(props, CFG_PLUGIN_STAMP, null);
-		if (stamp != null) {
-			try {
-				lastPluginsChangeStamp = Long.parseLong(stamp);
-			} catch(NumberFormatException e) {
-				// ignore bad attribute ...
-			}
-		}
-		
-		// load bootstrap entries
-		String[] ids = getBootstrapPluginIdentifiers();
-		for (int i=0; i<ids.length; i++) {
-			bootPlugins.put(ids[i], loadAttribute(props, CFG_BOOT_PLUGIN + "." + ids[i], null)); //$NON-NLS-1$
-		}		
-		
-		// load feature entries
-		IFeatureEntry fe = loadFeatureEntry(props, CFG_FEATURE_ENTRY+".0", null); //$NON-NLS-1$
-		for (int i=1; fe != null; i++) {
-			configureFeatureEntry(fe);
-			fe = loadFeatureEntry(props, CFG_FEATURE_ENTRY+"."+i, null); //$NON-NLS-1$
-		}
-		
-		// load site properties
-		SiteEntry root = (SiteEntry)getRootSite();
-		String rootUrlString = root.getURL().toExternalForm(); 
-		SiteEntry se = (SiteEntry) loadSite(props, CFG_SITE+".0", null); //$NON-NLS-1$
-		for (int i=1; se != null; i++) {		
-					
-			// check if we are forcing "first use" processing with an existing
-			// platform.cfg. In this case ignore site entry that represents
-			// the platform install, and use a root site entry in its place.
-			// This ensures we do not get messed up by an exclusion list that
-			// is read from the prior state.
-			if (cmdFirstUse && rootUrlString.equals(se.getURL().toExternalForm()))
-				se = root;
-					
-			if (!se.isExternallyLinkedSite())
-				configureSite(se);
-			else
-				// remember external link site state, but do not configure at this point
-				externalLinkSites.put(se.getURL(),se); 
-			se = (SiteEntry) loadSite(props, CFG_SITE+"."+i, null); //$NON-NLS-1$
-		}
-	}
-	
-	private Properties loadProperties(URL url, String suffix) throws IOException {
-		
-		// figure out what we will be loading
-		if (suffix != null && !suffix.equals("")) //$NON-NLS-1$
-			url = new URL(url.getProtocol(),url.getHost(),url.getPort(),url.getFile()+suffix);
-			
-		// try to load saved configuration file
-		Properties props = new Properties();
-		InputStream is = null;
-		try {
-			is = url.openStream();
-			props.load(is);
-			// check to see if we have complete config file
-			if (!EOF.equals(props.getProperty(EOF))) {
-				throw new IOException(Policy.bind("cfig.unableToLoad.incomplete",url.toString())); //$NON-NLS-1$
-			}
-		} finally {
-			if (is!=null) {
-				try {
-					is.close();
-				} catch(IOException e) {
-					// ignore ...
-				}
-			}
-		}
-		return props;
-	}
-	
-	private ISiteEntry loadSite(Properties props, String name, ISiteEntry dflt) {
-
-		String urlString = loadAttribute(props, name+"."+CFG_URL, null); //$NON-NLS-1$
-		if (urlString == null)
-			return dflt;
-
-		URL url = null;
-		try {
-			url = new URL(urlString);
-		} catch(MalformedURLException e) {
-			return dflt;
-		}
-			
-		int policyType;
-		String[] policyList;
-		String typeString = loadAttribute(props, name+"."+CFG_POLICY, null); //$NON-NLS-1$
-		if (typeString == null) {
-			policyType = DEFAULT_POLICY_TYPE;
-			policyList = DEFAULT_POLICY_LIST;
-		} else {
-			int i;
-			for (i=0; i<CFG_POLICY_TYPE.length; i++) {
-				if (typeString.equals(CFG_POLICY_TYPE[i])) {
-					break;
-				}
-			}
-			if (i>=CFG_POLICY_TYPE.length) {
-				policyType = DEFAULT_POLICY_TYPE;
-				policyList = DEFAULT_POLICY_LIST;
-			} else {
-				policyType = i;
-				policyList = loadListAttribute(props, name+"."+CFG_LIST, new String[0]); //$NON-NLS-1$
-			}
-		}
-
-		ISitePolicy sp = createSitePolicy(policyType, policyList);
-		SiteEntry site = (SiteEntry) createSiteEntry(url,sp);
-		
-		String stamp = loadAttribute(props, name+"."+CFG_STAMP, null); //$NON-NLS-1$
-		if (stamp != null) {
-			try {
-				site.lastChangeStamp = Long.parseLong(stamp);
-			} catch(NumberFormatException e) {
-				// ignore bad attribute ...
-			}
-		}
-		
-		stamp = loadAttribute(props, name+"."+CFG_FEATURE_STAMP, null); //$NON-NLS-1$
-		if (stamp != null) {
-			try {
-				site.lastFeaturesChangeStamp = Long.parseLong(stamp);
-			} catch(NumberFormatException e) {
-				// ignore bad attribute ...
-			}
-		}
-		
-		stamp = loadAttribute(props, name+"."+CFG_PLUGIN_STAMP, null); //$NON-NLS-1$
-		if (stamp != null) {
-			try {
-				site.lastPluginsChangeStamp = Long.parseLong(stamp);
-			} catch(NumberFormatException e) {
-				// ignore bad attribute ...
-			}
-		}
-		
-		String flag = loadAttribute(props, name+"."+CFG_UPDATEABLE, null); //$NON-NLS-1$
-		if (flag != null) {
-			if (flag.equals("true")) //$NON-NLS-1$
-				site.updateable = true;
-			else
-				site.updateable = false;
-		}
-		
-		String linkname = loadAttribute(props, name+"."+CFG_LINK_FILE, null); //$NON-NLS-1$
-		if (linkname != null && !linkname.equals("")) { //$NON-NLS-1$
-			site.linkFileName = linkname.replace('/',File.separatorChar);
-		}
-		
-		return site;
-	}
-	
-	private IFeatureEntry loadFeatureEntry(Properties props, String name, IFeatureEntry dflt) {
-		String id = loadAttribute(props, name+"."+CFG_FEATURE_ENTRY_ID, null); //$NON-NLS-1$
-		if (id == null)
-			return dflt;
-		String version = loadAttribute(props, name+"."+CFG_FEATURE_ENTRY_VERSION, null); //$NON-NLS-1$
-		String application = loadAttribute(props, name+"."+CFG_FEATURE_ENTRY_APPLICATION, null); //$NON-NLS-1$
-		ArrayList rootList = new ArrayList();
-		String rootString = loadAttribute(props, name+"."+CFG_FEATURE_ENTRY_ROOT+".0", null); //$NON-NLS-1$ //$NON-NLS-2$
-		for (int i=1; rootString != null; i++) {
-			try {
-				URL rootEntry = new URL(rootString);
-				rootList.add(rootEntry);
-			} catch(MalformedURLException e) {
-				// skip bad entries ...
-			}
-			rootString = loadAttribute(props, name+"."+CFG_FEATURE_ENTRY_ROOT+"."+i, null); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		URL[] roots = (URL[])rootList.toArray(new URL[0]);
-		return createFeatureEntry(id, version, application, roots);
-	}
-	
-	private String[] loadListAttribute(Properties props, String name, String[] dflt) {
-		ArrayList list = new ArrayList();
-		String value = loadAttribute(props, name+".0",null); //$NON-NLS-1$
-		if (value == null)
-			return dflt;
-			
-		for (int i=1; value != null; i++) {
-			loadListAttributeSegment(list, value);
-			value = loadAttribute(props, name+"."+i, null); //$NON-NLS-1$
-		}
-		return (String[])list.toArray(new String[0]);
-	}
-	
-	private void loadListAttributeSegment(ArrayList list,String value) {
-		
-		if (value==null) return;
-	
-		StringTokenizer tokens = new StringTokenizer(value, ","); //$NON-NLS-1$
-		String token;
-		while (tokens.hasMoreTokens()) {
-			token = tokens.nextToken().trim();
-			if (!token.equals(""))  //$NON-NLS-1$
-				list.add(token);
-		}
-		return;
-	}
-		
-	private String loadAttribute(Properties props, String name, String dflt) {
-		String prop = props.getProperty(name);
-		if (prop == null)
-			return dflt;
-		else
-			return prop.trim();
-	}
-	
-	private void loadInitializationAttributes() {
-		
-		// look for the product initialization file relative to the install location
-		URL url = BootLoader.getInstallURL();
-		
-		if (defaultFeature != null)
-			return; // already set
-								
-		// load any initialization attributes. These become the initial default settings
-		// for critical attributes (eg. default primary feature) supplied by the packaging team.
-		// Once these are reflected in the configuration they cannot be changed via the
-		// initialization mechanism
-		Properties initProps = new Properties();
-		InputStream is = null;
-		try {
-			URL initURL = new URL(url, CONFIG_FILE_INIT);
-			is = initURL.openStream();
-			initProps.load(is);
-			if (DEBUG) 
-				debug("Initializing from "+initURL.toExternalForm()); //$NON-NLS-1$
-		} catch(IOException e) {
-			return; // could not load "first-time" settings
-		} finally {
-			if (is!=null) {
-				try {
-					is.close();
-				} catch(IOException e) {
-					// ignore ...
-				}
-			}
-		}
-				
-		// use "first-time" settings if not already set
-		defaultFeature = loadAttribute(initProps, INIT_DEFAULT_FEATURE_ID, null);
-		if (defaultFeature != null) {
-			String application = loadAttribute(initProps, INIT_DEFAULT_FEATURE_APPLICATION, null);
-			IFeatureEntry fe = createFeatureEntry(defaultFeature, null, application, null);
-			configureFeatureEntry(fe);
-			if (DEBUG) {
-				debug("    Default primary feature: "+defaultFeature); //$NON-NLS-1$
-				if (application != null)
-					debug("    Default application    : "+application); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	private void locateDefaultPlugins() {
-		
-		// determine the runtime for the currently executing boot loader
-		HashMap runtimeImport = getRuntimeImport();
-		
-		// locate runtime plugin matching the import from boot
-		URL runtimePluginPath = getPluginPath(runtimeImport);
-		if (runtimePluginPath == null) 
-			throw new RuntimeException(Policy.bind("error.runtime")); //$NON-NLS-1$
-		
-		// get boot descriptor for runtime plugin
-		runtimeDescriptor = createPluginBootDescriptor(runtimePluginPath);
-		
-		// determine the xml plugin for the selected runtime
-		HashMap xmlImport = getImport(runtimePluginPath, XML_PLUGIN_ID);
-		
-		// locate xml plugin matching the import from runtime plugin
-		URL xmlPluginPath = getPluginPath(xmlImport);
-		if (xmlPluginPath == null) 
-			throw new RuntimeException(Policy.bind("error.xerces")); //$NON-NLS-1$
-				
-		// get boot descriptor for xml plugin
-		xmlDescriptor = createPluginBootDescriptor(xmlPluginPath);
-	}
-	
-	private HashMap getRuntimeImport() {		
-		// determine the load directory location of the boot loader
-		URL url = InternalBootLoader.class.getProtectionDomain().getCodeSource().getLocation();
-		String path = InternalBootLoader.decode(url.getFile());
-		File base = new File(path);
-		if (!base.isDirectory())
-			base = base.getParentFile(); // was loaded from jar
-			
-		// find the plugin.xml (need to search because in dev mode
-		// we can have some extra directory entries)
-		File xml = null;
-		while(base != null) {
-			xml = new File(base, BOOT_XML);
-			if (xml.exists())
-				break;
-			base = base.getParentFile();
-		}		
-		if (xml == null)		
-			throw new RuntimeException(Policy.bind("error.boot")); //$NON-NLS-1$
-			
-		try {
-			return getImport(xml.toURL(), RUNTIME_PLUGIN_ID);
-		} catch(MalformedURLException e) {
-			return null;
-		}
-	}
-				
-				
-	private HashMap getImport(URL entry, String id) {
-		if (id == null)
-			return null;
-		final String fId = id;
-			
-		// parse out the import element attributes		
-		Selector importSel = new Selector() {
-			// parse out import attributes
-			public boolean select(String element){
-				if (element.startsWith("import")) //$NON-NLS-1$
-					return true;
-				else
-					return false;
-			}
-			public boolean select(String element, HashMap attributes) {
-				if (attributes == null)
-					return false;
-				String plugin = (String) attributes.get("plugin"); //$NON-NLS-1$
-				return fId.equals(plugin);
-			}
-		};			
-		Parser p = new Parser(entry);
-		return p.getElement(importSel);
-	}
-	
-	private BootDescriptor createPluginBootDescriptor(URL entry) {		
-		if (entry == null)
-			return null;
-			
-		// selector for plugin element	
-		Selector pluginSel = new Selector() {
-			public boolean select(String element){
-				if (element.startsWith("plugin")) //$NON-NLS-1$
-					return true;
-				else
-					return false;
-			}
-			public boolean select(String element, HashMap attributes) {
-				return true; 
-			}
-		};			
-			
-		// selector for library elements
-		final ArrayList libs = new ArrayList();		
-		Selector librarySel = new Selector() {
-			public boolean select(String element){
-				if (element.startsWith("library")) //$NON-NLS-1$
-					return true;
-				else
-					return false;
-			}
-			public boolean select(String element, HashMap attributes) {
-				if (attributes == null)
-					return false;
-				String lib = (String) attributes.get("name"); //$NON-NLS-1$
-				if (lib != null)
-					libs.add(lib);
-				return false; // accumulate all library elements
-			}
-		};
-		
-		// parse out descriptor information
-		Parser p = new Parser(entry);
-		String id = null;
-		String version = null;		
-		HashMap attributes = p.getElement(pluginSel);
-		if (attributes != null) {
-			id = (String)attributes.get("id"); //$NON-NLS-1$
-			version = (String)attributes.get("version"); //$NON-NLS-1$
-		}
-		if (id == null)
-			id = ""; //$NON-NLS-1$
-		if (version == null)
-			version = "0.0.0"; //$NON-NLS-1$
-		
-		p.getElement(librarySel);
-		String[] libraries = (String[])libs.toArray(new String[0]);
-				
-		String dir = entry.getFile();
-		int ix = dir.lastIndexOf("/"); //$NON-NLS-1$
-		dir = dir.substring(0,ix+1);
-		URL dirURL = null;
-		try {
-			dirURL = new URL(entry.getProtocol(), entry.getHost(), entry.getPort(), dir);
-		} catch(MalformedURLException e) {
-			// continue ...
-		}
-		
-		// return boot descriptor for the plugin
-		return new BootDescriptor(id, version, libraries, dirURL);
-	}	
-	
-	private URL getPluginPath(HashMap importElement) {
-		// return the plugin path element for the specified import element
-		
-		if (importElement == null)
-			return null;
-		
-		// determine which plugin we are looking for
-		VersionedIdentifier id;
-		String pid = (String) importElement.get("plugin"); //$NON-NLS-1$
-		String version = (String) importElement.get("version"); //$NON-NLS-1$
-		String match = (String) importElement.get("match"); //$NON-NLS-1$
-		if (pid == null)
-			return null; // bad <import> element
-		if (version == null)
-			id = new VersionedIdentifier(pid);
-		else {
-			id = new VersionedIdentifier(pid+"_"+version); //$NON-NLS-1$
-			if (match == null)
-				match = "compatible"; //$NON-NLS-1$
-		}
-		
-		// search plugins on all configured sites
-		ISiteEntry[] sites = getConfiguredSites();
-		if (sites == null || sites.length == 0)
-			return null;
-			
-		VersionedIdentifier savedVid = id; // initialize with baseline we are looking for
-		String savedEntry = null;
-		URL savedURL = null;
-		for (int j=0; j<sites.length; j++) {							
-			String[] plugins = sites[j].getPlugins();
-			for (int i=0; plugins!=null && i<plugins.length; i++) {
-				// look for best match. 
-				// The entries are in the form <path>/<pluginDir>/plugin.xml
-				// look for -------------------------^
-				int ix = findEntrySeparator(plugins[i],2); // second from end
-				if (ix == -1)
-					continue; // bad entry ... skip
-				String pluginDir = plugins[i].substring(ix+1);
-				ix = pluginDir.indexOf("/"); //$NON-NLS-1$
-				if (ix != -1)
-					pluginDir = pluginDir.substring(0,ix);
-				if (pluginDir.equals("")) //$NON-NLS-1$
-					continue; // bad entry ... skip
-												
-				// compare the candidate plugin using the matching rule												
-				VersionedIdentifier vid = new VersionedIdentifier(pluginDir);				
-				if (vid.equalIdentifiers(id)) {
-						
-					// check if we have suffixed directory. If not (eg. self-hosting)
-					// we need to actually parse the plugin.xml to get its version
-					if (pluginDir.indexOf("_") == -1) { //$NON-NLS-1$
-						URL xmlURL = null;
-						try {
-							xmlURL = new URL(((SiteEntry)sites[j]).getResolvedURL(), plugins[i]);
-						} catch (MalformedURLException e) {
-							continue; // bad URL ... skip
-						}
-					
-						// parse out the plugin element attributes
-						final String fpid = pid;		
-						Selector versionSel = new Selector() {
-							// parse out plugin attributes
-							public boolean select(String element){
-								if (element.startsWith("plugin")) //$NON-NLS-1$
-								return true;
-							else
-								return false;
-							}
-							public boolean select(String element, HashMap attributes) {
-								if (attributes == null)
-									return false;
-								String plugin = (String) attributes.get("id"); //$NON-NLS-1$
-								return fpid.equals(plugin);
-							}
-						};			
-						Parser p = new Parser(xmlURL);
-						HashMap attributes = p.getElement(versionSel);
-						if (attributes == null)
-							continue; // bad xml ... skip
-						String pluginVersion;
-						if ((pluginVersion = (String)attributes.get("version")) == null) //$NON-NLS-1$
-							continue; // bad xml ... skip
-						pluginDir += "_" + pluginVersion; //$NON-NLS-1$
-						vid = new VersionedIdentifier(pluginDir);
-					}					
-					
-					// do the comparison
-					int result;
-					if ((result = vid.compareVersion(savedVid)) >= 0) {
-						if ("greaterOrEqual".equals(match)) { //$NON-NLS-1$
-							 if (result > VersionedIdentifier.GREATER_THAN) 
-								continue;
-						} else if ("compatible".equals(match)) { //$NON-NLS-1$
-							 if (result > VersionedIdentifier.COMPATIBLE) 
-								continue;
-						} else if ("equivalent".equals(match)) { //$NON-NLS-1$
-							 if (result > VersionedIdentifier.EQUIVALENT) 
-								continue;
-						} else if ("perfect".equals(match)) { //$NON-NLS-1$
-							 if (result > VersionedIdentifier.EQUAL) 
-							continue;
-						} else if (result > VersionedIdentifier.GREATER_THAN)
-							continue; // use the latest
-						savedVid = vid;
-						savedEntry = plugins[i];
-						savedURL = ((SiteEntry)sites[j]).getResolvedURL();
-					}
-				}			
-			}				
-		}			
-
-		if (savedEntry == null)
-			return null;
-							
-		try {
-			return new URL(savedURL,savedEntry);
-		} catch(MalformedURLException e) {
-			return null;
-		}
-	}
-	
-	private void write(PrintWriter w) {
-		// write header
-		w.println("# "+(new Date()).toString()); //$NON-NLS-1$
-		writeAttribute(w, CFG_VERSION, VERSION);
-		if (transientConfig)
-			writeAttribute(w,CFG_TRANSIENT,"true"); //$NON-NLS-1$
-		w.println(""); //$NON-NLS-1$
-		
-		// write global attributes
-		writeAttribute(w,CFG_STAMP,Long.toString(getChangeStamp()));
-		writeAttribute(w,CFG_FEATURE_STAMP,Long.toString(getFeaturesChangeStamp()));
-		writeAttribute(w,CFG_PLUGIN_STAMP,Long.toString(getPluginsChangeStamp()));
-		
-		// write out bootstrap entries
-		String[] ids = getBootstrapPluginIdentifiers();
-		for (int i=0; i<ids.length; i++) {
-			String location = (String) bootPlugins.get(ids[i]);
-			if (location != null)
-				writeAttribute(w, CFG_BOOT_PLUGIN + "." + ids[i], location); //$NON-NLS-1$
-		}
-		
-		// write out feature entries
-		w.println(""); //$NON-NLS-1$
-		writeAttribute(w,CFG_FEATURE_ENTRY_DEFAULT,defaultFeature);
-		IFeatureEntry[] feats = getConfiguredFeatureEntries();
-		for (int i=0; i<feats.length; i++) {
-			writeFeatureEntry(w, CFG_FEATURE_ENTRY + "." + Integer.toString(i), feats[i]); //$NON-NLS-1$
-		}
-		
-		// write out site entries
-		SiteEntry[] list = (SiteEntry[]) sites.values().toArray(new SiteEntry[0]);
-		for (int i = 0; i < list.length; i++) {
-			writeSite(w, CFG_SITE + "." + Integer.toString(i), list[i]); //$NON-NLS-1$
-		}
-		
-		// write end-of-file marker
-		writeAttribute(w, EOF, EOF);
-	}
-
-	private void writeSite(PrintWriter w, String id, SiteEntry entry) {
-		
-		// write site separator
-		w.println(""); //$NON-NLS-1$
-		
-		// write out site settings
-		writeAttribute(w, id + "." + CFG_URL, entry.getURL().toString()); //$NON-NLS-1$
-		writeAttribute(w, id + "." + CFG_STAMP,Long.toString(entry.getChangeStamp())); //$NON-NLS-1$
-		writeAttribute(w, id + "." + CFG_FEATURE_STAMP,Long.toString(entry.getFeaturesChangeStamp())); //$NON-NLS-1$
-		writeAttribute(w, id + "." + CFG_PLUGIN_STAMP,Long.toString(entry.getPluginsChangeStamp())); //$NON-NLS-1$
-		writeAttribute(w, id + "." + CFG_UPDATEABLE, entry.updateable?"true":"false"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		if (entry.linkFileName != null && !entry.linkFileName.trim().equals("")) //$NON-NLS-1$
-			writeAttribute(w, id + "." + CFG_LINK_FILE, entry.linkFileName.trim().replace(File.separatorChar,'/')); //$NON-NLS-1$
-		
-		// write out site policy
-		int type = entry.getSitePolicy().getType();
-		String typeString = CFG_POLICY_TYPE_UNKNOWN;
-		try {
-			typeString = CFG_POLICY_TYPE[type];
-		} catch (IndexOutOfBoundsException e) {			
-			// ignore bad attribute ...
-		}
-		writeAttribute(w, id + "." + CFG_POLICY, typeString); //$NON-NLS-1$
-		writeListAttribute(w, id + "." + CFG_LIST, entry.getSitePolicy().getList()); //$NON-NLS-1$
-	}
-
-	private void writeFeatureEntry(PrintWriter w, String id, IFeatureEntry entry) {
-		
-		// write feature entry separator
-		w.println(""); //$NON-NLS-1$
-				
-		// write out feature entry settings
-		writeAttribute(w, id + "." + CFG_FEATURE_ENTRY_ID, entry.getFeatureIdentifier()); //$NON-NLS-1$
-		writeAttribute(w, id + "." + CFG_FEATURE_ENTRY_VERSION, entry.getFeatureVersion()); //$NON-NLS-1$
-		writeAttribute(w, id + "." + CFG_FEATURE_ENTRY_APPLICATION, entry.getFeatureApplication()); //$NON-NLS-1$
-		URL[] roots = entry.getFeatureRootURLs();
-		for (int i=0; i<roots.length; i++) {
-			// write our as individual attributes (is easier for Main.java to read)	
-			writeAttribute(w, id + "." + CFG_FEATURE_ENTRY_ROOT + "." + i, roots[i].toExternalForm()); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	private void writeListAttribute(PrintWriter w, String id, String[] list) {
-		if (list == null || list.length == 0)
-			return;
-			
-		String value = ""; //$NON-NLS-1$
-		int listLen = 0;
-		int listIndex = 0;
-		for (int i = 0; i < list.length; i++) {
-			if (listLen != 0)
-				value += ","; //$NON-NLS-1$
-			else
-				value = ""; //$NON-NLS-1$
-			value += list[i];
-
-			if (++listLen >= CFG_LIST_LENGTH) {
-				writeAttribute(w, id + "." + Integer.toString(listIndex++), value); //$NON-NLS-1$
-				listLen = 0;
-			}
-		}
-		if (listLen != 0)
-			writeAttribute(w, id + "." + Integer.toString(listIndex), value); //$NON-NLS-1$
-	}
-
-	private void writeAttribute(PrintWriter w, String id, String value) {
-		if (value==null || value.trim().equals("")) //$NON-NLS-1$
-			return;
-		w.println(id + "=" + escapedValue(value)); //$NON-NLS-1$
-	}
-	
-	private String escapedValue(String value) {
-		// if required, escape property values as \\uXXXX		
-		StringBuffer buf = new StringBuffer(value.length()*2); // assume expansion by less than factor of 2
-		for (int i=0; i<value.length(); i++) {
-			char character = value.charAt(i);
-			if (character == '\\' 
-			 || character == '\t'
-			 || character == '\r'
-			 || character == '\n'
-			 || character == '\f') {
-			 	// handle characters requiring leading \
-				buf.append('\\');
-				buf.append(character);
-			} else if ((character < 0x0020) || (character > 0x007e)) {
-				// handle characters outside base range (encoded)
-				buf.append('\\');
-				buf.append('u');
-				buf.append(HEX[(character >> 12) & 0xF]);	// first nibble
-				buf.append(HEX[(character >> 8) & 0xF]);	// second nibble
-				buf.append(HEX[(character >> 4) & 0xF]);	// third nibble
-				buf.append(HEX[character & 0xF]);			// fourth nibble
-			} else {
-				// handle base characters
-				buf.append(character);
-			}
-		}
-		return buf.toString();
-	}
-	
-	private static String[] checkForFeatureChanges(String[] args, PlatformConfiguration cfg) {
-		String original = cfg.getApplicationIdentifierInternal();
-		String actual = cfg.getApplicationIdentifier();
-		
-		if (original.equals(actual))
-			// base startup of specified application
-			return args;
-		else {
-			// Will run reconciler.
-			// Re-insert -application argument with original app and optionally
-			// force "first use" processing
-			int newArgCnt = cmdFirstUse ? 3 : 2;
-			String[] newArgs = new String[args.length+newArgCnt];
-			newArgs[0] = CMD_APPLICATION;
-			newArgs[1] = original;
-			if (cmdFirstUse)
-				newArgs[2] = CMD_FIRSTUSE;
-			System.arraycopy(args,0,newArgs,newArgCnt,args.length);
-			if (DEBUG)
-				debug("triggering reconciliation ..."); //$NON-NLS-1$
-			return newArgs;
-		}
-	}
-	
-	private static String[] checkForNewUpdates(IPlatformConfiguration cfg, String[] args) {
-		try {
-			URL markerURL = new URL(cfg.getConfigurationLocation(), CHANGES_MARKER);
-			File marker = new File(markerURL.getFile());
-			if (!marker.exists())
-				return args;
-				
-			// indicate -newUpdates	
-			marker.delete();
-			String[] newArgs = new String[args.length+1];
-			newArgs[0] = CMD_NEW_UPDATES;
-			System.arraycopy(args,0,newArgs,1,args.length);
-			return newArgs;
-		} catch(MalformedURLException e) {
-			return args;
-		}
-	}
-	
-	private static String[] processCommandLine(String[] args) throws Exception {
-		int[] configArgs = new int[100];
-		configArgs[0] = -1; // need to initialize the first element to something that could not be an index.
-		int configArgIndex = 0;
-		for (int i = 0; i < args.length; i++) {
-			boolean found = false;
-		
-			// check for args without parameters (i.e., a flag arg)
-					
-			// look for forced "first use" processing (triggered by stale
-			// bootstrap information)
-			if (args[i].equalsIgnoreCase(CMD_FIRSTUSE)) {
-				cmdFirstUse = true;
-				found = true;
-			}
-				
-			// look for the update flag
-			if (args[i].equalsIgnoreCase(CMD_UPDATE)) {
-				cmdUpdate = true;
-				found = true;
-			}
-			
-			// look for the no-update flag
-			if (args[i].equalsIgnoreCase(CMD_NO_UPDATE)) {
-				cmdNoUpdate = true;
-				found = true;
-			}
-			
-			// look for the initialization flag
-			if (args[i].equalsIgnoreCase(CMD_INITIALIZE)) {
-				cmdInitialize = true;
-				continue; // do not remove from command line
-			}
-
-			// look for the development mode flag ... triggers no-update
-			if (args[i].equalsIgnoreCase(CMD_DEV)) {
-				cmdDev = true;
-				continue; // do not remove from command line
-			}
-				
-			if (found) {
-				configArgs[configArgIndex++] = i;
-				continue;
-			}
-		
-			// check for args with parameters. If we are at the last argument or if the next one
-			// has a '-' as the first character, then we can't have an arg with a parm so continue.
-		
-			if (i == args.length - 1 || args[i + 1].startsWith("-")) { //$NON-NLS-1$
-				continue;
-			}
-		
-			String arg = args[++i];
-
-			// look for the platform configuration to use.
-			if (args[i - 1].equalsIgnoreCase(CMD_CONFIGURATION)) {
-				found = true;
-				cmdConfiguration = arg;
-			}
-
-			// look for the feature to use for customization.
-			if (args[i - 1].equalsIgnoreCase(CMD_FEATURE)) {
-				found = true;
-				cmdFeature = arg;
-			}
-
-			// look for the application to run.  Only use the value from the
-			// command line if the application identifier was not explicitly
-			// passed on BootLoader.run(...) invocation.
-			if (args[i - 1].equalsIgnoreCase(CMD_APPLICATION)) {
-				found = true;
-				if (cmdApplication == null)
-					cmdApplication = arg;
-			}
-
-			// R1.0 compatibility
-			// look for the plugins location to use.  Only use the value from the
-			// command line if the plugins location was not explicitly passed on
-			// BootLoader.run(...) or BootLoader.startup(...) invocation.
-			if (args[i - 1].equalsIgnoreCase(CMD_PLUGINS)) {
-				found = true;
-				// if the arg can be made into a URL use it. Otherwise assume that
-				// it is a file path so make a file URL.
-				try {
-					if (cmdPlugins == null)
-						cmdPlugins = new URL(arg);
-				} catch (MalformedURLException e) {
-					try {
-						cmdPlugins = new URL("file:" + arg.replace(File.separatorChar, '/')); //$NON-NLS-1$
-					} catch (MalformedURLException e2) {
-						throw e; // rethrow original exception
-					}
-				}
-			}
-
-			// done checking for args.  Remember where an arg was found 
-			if (found) {
-				configArgs[configArgIndex++] = i - 1;
-				configArgs[configArgIndex++] = i;
-			}
-		}
-
-		// remove all the arguments consumed by this argument parsing
-		if (configArgIndex == 0)
-			return args;
-		String[] passThruArgs = new String[args.length - configArgIndex];
-		configArgIndex = 0;
-		int j = 0;
-		for (int i = 0; i < args.length; i++) {
-			if (i == configArgs[configArgIndex])
-				configArgIndex++;
-			else
-				passThruArgs[j++] = args[i];
-		}
-		return passThruArgs;
-	}
-		
-			
-	private static int findEntrySeparator(String pathEntry, int cnt) {
-		for (int i=pathEntry.length()-1; i>=0; i--) {
-			if (pathEntry.charAt(i) == '/') {
-				if (--cnt == 0)
-					return i;
-			}
-		}
-		return -1;
-	}
-	
-	private static String[] stringListToArray(String prop, String separator) {	
-		if (prop == null || prop.trim().equals("")) //$NON-NLS-1$
-			return new String[0];
-		ArrayList list = new ArrayList();
-		StringTokenizer tokens = new StringTokenizer(prop, separator);
-		while (tokens.hasMoreTokens()) {
-			String token = tokens.nextToken().trim();
-			if (!token.equals("")) //$NON-NLS-1$
-				list.add(token);
-		}
-		return list.isEmpty() ? new String[0] : (String[]) list.toArray(new String[0]);
-	}
-	
-	private static boolean supportsDetection(URL url) {
-		String protocol = url.getProtocol();
-		if (protocol.equals("file")) //$NON-NLS-1$
-			return true;
-		else if (protocol.equals(PlatformURLHandler.PROTOCOL)) {
-			URL resolved = null;
-			try {
-				resolved = ((PlatformURLConnection)url.openConnection()).getResolvedURL();
-			} catch(IOException e) {
-				return false; // we tried but failed to resolve the platform URL
-			}
-			return resolved.getProtocol().equals("file"); //$NON-NLS-1$
-		} else
-			return false;
-	}
-	
-	private static void verifyPath(URL url) {
-		String protocol = url.getProtocol();
-		String path = null;
-		if (protocol.equals("file")) //$NON-NLS-1$
-			path = url.getFile();
-		else if (protocol.equals(PlatformURLHandler.PROTOCOL)) {
-			URL resolved = null;
-			try {
-				resolved = ((PlatformURLConnection)url.openConnection()).getResolvedURL();
-				if (resolved.getProtocol().equals("file")) //$NON-NLS-1$
-					path = resolved.getFile();
-			} catch(IOException e) {
-				// continue ...
-			}
-		} 
-		
-		if (path != null) {
-			File dir = new File(path).getParentFile();
-			if (dir != null)
-				dir.mkdirs();
-		}
-	}
-
-	private static void debug(String s) {
-		System.out.println("PlatformConfig: " + s); //$NON-NLS-1$
-	}
-}
\ No newline at end of file

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLBaseConnection.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLBaseConnection.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLBaseConnection.java
deleted file mode 100644
index 0031966..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLBaseConnection.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-/**
- * Platform URL support
- * platform:/base/	maps to platform installation location
- */
-
-import java.net.*;
-import java.io.*;
-import java.util.*;
- 
-public class PlatformURLBaseConnection extends PlatformURLConnection {
-
-	// platform/ protocol
-	public static final String PLATFORM = "base"; //$NON-NLS-1$
-	public static final String PLATFORM_URL_STRING = PlatformURLHandler.PROTOCOL+PlatformURLHandler.PROTOCOL_SEPARATOR+"/"+PLATFORM+"/"; //$NON-NLS-1$ //$NON-NLS-2$
-	
-	private static URL installURL;
-public PlatformURLBaseConnection(URL url) {
-	super(url);
-}
-protected boolean allowCaching() {
-	return true;
-}
-protected URL resolve() throws IOException {
-	String spec = url.getFile().trim();
-	if (spec.startsWith("/")) //$NON-NLS-1$
-		spec = spec.substring(1);
-	if (!spec.startsWith(PLATFORM+"/")) { //$NON-NLS-1$
-		String message = Policy.bind("url.badVariant", url.toString()); //$NON-NLS-1$
-		throw new IOException(message);
-	}
-	return spec.length()==PLATFORM.length()+1 ? installURL : new URL(installURL,spec.substring(PLATFORM.length()+1)); 
-}
-public static void startup(URL url) {
-	
-	// register connection type for platform:/base/ handling
-	if (installURL!=null) return;
-	installURL = url;
-	PlatformURLHandler.register(PLATFORM, PlatformURLBaseConnection.class);
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLConnection.java

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
deleted file mode 100644
index 5686ce9..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLConnection.java
+++ /dev/null
@@ -1,459 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-/**
- * Platform URL support
- */
-
-import java.net.*;
-import java.io.*;
-import java.util.*;
- 
-public abstract class PlatformURLConnection extends URLConnection {
-
-	// URL access
-	private boolean isInCache = false;
-	private boolean isJar = false;
-	
-//	protected URL url;				// declared in super (platform: URL)
-	private URL resolvedURL = null;	// resolved file URL (eg. http: URL)
-	private URL cachedURL = null;	// file URL in cache (file: URL)
-
-	private URLConnection connection = null; // actual connection
-
-	// local cache
-	private static Properties cacheIndex = new Properties();
-	private static String cacheLocation;
-	private static String indexName;
-	private static String filePrefix;
-
-	// constants	
-	private static final int BUF_SIZE = 32768;
-	private static final Object NOT_FOUND = new Object();	// marker
-	private static final String CACHE_PROP = ".cache.properties"; //$NON-NLS-1$
-	private static final String CACHE_LOCATION_PROP = "location"; //$NON-NLS-1$
-	private static final String CACHE_INDEX_PROP = "index"; //$NON-NLS-1$
-	private static final String CACHE_PREFIX_PROP = "prefix"; //$NON-NLS-1$
-	private static final String CACHE_INDEX = ".index.properties"; //$NON-NLS-1$
-	private static final String CACHE_DIR = PlatformURLHandler.PROTOCOL + File.separator;
-
-	// debug tracing
-	public static boolean DEBUG = false;
-	public static boolean DEBUG_CONNECT = true;
-	public static boolean DEBUG_CACHE_LOOKUP = true;
-	public static boolean DEBUG_CACHE_COPY = true;
-protected PlatformURLConnection(URL url) {
-	super(url);
-}
-protected boolean allowCaching() {
-	return false;
-}
-public void connect() throws IOException {
-	connect(false);
-}
-private synchronized void connect(boolean asLocal) throws IOException {
-	if (!connected) {
-		if (shouldCache(asLocal)) {
-			try {				
-				URL inCache = getURLInCache();
-				if (inCache!=null) connection = inCache.openConnection();
-			} catch(IOException e) {
-				// failed to cache ... will use resolved URL instead
-			}
-		}
-
-		// use resolved URL
-		if (connection==null) connection = resolvedURL.openConnection();
-		connected = true;
-		if (DEBUG && DEBUG_CONNECT)
-			debug("Connected as "+connection.getURL()); //$NON-NLS-1$
-	}
-}
-private void copyToCache() throws IOException {
-
-	if (isInCache | cachedURL==null) return;
-	String tmp;
-	int ix;
-		
-	// cache entry key
-	String key;
-	if (isJar) {
-		tmp = url.getFile();
-		ix = tmp.lastIndexOf(PlatformURLHandler.JAR_SEPARATOR);
-		if (ix!=-1) tmp = tmp.substring(0,ix);
-		key = tmp;
-	}
-	else key = url.getFile();
-		
-	// source url
-	URL src;
-	if (isJar) {
-		tmp = resolvedURL.getFile();
-		ix = tmp.lastIndexOf(PlatformURLHandler.JAR_SEPARATOR);
-		if (ix!=-1) tmp = tmp.substring(0,ix);
-		src = new URL(tmp);
-	}
-	else src = resolvedURL;
-	InputStream srcis = null;
-	
-	// cache target
-	String tgt;
-	if (isJar) {
-		tmp = cachedURL.getFile();
-		ix = tmp.indexOf(PlatformURLHandler.PROTOCOL_SEPARATOR);
-		if (ix!=-1) tmp = tmp.substring(ix+1);
-		ix = tmp.lastIndexOf(PlatformURLHandler.JAR_SEPARATOR);
-		if (ix!=-1) tmp = tmp.substring(0,ix);
-		tgt = tmp;
-	}
-	else tgt = cachedURL.getFile();	
-	File tgtFile = null;
-	FileOutputStream tgtos = null;
-	
-	boolean error = false;
-	long total = 0;
-
-	try {
-		if (DEBUG && DEBUG_CACHE_COPY) {
-			if (isJar) debug ("Caching jar as "+tgt); //$NON-NLS-1$
-			else debug("Caching as "+tgt); //$NON-NLS-1$
-		}
-			
-		srcis = src.openStream();
-		byte[] buf = new byte[BUF_SIZE];
-		int count = srcis.read(buf);
-
-		tgtFile = new File(tgt);
-		tgtos = new FileOutputStream(tgtFile);
-		
-		while(count!=-1) {
-			total += count;
-			tgtos.write(buf,0,count);
-			count = srcis.read(buf);
-		}
-
-		srcis.close();
-		srcis=null;
-		tgtos.close();
-		tgtos=null;
-
-		// add cache entry
-		cacheIndex.put(key,tgt);
-		isInCache = true;
-	}
-	catch(IOException e) {
-		error = true;
-		cacheIndex.put(key,NOT_FOUND);	// mark cache entry for this execution
-		if (DEBUG && DEBUG_CACHE_COPY)
-			debug("Failed to cache due to "+e); //$NON-NLS-1$
-		throw e;		
-	}
-	finally {		
-		if (!error && DEBUG && DEBUG_CACHE_COPY)
-			debug(total + " bytes copied"); //$NON-NLS-1$
-		if (srcis!=null) srcis.close();
-		if (tgtos!=null) tgtos.close();
-	}
-}
-protected void debug(String s) {
-	System.out.println("URL "+getURL().toString()+"^"+Integer.toHexString(Thread.currentThread().hashCode())+" "+s); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-}
-private static void debugStartup(String s) {
-	System.out.println("URL "+s); //$NON-NLS-1$
-}
-public URL[] getAuxillaryURLs () throws IOException {
-	return null;
-}
-public synchronized InputStream getInputStream() throws IOException {
-	if (!connected) connect();
-	return connection.getInputStream();
-}
-public URL getResolvedURL() {
-	return resolvedURL;
-}
-public URL getURLAsLocal() throws IOException {
-	connect(true);	// connect and force caching if necessary
-	URL u = connection.getURL();
-	String up = u.getProtocol();
-	if (!up.equals(PlatformURLHandler.FILE) && !up.equals(PlatformURLHandler.JAR)) {
-		throw new IOException(Policy.bind("url.noaccess", url.toString())); //$NON-NLS-1$
-	}
-	return u;
-}
-private URL getURLInCache() throws IOException {
-
-	if (!allowCaching()) return null;	// target should not be cached
-	
-	if (isInCache) return cachedURL;
-
-	if (cacheLocation==null | cacheIndex==null) return null;	// not caching
-	
-	// check if we are dealing with a .jar/ .zip
-	String file = ""; //$NON-NLS-1$
-	String jarEntry = null;
-	if (isJar) {
-		file = url.getFile();
-		int ix = file.lastIndexOf(PlatformURLHandler.JAR_SEPARATOR);
-		if (ix!=-1) {
-			jarEntry = file.substring(ix+PlatformURLHandler.JAR_SEPARATOR.length());
-			file = file.substring(0,ix);
-		}
-	}
-	else {
-		file = url.getFile();
-		jarEntry = null;
-	}
-	
-	// check for cached entry
-	String tmp = (String)cacheIndex.get(file);
-
-	// check for "not found" marker
-	if (tmp!=null && tmp==NOT_FOUND) throw new IOException();
-
-	// validate cache entry
-	if (tmp!=null && !(new File(tmp)).exists()) {
-		tmp = null;
-		cacheIndex.remove(url.getFile());
-	}
-
-	// found in cache
-	if (tmp!=null) {
-		if (isJar) {
-			if (DEBUG && DEBUG_CACHE_LOOKUP)
-				debug("Jar located in cache as "+tmp); //$NON-NLS-1$
-			tmp = PlatformURLHandler.FILE + PlatformURLHandler.PROTOCOL_SEPARATOR + tmp + PlatformURLHandler.JAR_SEPARATOR + jarEntry;
-			cachedURL = new URL(PlatformURLHandler.JAR,null,-1,tmp);
-		}
-		else {
-			if (DEBUG && DEBUG_CACHE_LOOKUP)
-				debug("Located in cache as "+tmp); //$NON-NLS-1$
-			cachedURL = new URL(PlatformURLHandler.FILE,null,-1,tmp);
-		}
-		isInCache = true;
-	}
-	else {
-		// attemp to cache
-		int ix = file.lastIndexOf("/"); //$NON-NLS-1$
-		tmp = file.substring(ix+1);
-		tmp = cacheLocation + filePrefix + Long.toString((new java.util.Date()).getTime()) + "_" + tmp; //$NON-NLS-1$
-		tmp = tmp.replace(File.separatorChar,'/');
-		if (isJar) {
-			tmp = PlatformURLHandler.FILE + PlatformURLHandler.PROTOCOL_SEPARATOR + tmp + PlatformURLHandler.JAR_SEPARATOR + jarEntry;
-			cachedURL = new URL(PlatformURLHandler.JAR,null,-1,tmp);
-		}
-		else cachedURL = new URL(PlatformURLHandler.FILE,null,-1,tmp);
-		copyToCache();
-	}
-	
-	return cachedURL;
-}
-/*
- * to be implemented by subclass
- * @return URL resolved URL
- */
- 
-protected URL resolve() throws IOException {
-	throw new IOException();
-}
-
-private String resolvePath(String spec) {
-	if (spec.length() == 0 || spec.charAt(0) != '$')
-		return spec;
-	int i = spec.indexOf('/', 1);
-	String first = ""; //$NON-NLS-1$
-	String rest = ""; //$NON-NLS-1$
-	if (i == -1)
-		first = spec;
-	else {	
-		first = spec.substring(0, i);
-		rest = spec.substring(i);
-	}
-	if (first.equalsIgnoreCase("$ws$")) //$NON-NLS-1$
-		return "ws/" + InternalBootLoader.getWS() + rest; //$NON-NLS-1$
-	if (first.equalsIgnoreCase("$os$")) //$NON-NLS-1$
-		return "os/" + InternalBootLoader.getOS() + rest; //$NON-NLS-1$
-	if (first.equalsIgnoreCase("$nl$")) { //$NON-NLS-1$
-		String nl = InternalBootLoader.getNL();
-		nl = nl.replace('_', '/');
-		return "nl/" + nl + rest; //$NON-NLS-1$
-	}
-	return spec;
-}
-
-protected String getId(String spec) {
-	int i = spec.lastIndexOf('_');
-	return i >= 0 ? spec.substring(0, i) : spec;
-}
-
-protected String getVersion(String spec) {
-	int i = spec.lastIndexOf('_');
-	return i >= 0 ? spec.substring(i + 1, spec.length()) : ""; //$NON-NLS-1$
-}
-
-void setResolvedURL(URL url) throws IOException {
-	if (resolvedURL==null) {
-		int ix = url.getFile().lastIndexOf(PlatformURLHandler.JAR_SEPARATOR);
-		isJar = -1 != ix;
-		// Resolved URLs containing !/ separator are assumed to be jar URLs.
-		// If the resolved protocol is not jar, new jar URL is created.
-		if (isJar && !url.getProtocol().equals(PlatformURLHandler.JAR)) 
-			url = new URL(PlatformURLHandler.JAR,"",-1,url.toExternalForm()); //$NON-NLS-1$
-		resolvedURL=url;
-	}
-}
-private boolean shouldCache(boolean asLocal) {
-	
-	// don't cache files that are known to be local
-	String rp = resolvedURL.getProtocol();
-	String rf = resolvedURL.getFile();
-	if (rp.equals(PlatformURLHandler.FILE)) return false;
-	if (rp.equals(PlatformURLHandler.JAR) && (rf.startsWith(PlatformURLHandler.FILE))) return false;
-
-	// for other files force caching if local connection was requested
-	if (asLocal) return true;
-	
-	// for now cache all files
-	// XXX: add cache policy support
-	return true;
-}
-static void shutdown() {
-	if (indexName!=null && cacheLocation!=null) {
-		// weed out "not found" entries
-		Enumeration keys = cacheIndex.keys();
-		String key;
-		Object value;
-		while (keys.hasMoreElements()) {
-			key = (String) keys.nextElement();
-			value = cacheIndex.get(key);
-			if (value==NOT_FOUND) cacheIndex.remove(key);
-		}
-		//if the cache index is empty we don't need to save it
-		if (cacheIndex.size() == 0)
-			return;
-		try {
-			// try to save cache index
-			FileOutputStream fos = null;
-			fos = new FileOutputStream(cacheLocation+indexName);
-			try {
-				cacheIndex.store(fos,null);
-			} finally {
-				fos.close();
-			}
-		}
-		catch(IOException e) {
-			// failed to store cache index ... ignore
-		}
-	}	
-}
-static void startup(String location) {
-
-	
-	verifyLocation(location); // check for platform location, ignore errors
-	String cacheProps = location.trim();
-	if (!cacheProps.endsWith(File.separator)) cacheProps += File.separator;
-	cacheProps += CACHE_PROP;
-	File cachePropFile = new File(cacheProps);
-	Properties props = null;	
-	FileInputStream fis;
-	
-	if (cachePropFile.exists()) {
-		// load existing properties	
-		try {
-			props = new Properties();
-			fis = new FileInputStream(cachePropFile);
-			try {
-				props.load(fis);
-			}
-			finally {
-				fis.close();
-			}
-		}
-		catch(IOException e) {
-			props = null;
-		}
-	}
-
-	if (props==null) {
-		// first time up, or failed to load previous settings
-		props = new Properties();
-		String tmp = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$
-		if (!tmp.endsWith(File.separator)) tmp += File.separator;
-		tmp += CACHE_DIR;
-		props.put(CACHE_LOCATION_PROP,tmp);
-		
-		tmp = Long.toString((new java.util.Date()).getTime());
-		props.put(CACHE_PREFIX_PROP,tmp);
-			
-		tmp += CACHE_INDEX;
-		props.put(CACHE_INDEX_PROP,tmp);
-
-		// save for next time around
-		FileOutputStream fos = null;
-		try {
-			fos = new FileOutputStream(cachePropFile);
-			try {
-				props.store(fos,null);
-			}
-			finally {
-				fos.close();
-			}
-		}
-		catch(IOException e) {
-			// failed to store cache location metadata ... ignore
-		}
-	}
-
-	// remember settings for shutdown processing
-	filePrefix = (String)props.get(CACHE_PREFIX_PROP);
-	indexName = (String)props.get(CACHE_INDEX_PROP);
-	cacheLocation = (String)props.get(CACHE_LOCATION_PROP);
-	
-	if (DEBUG) {
-		debugStartup("Cache location: " + cacheLocation); //$NON-NLS-1$
-		debugStartup("Cache index: " + indexName); //$NON-NLS-1$
-		debugStartup("Cache file prefix: " + filePrefix); //$NON-NLS-1$
-	}
-
-	// create cache directory structure if needed
-	if (!verifyLocation(cacheLocation)) {
-		indexName = null;
-		cacheLocation = null;	
-		if (DEBUG)
-			debugStartup("Failed to create cache directory structure. Caching suspended"); //$NON-NLS-1$
-		return;
-	}
-
-	// attempt to initialize cache index
-	if (cacheLocation!=null && indexName!=null) {
-		try {
-			fis = new FileInputStream(cacheLocation+indexName);
-			try {
-				cacheIndex.load(fis);
-			}
-			finally {
-				fis.close();
-			}
-		}
-		catch(IOException e) {				
-			if (DEBUG) 
-				debugStartup("Failed to initialize cache"); //$NON-NLS-1$
-		}
-	}
-}
-private static boolean verifyLocation(String location) {
-	// verify cache directory exists. Create if needed
-	File cacheDir = new File(location);
-	if (cacheDir.exists())
-		return true;
-	return cacheDir.mkdirs();
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandler.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandler.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandler.java
deleted file mode 100644
index 7a2c62b..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.net.*;
-import java.io.IOException;
-import java.util.Hashtable;
-import java.lang.reflect.Constructor;
-
- /**
- * URL handler for the "platform" protocol
- */
-public class PlatformURLHandler extends URLStreamHandler {
-
-	private static Hashtable connectionType = new Hashtable();
-
-	// URL protocol designations
-	public static final String PROTOCOL = "platform"; //$NON-NLS-1$
-	public static final String FILE = "file"; //$NON-NLS-1$
-	public static final String JAR = "jar"; //$NON-NLS-1$
-	public static final String JAR_SEPARATOR = "!/"; //$NON-NLS-1$
-	public static final String PROTOCOL_SEPARATOR = ":"; //$NON-NLS-1$
-protected PlatformURLHandler() {
-	super();
-}
-public URLConnection openConnection(URL url) throws IOException {
-	// Note: openConnection() method is made public (rather than protected)
-	//       to enable request delegation from proxy handlers
-
-	String spec = url.getFile().trim();
-	if (spec.startsWith("/")) spec = spec.substring(1); //$NON-NLS-1$
-	int ix = spec.indexOf("/"); //$NON-NLS-1$
-	if (ix==-1) {
-		String message = Policy.bind("url.invalidURL", url.toString()); //$NON-NLS-1$
-		throw new MalformedURLException(message);
-	}
-
-	String type = spec.substring(0,ix);
-	Constructor construct = (Constructor) connectionType.get(type);
-	if (construct==null) {
-		String message = Policy.bind("url.badVariant", url.toString()); //$NON-NLS-1$
-		throw new MalformedURLException(message);
-	}
-
-	PlatformURLConnection c = null;
-	try {
-		c = (PlatformURLConnection) construct.newInstance(new Object[] { url });
-	}
-	catch(Exception e) {
-		String message = Policy.bind("url.createConnection", url.toString()); //$NON-NLS-1$
-		throw new IOException(message);
-	}
-	c.setResolvedURL(c.resolve());
-	return c;
-}
-public static void register(String type, Class connectionClass) {
-	try {
-		Constructor c = connectionClass.getConstructor(new Class[] { URL.class });	
-		connectionType.put(type, c);
-	}
-	catch(NoSuchMethodException e) {
-		//don't register connection classes that don't conform to the spec
-	}
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandlerFactory.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandlerFactory.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandlerFactory.java
deleted file mode 100644
index fd84b4e..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandlerFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.net.URL;
-import java.net.URLStreamHandler;
-import java.net.URLStreamHandlerFactory;
-import java.util.Hashtable;
-import java.util.Properties;
-
-import org.eclipse.core.boot.BootLoader;
- 
-public class PlatformURLHandlerFactory implements URLStreamHandlerFactory {
-
-	private static Hashtable handlers = new Hashtable();
-	
-	private static final String ECLIPSE_HANDLER_FACTORY = "org.eclipse.protocol.handler.factory"; //$NON-NLS-1$
-	
-public PlatformURLHandlerFactory() {
-	super();
-
-	// register eclipse handler
-	handlers.put(PlatformURLHandler.PROTOCOL, new PlatformURLHandler());
-}
-public URLStreamHandler createURLStreamHandler(String protocol) {
-
-	URLStreamHandler handler = null;
-
-	// check for cached handler
-	Object element = handlers.get(protocol);
-	if (element==null) return null;
-	if (element instanceof URLStreamHandler) handler = (URLStreamHandler)element;
-	else {
-		// convert registered factory to a handler
-		URLStreamHandlerFactory f = (URLStreamHandlerFactory) element;
-		handler = f.createURLStreamHandler(protocol);
-		if (handler!=null) handlers.put(protocol, handler);
-		else handlers.remove(protocol);	// bad entry
-	}
-	return handler;
-}
-public static void register(String protocol, URLStreamHandlerFactory factory) {
-	if (protocol.equals(PlatformURLHandler.PROTOCOL)) return;	// just in case ...
-	handlers.put(protocol,factory);
-}
-public static void shutdown() {	
-	
-	PlatformURLHandlerFactoryProxy p = PlatformURLHandlerFactoryProxy.getFactoryProxy();
-	if (p!=null) p.setFactory(null);
-	PlatformURLConnection.shutdown();
-}
-public static void startup(String location) {
-
-	PlatformURLHandlerFactoryProxy p = PlatformURLHandlerFactoryProxy.getFactoryProxy();
-	if (p==null) {
-		p = new PlatformURLHandlerFactoryProxy();
-		try {	
-			URL.setURLStreamHandlerFactory(p);
-		} catch(Error e) {
-			// Application has already set the factory. This is, for example,
-			// the case when Eclipse is running as part of a servlet on
-			// some web application servers. In this case we come up in
-			// "toleration" mode where Eclipse URL protocols are handled
-			// via explicitly supplied protocol proxy handlers using the base
-			// Java convention. Eclipse "registers" its stream factory
-			// using a system property. The explicit proxy handlers
-			// then delegate to the Eclipse handlers via the factory looked
-			// up as a Java property.
-			Properties props = System.getProperties();
-			props.put(ECLIPSE_HANDLER_FACTORY, p);
-			System.setProperties(props);
-			if (BootLoader.inDebugMode()){
-				System.out.println("WARNING: Unable to set URLStreamHandlerFactory."); //$NON-NLS-1$
-				System.out.println("WARNING: Starting in toleration mode."); //$NON-NLS-1$
-			}
-		}
-	}
-	p.setFactory(new PlatformURLHandlerFactory());
-	PlatformURLConnection.startup(location);
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandlerFactoryProxy.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandlerFactoryProxy.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandlerFactoryProxy.java
deleted file mode 100644
index bbd03b8..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/PlatformURLHandlerFactoryProxy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.net.*;
- 
-public class PlatformURLHandlerFactoryProxy implements URLStreamHandlerFactory {
-
-	private static PlatformURLHandlerFactoryProxy p = null;	// singleton - set into URL as factory
-	private PlatformURLHandlerFactory f = null; // current actual factory
-PlatformURLHandlerFactoryProxy() {
-	super();
-	if (p==null) p = this;
-}
-public URLStreamHandler createURLStreamHandler(String protocol) {
-
-	if (f==null) return null;
-	else return f.createURLStreamHandler(protocol);
-}
-PlatformURLHandlerFactory getFactory() {
-	return f;
-}
-static PlatformURLHandlerFactoryProxy getFactoryProxy() {
-	return p;
-}
-void setFactory(PlatformURLHandlerFactory factory) {
-	f = factory;
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/Policy.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/Policy.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/Policy.java
deleted file mode 100644
index c818715..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/Policy.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.text.MessageFormat;
-import java.util.*;
-
-public class Policy {
-	private static String bundleName = "org.eclipse.core.internal.boot.messages";//$NON-NLS-1$
-	private static ResourceBundle bundle = ResourceBundle.getBundle(bundleName, Locale.getDefault());
-
-/**
- * Lookup the message with the given ID in this catalog 
- */
-public static String bind(String id) {
-	return bind(id, (String[])null);
-}
-/**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given string.
- */
-public static String bind(String id, String binding) {
-	return bind(id, new String[] {binding});
-}
-/**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given strings.
- */
-public static String bind(String id, String binding1, String binding2) {
-	return bind(id, new String[] {binding1, binding2});
-}
-
-/**
- * Lookup the message with the given ID in this catalog and bind its
- * substitution locations with the given string values.
- */
-public static String bind(String id, String[] bindings) {
-	if (id == null)
-		return "No message available";//$NON-NLS-1$
-	String message = null;
-	try {
-		message = bundle.getString(id);
-	} catch (MissingResourceException e) {
-		// If we got an exception looking for the message, fail gracefully by just returning
-		// the id we were looking for.  In most cases this is semi-informative so is not too bad.
-		return "Missing message: " + id + " in: " + bundleName;//$NON-NLS-1$ //$NON-NLS-2$
-	}
-	if (bindings == null)
-		return message;
-	return MessageFormat.format(message, bindings);
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/ResourceEnumeration.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/ResourceEnumeration.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/ResourceEnumeration.java
deleted file mode 100644
index d47ca9a..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/ResourceEnumeration.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.util.*;
-import java.net.URL;
-
-/**
- * Compound enumeration with visibility filtering.
- * Used in implementation of ClassLoader.getResources()
- */
- 
-class ResourceEnumeration implements Enumeration {
-	private Vector enums = new Vector();
-	private String name;
-	private int ix = 0;
-	private Object nextElement = null;
-	private DelegatingURLClassLoader current;
-	private DelegatingURLClassLoader requestor;
-public ResourceEnumeration(String name, Enumeration e, DelegatingURLClassLoader current, DelegatingURLClassLoader requestor) {
-	this.name = name;
-	if (e == null)
-		e = new Enumeration() {
-		public boolean hasMoreElements() {
-			return false;
-		}
-		public Object nextElement() {
-			return null;
-		}
-	};
-	enums.add(e);
-	this.current = current;
-	this.requestor = requestor;
-}
-public void add(Enumeration e) {
-	if (e == null)
-		return;
-	enums.add(e);
-}
-public boolean hasMoreElements() {
-	if (nextElement != null)
-		return true;
-	nextElement = nextVisibleElement();
-	return nextElement != null;
-}
-public Object nextElement() {
-	if (nextElement != null) {
-		Object result = nextElement;
-		nextElement = null;
-		return result;
-	} else
-		return nextVisibleElement();
-}
-private Object nextVisibleElement() {
-	Enumeration e;
-	Object element = null;
-	while (element == null && ix < enums.size()) {
-		e = (Enumeration) enums.elementAt(ix);
-		while (element == null && e.hasMoreElements()) {
-			element = e.nextElement();
-			if (ix == 0) {
-				if (!current.isResourceVisible(name, (URL) element, requestor))
-					element = null;
-			}
-		}
-		if (element == null)
-			ix++;
-	}
-	return element;
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/ResourceLoader.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/ResourceLoader.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/ResourceLoader.java
deleted file mode 100644
index 15488e0..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/ResourceLoader.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.net.*;
-
-public class ResourceLoader extends URLClassLoader {
-public ResourceLoader(URL[] resourcePath) {
-	super(resourcePath, null);
-}
-/**
- * Looks for a given class.   Resource loaders can never find classes and
- * so always throw <code>ClassNotFoundException</code>.
- */
-protected Class findClass(final String name) throws ClassNotFoundException {
-	throw new ClassNotFoundException(name);
-}
-/**
- * Looks for a given class.   Resource loaders can never find classes and
- * so always throw <code>ClassNotFoundException</code>.
- */
-protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
-	throw new ClassNotFoundException();
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/URLContentFilter.java

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/URLContentFilter.java b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/URLContentFilter.java
deleted file mode 100644
index a5f384d..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/URLContentFilter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.core.internal.boot;
-
-import java.util.*;
-
-/**
- * Represents class name filter for a given classpath entry. The filter
- * elements use the mask convention used by Java import statements.
- * Mask element "*" implies the full content is public.
- */
-public class URLContentFilter {
-	private Hashtable filterTable = null;
-	private boolean isPublic = false;
-	private boolean isExported = false;
-public URLContentFilter(String[] filter) {
-	if (filter==null || filter.length==0) return;
-
-	String entry;
-	for(int i=0; i<filter.length; i++) {
-		entry = filter[i].trim();
-		if (!entry.equals("")) { //$NON-NLS-1$
-			isExported = true;
-			if (entry.equals("*")) isPublic = true; //$NON-NLS-1$
-			else addMask(entry);
-		}
-	}			
-}
-public URLContentFilter(boolean isPublic) {
-	if (isPublic) {
-		this.isExported = true;
-		this.isPublic = true;
-	}
-}
-private void addMask(String name) {
-
-	if (filterTable==null) filterTable = new Hashtable();
-	filterTable.put(name,this);
-}
-private boolean classMatchesFilter(String name) {
-
-	int i = name.lastIndexOf("."); //$NON-NLS-1$
-	if (i!=-1 && filterTable.get(name.substring(0,i)+".*")!=null) return true; //$NON-NLS-1$
-	else if(filterTable.get(name)!=null) return true;
-	else return false;
-}
-boolean isClassVisible(Class clazz, DelegatingURLClassLoader current, DelegatingURLClassLoader requestor) {
-	return isClassVisible(clazz.getName(), current, requestor);
-}
-boolean isClassVisible(String className, DelegatingURLClassLoader current, DelegatingURLClassLoader requestor) {
-	if (requestor==current) return true;		// request from own loader ... full access
-	if (isPublic) return true;					// public library ... full access from other loaders
-	if (!isExported) return false;				// private library ... no access from other loaders
-	else return classMatchesFilter(className);	// exported library ... match against filters
-}
-boolean isResourceVisible(String resName, DelegatingURLClassLoader current, DelegatingURLClassLoader requestor) {
-	if (requestor==current) return true;		// request from own loader ... full access
-	if (isPublic) return true;					// public library ... full access from other loaders
-	if (!isExported) return false;				// private library ... no access from other loaders
-	else return resourceMatchesFilter(resName);	// exported library ... match against filters
-}
-private boolean resourceMatchesFilter(String name) {
-
-	int i = name.lastIndexOf("/"); //$NON-NLS-1$
-	String tmp = name.replace('/','.');
-	if (i!=-1 && filterTable.get(tmp.substring(0,i)+".*")!=null) return true; //$NON-NLS-1$
-	else if(filterTable.get(tmp)!=null) return true;
-	else return false;
-}
-public String toString() {
-	if (isPublic) return "*"; //$NON-NLS-1$
-	if (!isExported) return "<private>"; //$NON-NLS-1$
-	Enumeration keys = filterTable.keys();
-	String mask = ""; //$NON-NLS-1$
-	String sep = ""; //$NON-NLS-1$
-	while(keys.hasMoreElements()) {
-		mask += sep+(String)keys.nextElement();
-		sep = " + "; //$NON-NLS-1$
-	}
-	return mask;
-}
-}

bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/messages.properties

diff --git a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/messages.properties b/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/messages.properties
deleted file mode 100644
index 97fe2bd..0000000
--- a/bundles/org.eclipse.core.boot/src/org/eclipse/core/internal/boot/messages.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-### Boot plugin message catalog
-
-ok = OK
-
-### URL
-url.badVariant=Unsupported \"platform:\" protocol variation {0}
-url.invalidURL=Invalid "platform:" URL {0}
-url.createConnection=Unable to create connection {0}
-url.noaccess=Unable to access URL as local {0}.
-
-### Platform Configuration
-cfig.inUse=\nConfiguration file \"{0}\" is in use by another instance of the platform, \n\
-	or there was a failure in deleting the old lock file.  If no other platform instances are running, \n\
-	delete file \"{1}\" and try starting the platform again.
-cfig.failCreateLock=Failed to create lock for configuration file \"{0}\"
-cfig.badUrlArg=Bad -configuration argument \"{0}\"
-cfig.unableToLoad.incomplete=Unable to load {0}
-cfig.unableToLoad.noURL=Configuration file location not specified
-cfig.unableToSave.noURL=Configuration file save location not specified
-cfig.unableToSave=Unable to save configuration file \"{0}\"
-cfig.badVersion=Unsupported configuration version \"{0}\"
-
-platform.running=The Platform is already running.
-platform.mustNotBeRunning=The Platform must not be running.
-platform.notRunning=The Platform is not running.
-
-ignore.plugin=Ignoring invalid plug-in location: {0}.
-application.notFound=Application not found: {0}.
-error.fatal=Fatal Error: Unable to determine platform installation URL {0}.
-error.boot=Fatal Error: Unable to locate boot.xml file for executing org.eclipse.core.boot.
-error.runtime=Fatal Error: Unable to locate matching org.eclipse.core.runtime plugin.
-error.xerces=Fatal Error: Unable to locate matching org.apache.xerces plugin.
\ No newline at end of file

tests/org.eclipse.core.tests.harness/.classpath

diff --git a/tests/org.eclipse.core.tests.harness/.classpath b/tests/org.eclipse.core.tests.harness/.classpath
deleted file mode 100644
index 0e4f7ab..0000000
--- a/tests/org.eclipse.core.tests.harness/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>

tests/org.eclipse.core.tests.harness/.cvsignore

diff --git a/tests/org.eclipse.core.tests.harness/.cvsignore b/tests/org.eclipse.core.tests.harness/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/tests/org.eclipse.core.tests.harness/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file

tests/org.eclipse.core.tests.harness/.project

diff --git a/tests/org.eclipse.core.tests.harness/.project b/tests/org.eclipse.core.tests.harness/.project
deleted file mode 100644
index 056a443..0000000
--- a/tests/org.eclipse.core.tests.harness/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.core.tests.harness</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.team.cvs.core.cvsnature</nature>
-	</natures>
-</projectDescription>

tests/org.eclipse.core.tests.harness/about.html

diff --git a/tests/org.eclipse.core.tests.harness/about.html b/tests/org.eclipse.core.tests.harness/about.html
deleted file mode 100644
index bc976dd..0000000
--- a/tests/org.eclipse.core.tests.harness/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head>
-<title>About</title>
-<style type="text/css">
-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}
-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}
-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}
-code { font-family: "Courier New", Courier, mono; font-size: 10pt}
-sup { font-family: arial,helvetica,geneva; font-size: 10px}
-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}
-li { font-family: arial, helvetica, geneva; font-size: 10pt}
-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}
-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}
-</style>
-</head>
-<body>
-<body lang=EN-US link=blue vlink=purple>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">About This Plug-in</font></b></td>
-  </tr>
-  <tr> 
-    <td> 
-<p>1st November, 2001</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in.  The plug-in is provided to you under the terms and conditions of the
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a>.  For purposes of the Common Public License, &quot;Program&quot; will mean the plug-in.</p>
-</td></tr></table>
-</body>
-</html>
\ No newline at end of file

tests/org.eclipse.core.tests.harness/build-tests.xml

diff --git a/tests/org.eclipse.core.tests.harness/build-tests.xml b/tests/org.eclipse.core.tests.harness/build-tests.xml
deleted file mode 100644
index 1956227..0000000
--- a/tests/org.eclipse.core.tests.harness/build-tests.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<project name="Build Core Sniff" basedir="." default="init">
-
-  <property name="root" value="${basedir}/.."/>
-  <property name="temp" value="${root}/__temp"/>
-  <property name="plugins" value="${temp}/eclipse/plugins"/>
-
-  <target name="init">
-    <tstamp/>
-
-    <delete dir="${temp}"/>
-    <mkdir dir="${plugins}"/>
- 
-    <antcall target="buildPlugin">
-      <param name="pluginName" value="org.eclipse.core.tests.resources" />
-      <param name="jarName" value="resourcestests.jar" />
-    </antcall>
- 
-    <antcall target="buildPlugin">
-      <param name="pluginName" value="org.eclipse.core.tests.resources.saveparticipant" />
-      <param name="jarName" value="saveparticipant.jar" />
-    </antcall>
-
-    <antcall target="buildPlugin">
-      <param name="pluginName" value="org.eclipse.core.tests.resources.saveparticipant1" />
-      <param name="jarName" value="saveparticipant1.jar" />
-    </antcall>
-
-    <antcall target="buildPlugin">
-      <param name="pluginName" value="org.eclipse.core.tests.resources.saveparticipant2" />
-      <param name="jarName" value="saveparticipant2.jar" />
-    </antcall>
-
-    <antcall target="buildPlugin">
-      <param name="pluginName" value="org.eclipse.core.tests.resources.saveparticipant3" />
-      <param name="jarName" value="saveparticipant3.jar" />
-    </antcall>
-
-    <antcall target="buildPlugin">
-      <param name="pluginName" value="org.eclipse.core.tests.runtime" />
-      <param name="jarName" value="runtimetests.jar" />
-    </antcall>
-
-    <antcall target="buildPlugin">
-      <param name="pluginName" value="org.eclipse.core.tests.harness" />
-      <param name="jarName" value="testharness.jar" />
-    </antcall>
-
-    <zip zipfile="${basedir}/coreSniff${DSTAMP}.zip"
-       basedir="${temp}"
-    />
-
-    <delete dir="${temp}"/>
-    <eclipse.refreshLocal resource="org.eclipse.core.tests.harness"/>
-  </target>
-
-  <target name="buildPlugin">
-    <copy todir="${plugins}/${pluginName}">
-      <fileset dir="${root}/${pluginName}"/>
-    </copy>
-    <jar jarfile="${plugins}/${pluginName}/${jarName}"
-         basedir="${plugins}/${pluginName}/bin"
-    />
-    <delete dir="${plugins}/${pluginName}/bin"/>
-  </target>
-
-</project>
\ No newline at end of file

tests/org.eclipse.core.tests.harness/build.properties

diff --git a/tests/org.eclipse.core.tests.harness/build.properties b/tests/org.eclipse.core.tests.harness/build.properties
deleted file mode 100644
index 99b381f..0000000
--- a/tests/org.eclipse.core.tests.harness/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-source.testharness.jar=src/
-bin.includes=plugin.xml,*.jar,test.xml,about.xml
-

tests/org.eclipse.core.tests.harness/plugin.xml

diff --git a/tests/org.eclipse.core.tests.harness/plugin.xml b/tests/org.eclipse.core.tests.harness/plugin.xml
deleted file mode 100644
index 1aa54d9..0000000
--- a/tests/org.eclipse.core.tests.harness/plugin.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Eclipse Core Tests Harness"
-  id="org.eclipse.core.tests.harness"
-  version="2.0.0"
-  provider-name="Object Technology International, Inc.">
-
-  <requires>
-    <import plugin="org.eclipse.core.resources"/>
-    <import plugin="org.junit"/>
-  </requires>
-
-  <runtime>
-    <library name="testharness.jar">
-      <export name="*"/>
-    </library>
-  </runtime>
-
-  <extension-point name="Tests" id="tests"/>
-
-  <extension point="org.eclipse.core.tests.harness.tests">
-    <test id="ExampleTest">
-      <run class="org.eclipse.core.tests.harness.ExampleTest"/>
-    </test>
-  </extension>
-
-  <extension point="org.eclipse.core.tests.harness.tests">
-    <test id="ExampleWorkspaceTest">
-      <run class="org.eclipse.core.tests.harness.ExampleWorkspaceTest"/>
-    </test>
-  </extension>
-
-  <extension id="testapplication" point="org.eclipse.core.runtime.applications">
-    <application> 
-      <run class="org.eclipse.core.tests.harness.EclipseTestHarnessApplication"/>
-    </application>
-  </extension>
-  <extension id="sessiontestapplication" point="org.eclipse.core.runtime.applications">
-    <application> 
-      <run class="org.eclipse.core.tests.harness.SessionTestApplication"/>
-    </application>
-  </extension>
-
-
-</plugin>

tests/org.eclipse.core.tests.harness/readme.txt

diff --git a/tests/org.eclipse.core.tests.harness/readme.txt b/tests/org.eclipse.core.tests.harness/readme.txt
deleted file mode 100644
index 1bb41ac..0000000
--- a/tests/org.eclipse.core.tests.harness/readme.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-README for org.eclipse.core.tests.harness
-
-This plug-in works as a library for core tests. It also holds the script
-to launch the core automated tests after the a build.
-In order to execute launch the tests, the test framework plug-ins have
-to available.
-
-Command line (from the eclipse home directory) for executing tests:
-
-java -cp startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner -file plugins\org.eclipse.core.tests.harness\test.xml run -dev bin
\ No newline at end of file

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/CancelingProgressMonitor.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/CancelingProgressMonitor.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/CancelingProgressMonitor.java
deleted file mode 100644
index da595dc..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/CancelingProgressMonitor.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-public class CancelingProgressMonitor extends TestProgressMonitor {
-/**
- * @see IProgressMonitor#isCanceled
- */
-public boolean isCanceled() {
-	return true;
-}
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/CorePerformanceTest.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/CorePerformanceTest.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/CorePerformanceTest.java
deleted file mode 100644
index 241954c..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/CorePerformanceTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-import org.eclipse.core.tests.harness.EclipseWorkspaceTest;
-import java.io.*;
-import java.lang.reflect.*;
-import junit.framework.*;
-
-/**
- * This class is the common superclass for all performance tests for
- * the Core project.  It provides extensions to the JUnit infrastructure
- * to incorporate timers into test cases.
- *
- * There are two distinct sets of timing mechanisms available, depending
- * on the type of operation being testing.  For long running operations
- * with noticeable delays, use startTimer() and stopTimer().  This is
- * a more heavy-weight mechanism that allows logging, multiple
- * timers, and overlapping timers.
- *
- * For benchmarking operations that should be instantaneous, use the 
- * startBench(), stopBench() methods.  Here is an example:
- *
- *	<code>
- * 	String benchName = "myOperation";
- * 	int repeat = 500;
- *	startBench();
- *	for (int i = 0; i < repeat; i++) {
- *		//run the operation to be tested here
- *	}
- *	stopBench(benchName, repeat);
- *	</code>
- * Note that only one operation can be tested at a time with this mechanism.
- *
- * If an instance of this class is run using a LoggingPerformanceTestResult,
- * an HTML log file will be maintained of all timing and garbage collecting,
- * in addition to any messages added using the log() method.  In the absence
- * of a logging test result, all log events are written to the standard output.
- */
-public abstract class CorePerformanceTest extends EclipseWorkspaceTest {
-	public static String fLogFile;
-
-	protected LoggingPerformanceTestResult fLogger = null;
-	protected PerformanceTestResult fResult = null;
-	protected File fTempDir;
-	protected File fDir;
-
-	protected long benchStart;
-public CorePerformanceTest() {
-}
-public CorePerformanceTest(String name) {
-	super(name);
-}
-	protected PerformanceTestResult defaultTest() {
-		return new PerformanceTestResult();
-	}
-	/**
-	 * Logs or writes string to console.
-	 */
-	public void perfLog(String s) {
-		if (fLogger != null) {
-			fLogger.log(s);
-		} else {
-			System.out.println(s);
-		}
-	}
-	/**
-	 * A convenience method to run this test, collecting the results with a
-	 * default PerformanceTestResult object.
-	 *
-	 * @see PerformanceTestResult
-	 */
-	public TestResult run() {
-		PerformanceTestResult test = defaultTest();
-		run(test);
-		return test;
-	}
-	/**
-	 * Runs the test case and collects the results in a PerformanceTestResult.
-	 * This is the template method that defines the control flow
-	 * for running a test case.
-	 */
-	public void run(PerformanceTestResult test) {
-		fResult = test;
-
-		if (test instanceof LoggingPerformanceTestResult) {
-			fLogger = (LoggingPerformanceTestResult)test;
-		}
-
-		super.run(test);
-	}
-protected void startBench() {
-	for (int i = 0; i < 20; ++i) {
-		System.gc();
-	}
-	benchStart = System.currentTimeMillis();
-}
-/**
- * Tell the result to start a timer with the given name.
- * If no timer exists with that name, result creates a new timer
- * and starts it running.
- */ 
-protected void startTimer(String timerName) {
-	fResult.startTimer(timerName);
-}
-protected void stopBench(String benchName, int numOperations) {
-	long duration = System.currentTimeMillis() - benchStart;
-	double perOp = (double) duration / (double) numOperations;
-
-	String opString;
-	if (perOp > 100.0) {
-		opString = "(" + perOp + "ms per operation)";
-	} else {
-		//Note us == microseconds
-		opString = "(" + (perOp * 1000.0) + "us per operation)";
-	}
-		
-	System.out.println(benchName + " took " + duration + "ms " + opString);
-}
-/**
- * Tell the result to stop the timer with the given name.
- */ 
-protected void stopTimer(String timerName) {
-	fResult.stopTimer(timerName);
-}
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/DeltaDebugListener.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/DeltaDebugListener.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/DeltaDebugListener.java
deleted file mode 100644
index 447aa76..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/DeltaDebugListener.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.internal.events.ResourceDelta;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-
-
-public class DeltaDebugListener implements IResourceChangeListener {
-/**
- * @see IResourceChangeListener#closing(IProject)
- */
-public void closing(IProject project) {
-}
-/**
- * @see IResourceChangeListener#deleting(IProject)
- */
-
-public void deleting(IProject project) {
-}
-/**
- * @see IResourceChangeListener#resourceChanged
- */
-public void resourceChanged(IResourceChangeEvent event) {
-	IResourceDelta delta = event.getDelta();
-	if (delta == null)
-		return;
-	try {
-		System.out.println();
-		visitingProcess(delta);
-	} catch (CoreException e) {
-		// XXX: dropping exceptions
-	}
-}
-protected boolean visit(IResourceDelta change) throws CoreException {
-	System.out.println(((ResourceDelta) change).toDebugString());
-	return true;
-}
-/**
- * Processes the given change by traversing its nodes and calling
- * <code>visit</code> for each.
- *
- * @see #visit
- * @exception CoreException if the operation fails
- */
-protected void visitingProcess(IResourceDelta change) throws CoreException {
-	if (!visit(change))
-		return;
-	int kind = IResourceDelta.ADDED | IResourceDelta.REMOVED | IResourceDelta.CHANGED;
-	int memberFlags = IContainer.INCLUDE_TEAM_PRIVATE_MEMBERS | IContainer.INCLUDE_PHANTOMS;
-	IResourceDelta[] children = change.getAffectedChildren(kind, memberFlags);
-	for (int i = 0; i < children.length; i++)
-		visitingProcess(children[i]);
-}
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseTestHarnessApplication.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseTestHarnessApplication.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseTestHarnessApplication.java
deleted file mode 100644
index 3d1f287..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseTestHarnessApplication.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-
-import junit.framework.Test;
-import junit.textui.TestRunner;
-import org.eclipse.core.boot.IPlatformRunnable;
-import org.eclipse.core.runtime.*;
-
-public class EclipseTestHarnessApplication implements IPlatformRunnable {
-	protected List tests;
-
-	/** command line arguments made available to all tests. */
-	public static String[] args;
-	
-	/** true if workspace tests should log their deltas */
-	private static boolean deltas = false;
-
-	/** The id of the test harness plug-in */
-	private static final String PI_TESTHARNESS = "org.eclipse.core.tests.harness";
-
-	/** the simple id of the tests extension point in the test harness plug-in */
-	private static final String PT_TESTS = "tests";
-public EclipseTestHarnessApplication() {
-	tests = new ArrayList(5);
-}
-public static boolean deltasEnabled() {
-	return deltas;
-}
-/**
- * Finds, creates and returns a prototypical test object for the test with
- * the given name/id.  Returns <code>null</code> if no such test is found
- * or the class defined by the test extension could not be found.
- * In either failure case a message is output on the System console.
- */
-protected Object findTestFor(String testName) {
-	IExtensionPoint point = Platform.getPluginRegistry().getExtensionPoint(PI_TESTHARNESS, PT_TESTS);
-	IConfigurationElement[] elements = point.getConfigurationElements();
-	for (int i = 0; i < elements.length; i++) {
-		IConfigurationElement element = elements[i];
-		if (element.getName().equals("test")) {
-			String id = element.getAttribute("id");
-			if (id != null && id.equals(testName))
-				try {
-					return element.createExecutableExtension("run");
-				} catch (CoreException e) {
-					System.out.println("Could not instantiate test: " + testName);
-					return null;
-				}
-		}
-	}
-	System.out.println("Could not find test: " + testName);
-	return null;
-}
-protected String[] processCommandLine(String[] args) {
-	int[] configArgs = new int[100];
-	configArgs[0] = -1; // need to initialize the first element to something that could not be an index.
-	int configArgIndex = 0;
-	for (int i = 0; i < args.length; i++) {
-		boolean found = false;
-		// check for args without parameters (i.e., a flag arg)
-		// see if we should be logging deltas
-		if (args[i].equalsIgnoreCase("-deltas")) {
-			found = true;
-			deltas = true;
-		}
-		if (found) {
-			configArgs[configArgIndex++] = i;
-			continue;
-		}
-
-		// check for args with parameters
-		if (i == args.length - 1 || args[i + 1].startsWith("-")) {
-			continue;
-		}
-		String arg = args[++i];
-		// check for the which test to run
-		if (args[i - 1].equalsIgnoreCase("-test")) {
-			found = true;
-			// fully qualified name of the test class to run
-			tests.add(arg);
-		}
-
-		// done checking for args.  Remember where an arg was found 
-		if (found) {
-			configArgs[configArgIndex++] = i - 1;
-			configArgs[configArgIndex++] = i;
-		}
-	}
-
-	//remove all the arguments consumed by this argument parsing
-	if (configArgIndex == 0)
-		return args;
-	String[] passThruArgs = new String[args.length - configArgIndex];
-	configArgIndex = 0;
-	int j = 0;
-	for (int i = 0; i < args.length; i++) {
-		if (i == configArgs[configArgIndex])
-			configArgIndex++;
-		else
-			passThruArgs[j++] = args[i];
-	}
-	return passThruArgs;
-}
-/**
- * Runs a set of tests as defined by the given command line args.
- * This is the platform application entry point.
- * @see IPlatformRunnable
- */
-public Object run(Object userArgs) throws Exception {
-	args = processCommandLine((String[]) userArgs);
-	for (Iterator i = tests.iterator(); i.hasNext();)
-		run((String) i.next());
-	return null;
-}
-protected Object run(String testName) throws Exception {
-	Object testObject = findTestFor(testName);
-	if (testObject == null)
-		return null;
-	Class testClass = testObject.getClass();
-	Method method = testClass.getDeclaredMethod("suite", new Class[0]);
-	Test suite = null;
-	try {
-		suite = (Test) method.invoke(testClass, new Object[0]);
-	} catch (InvocationTargetException e) {
-		if (e.getTargetException() instanceof Error)
-			throw (Error) e.getTargetException();
-		else
-			throw e;
-	}
-	run(suite);
-	return null;
-}
-protected void run(Test suite) throws Exception {
-	TestRunner.run(suite);
-}
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseWorkspaceTest.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseWorkspaceTest.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseWorkspaceTest.java
deleted file mode 100644
index cfbeac5..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/EclipseWorkspaceTest.java
+++ /dev/null
@@ -1,868 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.*;
-
-import junit.framework.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-
-/**
- * Tests which use the Eclipse Platform workspace.
- */
-
-public class EclipseWorkspaceTest extends TestCase {
-	//constants for nature sets	
-	protected static final String SET_STATE = "org.eclipse.core.tests.resources.stateSet";
-	protected static final String SET_OTHER = "org.eclipse.core.tests.resources.otherSet";
-
-	//constants for nature ids
-
-	//simpleNature
-	protected static final String NATURE_SIMPLE = "org.eclipse.core.tests.resources.simpleNature";
-	//snowNature, requires: waterNature, one-of: otherSet
-	protected static final String NATURE_SNOW = "org.eclipse.core.tests.resources.snowNature";
-	//waterNature, oneof: stateSet
-	protected static final String NATURE_WATER = "org.eclipse.core.tests.resources.waterNature";
-	//earthNature, oneof: stateSet
-	protected static final String NATURE_EARTH = "org.eclipse.core.tests.resources.earthNature";
-	//mudNature, requires: waterNature, earthNature, one-of: otherSet
-	protected static final String NATURE_MUD = "org.eclipse.core.tests.resources.mudNature";
-	//invalidNature
-	protected static final String NATURE_INVALID = "org.eclipse.core.tests.resources.invalidNature";
-	//cycle1 requires: cycle2
-	protected static final String NATURE_CYCLE1 = "org.eclipse.core.tests.resources.cycle1";
-	//cycle2 requires: cycle3
-	protected static final String NATURE_CYCLE2 = "org.eclipse.core.tests.resources.cycle2";
-	//cycle3 requires: cycle1
-	protected static final String NATURE_CYCLE3 = "org.eclipse.core.tests.resources.cycle3";
-	//missing nature
-	protected static final String NATURE_MISSING= "no.such.nature.Missing";
-	//missing pre-req nature
-	protected static final String NATURE_MISSING_PREREQ= "org.eclipse.core.tests.resources.missingPrerequisiteNature";
-
-	/** delta change listener if requested */
-	public static IResourceChangeListener deltaListener;
-/**
- * Need a zero argument constructor to satisfy the test harness.
- * This constructor should not do any real work nor should it be
- * called by user code.
- */
-public EclipseWorkspaceTest() {
-	super(null);
-}
-/**
- * Creates a new EclipseWorkspaceTest
- * @param name java.lang.String
- */
-public EclipseWorkspaceTest(String name) {
-	super(name);
-}
-/**
- * Assert that each element of the resource array does not exist in the 
- * local store.
- */
-public void assertDoesNotExistInFileSystem(IResource[] resources) {
-	assertDoesNotExistInFileSystem("", resources);
-}
-/**
- * Assert that each element of the resource array does not exist in the 
- * local store.
- */
-public void assertDoesNotExistInFileSystem(String message, IResource[] resources) {
-	for (int i = 0; i < resources.length; i++) {
-		assertDoesNotExistInFileSystem(message, resources[i]);
-	}
-}
-/**
- * Assert that the given resource does not exist in the local store.
- */
-public void assertDoesNotExistInFileSystem(String message, IResource resource) {
-	try {
-		assertTrue(message, !existsInFileSystem(resource));
-	} catch (CoreException e) {
-		assertTrue(e.toString(), false);
-	}
-}
-/**
- * Assert that the given resource does not exist in the local store.
- */
-public void assertDoesNotExistInFileSystem(IResource resource) {
-	assertDoesNotExistInFileSystem("", resource);
-}
-/**
- * Assert that each element of the resource array does not exist 
- * in the workspace resource info tree.
- */
-public void assertDoesNotExistInWorkspace(IResource[] resources) {
-	assertDoesNotExistInWorkspace("", resources);
-}
-/**
- * Assert that each element of the resource array does not exist 
- * in the workspace resource info tree.
- */
-public void assertDoesNotExistInWorkspace(String message, IResource[] resources) {
-	for (int i = 0; i < resources.length; i++) {
-		assertDoesNotExistInWorkspace(message, resources[i]);
-	}
-}
-protected void assertEquals(String message, Object[] expected, Object[] actual) {
-	if (expected == null && actual == null)
-		return;
-	if (expected == null || actual == null)
-		fail(message);
-	if (expected.length != actual.length)
-		fail(message);
-	for (int i = 0; i < expected.length; i++)
-		assertEquals(message, expected[i], actual[i]);
-}
-/**
- * Assert that the given resource does not exist in the workspace 
- * resource info tree.
- */
-public void assertDoesNotExistInWorkspace(String message, IResource resource) {
-	assertTrue(message, !existsInWorkspace(resource));
-}
-/**
- * Assert that the given resource does not exist in the workspace 
- * resource info tree.
- */
-public void assertDoesNotExistInWorkspace(IResource resource) {
-	assertDoesNotExistInWorkspace("", resource);
-}
-/**
- * Assert that each element in the resource array  exists in the local store.
- */
-public void assertExistsInFileSystem(IResource[] resources) {
-	assertExistsInFileSystem("", resources);
-}
-/**
- * Assert that each element in the resource array  exists in the local store.
- */
-public void assertExistsInFileSystem(String message, IResource[] resources) {
-	for (int i = 0; i < resources.length; i++) {
-		assertExistsInFileSystem(message, resources[i]);
-	}
-}
-/**
- * Assert whether or not the given resource exists in the local 
- * store. Use the resource manager to ensure that we have a 
- * correct Path -> File mapping.
- */
-public void assertExistsInFileSystem(String message, IResource resource) {
-	try {
-		assertTrue(message, existsInFileSystem(resource));
-	} catch (CoreException e) {
-		assertTrue(e.toString(), false);
-	}
-}
-/**
- * Assert whether or not the given resource exists in the local 
- * store. Use the resource manager to ensure that we have a 
- * correct Path -> File mapping.
- */
-public void assertExistsInFileSystem(IResource resource) {
-	assertExistsInFileSystem("", resource);
-}
-/**
- * Assert that each element of the resource array exists in the 
- * workspace resource info tree.
- */
-public void assertExistsInWorkspace(IResource[] resources) {
-	assertExistsInWorkspace("", resources);
-}
-/**
- * Assert that each element of the resource array exists in the 
- * workspace resource info tree.
- */
-public void assertExistsInWorkspace(IResource[] resources, boolean phantom) {
-	assertExistsInWorkspace("", resources, phantom);
-}
-/**
- * Assert that each element of the resource array exists in the 
- * workspace resource info tree.
- */
-public void assertExistsInWorkspace(String message, IResource[] resources) {
-	for (int i = 0; i < resources.length; i++) {
-		assertExistsInWorkspace(message, resources[i]);
-	}
-}
-/**
- * Assert that each element of the resource array exists in the 
- * workspace resource info tree.
- */
-public void assertExistsInWorkspace(String message, IResource[] resources, boolean phantom) {
-	for (int i = 0; i < resources.length; i++) {
-		assertExistsInWorkspace(message, resources[i], phantom);
-	}
-}
-/**
- * Assert whether or not the given resource exists in the workspace 
- * resource info tree.
- */
-public void assertExistsInWorkspace(String message, IResource resource) {
-	assertTrue(message, existsInWorkspace(resource));
-}
-/**
- * Assert whether or not the given resource exists in the workspace 
- * resource info tree.
- */
-public void assertExistsInWorkspace(String message, IResource resource, boolean phantom) {
-	assertTrue(message, existsInWorkspace(resource, phantom));
-}
-/**
- * Assert whether or not the given resource exists in the workspace 
- * resource info tree.
- */
-public void assertExistsInWorkspace(IResource resource) {
-	assertExistsInWorkspace("", resource);
-}
-/**
- * Assert whether or not the given resource exists in the workspace 
- * resource info tree.
- */
-public void assertExistsInWorkspace(IResource resource, boolean phantom) {
-	assertExistsInWorkspace("", resource, phantom);
-}
-/**
- * Return a collection of resources the hierarcy defined by defineHeirarchy().
- */
-public IResource[] buildResources() {
-	return buildResources(getWorkspace().getRoot(), defineHierarchy());
-}
-/**
- * Return a collection of resources for the given hierarchy at 
- * the given root.
- */
-public IResource[] buildResources(IContainer root, String[] hierarchy) {
-	IResource[] result = new IResource[hierarchy.length];
-	for (int i = 0; i < hierarchy.length; i++) {
-		IPath path = new Path(hierarchy[i]);
-		IPath fullPath = root.getFullPath().append(path);
-		switch (fullPath.segmentCount()) {
-			case 0 :
-				result[i] = getWorkspace().getRoot();
-				break;
-			case 1 :
-				result[i] = getWorkspace().getRoot().getProject(fullPath.segment(0));
-				break;
-			default :
-				if (hierarchy[i].charAt(hierarchy[i].length()-1) == Path.SEPARATOR)
-					result[i] = (IResource) root.getFolder(path);
-				else
-					result[i] = (IResource) root.getFile(path);
-				break;
-		}
-	}
-	return result;
-}
-/**
- * Returns a boolean value indicating whether or not the contents
- * of the given streams are considered to be equal. Closes both input streams.
- */
-public boolean compareContent(InputStream a, InputStream b) {
-	int c, d;
-	if (a == null && b == null)
-		return true;
-	try {
-		if (a == null || b == null)
-			return false;
-		while ((c = a.read()) == (d = b.read()) && (c != -1 && d != -1));
-		return (c == -1 && d == -1);
-	} catch (IOException e) {
-		return false;
-	} finally {
-		try {
-			if (a != null)
-				a.close();
-		} catch (IOException e) {
-		}
-		try {
-			if (b != null)
-				b.close();
-		} catch (IOException e) {
-		}
-	}
-}
-private IPath computeDefaultLocation(IResource target) {
-	switch (target.getType()) {
-		case IResource.ROOT :
-			return Platform.getLocation();
-		case IResource.PROJECT :
-			return Platform.getLocation().append(target.getFullPath());
-		default :
-			IPath location = computeDefaultLocation(target.getProject());
-			location = location.append(target.getFullPath().removeFirstSegments(1));
-			return location;
-	}
-}
-private void create(final IResource resource, boolean local) throws CoreException {
-	if (resource == null || resource.exists())
-		return;
-	if (!resource.getParent().exists())
-		create(resource.getParent(), local);
-	switch (resource.getType()) {
-		case IResource.FILE :
-			 ((IFile) resource).create(local ? new ByteArrayInputStream(new byte[0]) : null, true, getMonitor());
-			break;
-		case IResource.FOLDER :
-			 ((IFolder) resource).create(true, local, getMonitor());
-			break;
-		case IResource.PROJECT :
-			 ((IProject) resource).create(getMonitor());
-			((IProject) resource).open(getMonitor());
-			break;
-	}
-}
-/**
- * Create the given file in the local store. 
- */
-public void createFileInFileSystem(IPath path) throws CoreException {
-	java.io.File file = path.toFile();
-	new java.io.File(file.getParent()).mkdirs();
-	FileOutputStream output = null;
-	try {
-		output = new FileOutputStream(file);
-		output.write("".getBytes("UTF8"));
-	} catch (IOException e) {
-		throw new CoreException(new Status(IStatus.ERROR, "foo", 2, "Failed during write: " + path, e));
-	} finally {
-		try {
-			if (output != null)
-				output.close();
-		} catch (IOException e) {
-		}
-	}
-}
-/**
- * Create the given file in the local store. 
- */
-public void createFileInFileSystem(IPath path, InputStream contents) throws IOException {
-	java.io.File file = path.toFile();
-	new java.io.File(file.getParent()).mkdirs();
-	FileOutputStream output = new FileOutputStream(file);
-	transferData(contents, output);
-}
-public IResource[] createHierarchy() throws CoreException {
-	IResource[] result = buildResources();
-	ensureExistsInWorkspace(result, true);
-	return result;
-}
-/**
- * Returns a collection of string paths describing the standard 
- * resource hierarchy for this test.  In the string forms, folders are
- * represented as having trailing separators ('/').  All other resources
- * are files.  It is generally assumed that this hierarchy will be 
- * inserted under some solution and project structure.
- * For example, 	
- * <pre>
- *    return new String[] {"/", "/1/", "/1/1", "/1/2", "/1/3", "/2/", "/2/1"};
- * </pre>
- */
-public String[] defineHierarchy() {
-	return new String[0];
-}
-/**
- * Delete the resources in the array from the local store.
- */
-public void ensureDoesNotExistInFileSystem(IResource[] resources) {
-	for (int i = 0; i < resources.length; i++) {
-		ensureDoesNotExistInFileSystem(resources[i]);
-	}
-}
-protected void ensureDoesNotExistInFileSystem(java.io.File file) {
-	if (!file.exists())
-		return;
-	if (file.isDirectory()) {
-		String[] files = file.list();
-		if (files != null) // be carefule since file.list() can return null
-			for (int i = 0; i < files.length; ++i)
-				ensureDoesNotExistInFileSystem(new java.io.File(file, files[i]));
-	}
-	if (!file.delete()) {
-		System.out.println("WARNING: ensureDoesNotExistInFileSystem(File) could not delete: " + file.getPath());
-	}
-}
-/**
- * Delete the given resource from the local store. Use the resource
- * manager to ensure that we have a correct Path -> File mapping.
- */
-public void ensureDoesNotExistInFileSystem(IResource resource) {
-	IPath path = resource.getLocation();
-	if (path != null)
-		ensureDoesNotExistInFileSystem(path.toFile());
-}
-/**
- * Delete each element of the resource array from the workspace 
- * resource info tree.
- */
-public void ensureDoesNotExistInWorkspace(final IResource[] resources) {
-	IWorkspaceRunnable body = new IWorkspaceRunnable() {
-		public void run(IProgressMonitor monitor) throws CoreException {
-			for (int i = 0; i < resources.length; i++) {
-				ensureDoesNotExistInWorkspace(resources[i]);
-			}
-		}
-	};
-	try {
-		getWorkspace().run(body, null);
-	} catch (CoreException e) {
-		fail("#ensureDoesNotExistInWorkspace(IResource[])", e);
-	}
-}
-/**
- * Delete the given resource from the workspace resource tree.
- */
-public void ensureDoesNotExistInWorkspace(IResource resource) {
-	try {
-		if (resource.exists())
-			resource.delete(true, null);
-	} catch (CoreException e) {
-		fail("#ensureDoesNotExistInWorkspace(IResource): " + resource.getFullPath(), e);
-	}
-}
-/**
- * Create the each resource of the array in the local store.
- */
-public void ensureExistsInFileSystem(IResource[] resources) {
-	for (int i = 0; i < resources.length; i++) {
-		ensureExistsInFileSystem(resources[i]);
-	}
-}
-/**
- * Create the given file in the local store. Use the resource manager
- * to ensure that we have a correct Path -> File mapping.
- */
-public void ensureExistsInFileSystem(IFile file) {
-	IPath path = file.getLocation();
-	try {
-		if (path != null)
-			createFileInFileSystem(path);
-	} catch (CoreException e) {
-		fail("#ensureExistsInFileSystem(IFile): " + file.getFullPath(), e);
-	}
-}
-/**
- * Create the given folder in the local store. Use the resource
- * manager to ensure that we have a correct Path -> File mapping.
- */
-public void ensureExistsInFileSystem(IResource resource) {
-	if (resource instanceof IFile)
-		ensureExistsInFileSystem((IFile) resource);
-	else {
-		IPath path = resource.getLocation();
-		if (path != null)
-			path.toFile().mkdirs();
-	}
-}
-/**
- * Create each element of the resource array in the workspace resource 
- * info tree.
- */
-public void ensureExistsInWorkspace(final IResource[] resources, final boolean local) {
-	IWorkspaceRunnable body = new IWorkspaceRunnable() {
-		public void run(IProgressMonitor monitor) throws CoreException {
-			for (int i = 0; i < resources.length; i++)
-				create(resources[i], local);
-		}
-	};
-	try {
-		getWorkspace().run(body, null);
-	} catch (CoreException e) {
-		fail("#ensureExistsInWorkspace(IResource[])", e);
-	}
-}
-/**
- * Modifies the resource in the filesystem so that it is out of sync
- * with the workspace.
- */
-public void ensureOutOfSync(final IResource resource) {
-	if (resource.getType() != IResource.FILE)
-		return;
-	IFile file = (IFile)resource;
-	ensureExistsInWorkspace(file, true);
-	while (file.isSynchronized(IResource.DEPTH_ZERO)) {
-		modifyInFileSystem(file);
-		try {
-			Thread.currentThread().sleep(100);
-		} catch (InterruptedException e) {
-		}
-	}
-}
-/**
- * Create the given file in the workspace resource info tree.
- */
-public void ensureExistsInWorkspace(final IFile resource, final InputStream contents) {
-	if (resource == null)
-		return;
-	IWorkspaceRunnable body = new IWorkspaceRunnable() {
-		public void run(IProgressMonitor monitor) throws CoreException {
-			if (resource.exists()) {
-				resource.setContents(contents, true, false, null);
-			} else {
-				ensureExistsInWorkspace(resource.getParent(), true);
-				resource.create(contents, true, null);
-			}
-		}
-	};
-	try {
-		getWorkspace().run(body, null);
-	} catch (CoreException e) {
-		fail("#ensureExistsInWorkspace(IFile, InputStream): " + resource.getFullPath(), e);
-	}
-}
-/**
- * Create the given file in the workspace resource info tree.
- */
-public void ensureExistsInWorkspace(IFile resource, String contents) {
-	ensureExistsInWorkspace(resource, new ByteArrayInputStream(contents.getBytes()));
-}
-/**
- * Create the given resource in the workspace resource info tree.
- */
-public void ensureExistsInWorkspace(final IResource resource, final boolean local) {
-	IWorkspaceRunnable body = new IWorkspaceRunnable() {
-		public void run(IProgressMonitor monitor) throws CoreException {
-			create(resource, local);
-		}
-	};
-	try {
-		getWorkspace().run(body, null);
-	} catch (CoreException e) {
-		fail("#ensureExistsInWorkspace(IResource): " + resource.getFullPath(), e);
-	}
-}
-private boolean existsInFileSystem(IResource resource) throws CoreException {
-	IPath path = resource.getLocation();
-	if (path == null)
-		path = computeDefaultLocation(resource);
-	return path.toFile().exists();
-}
-private boolean existsInWorkspace(IResource resource) {
-	return resource.exists();
-}
-private boolean existsInWorkspace(IResource resource, boolean phantom) {
-	IResource target = getWorkspace().getRoot().findMember(resource.getFullPath(), phantom);
-	return target != null && target.getType() == resource.getType();
-}
-/**
- * Fails the test due to the given exception.
- * @param message
- * @param e
- */
-public void fail(String message, Exception e) {
-	// If the exception is a CoreException with a multistatus
-	// then print out the multistatus so we can see all the info.
-	if (e instanceof CoreException) {
-		IStatus status = ((CoreException) e).getStatus();
-		if (status.getChildren().length > 0) {
-			write(status, 0);
-		}
-	}
-	fail(message + ": " + e);
-}
-protected void indent(OutputStream output, int indent) {
-	for (int i=0; i<indent; i++)
-		try {
-			output.write("\t".getBytes());
-		} catch(IOException e) {
-		}
-}
-protected void write(IStatus status, int indent) {
-	PrintStream output = System.out;
-	indent(output, indent);
-	output.println("Severity: " + status.getSeverity());
-
-	indent(output, indent);
-	output.println("Plugin ID: " + status.getPlugin());
-
-	indent(output, indent);
-	output.println("Code: " + status.getCode());
-
-	indent(output, indent);
-	output.println("Message: " + status.getMessage());
-
-	if (status.isMultiStatus()) {
-		IStatus[] children = status.getChildren();
-		for (int i = 0; i < children.length; i++) {
-			write(children[i], indent + 1);
-		}
-	}
-}
-/**
- * Does some garbage collections to free unused resources
- */
-protected static void gc() {
-	/* make sure old stores get finalized so they free old files */
-	for (int i = 0; i < 2; i++) {
-		System.runFinalization();
-		System.gc();
-	}
-}
-/** 
- * Returns the unqualified class name of the receiver (ie. without the package prefix).
- */
-protected String getClassName() {
-	String fullClassName = getClass().getName();
-	return fullClassName.substring(fullClassName.lastIndexOf(".") + 1); 
-}
-public InputStream getContents(java.io.File target, String errorCode) {
-	try {
-		return new FileInputStream(target);
-	} catch (IOException e) {
-		fail(errorCode, e);
-	}
-	return null; // never happens
-}
-/**
- * Return an input stream with some the specified text to use
- * as contents for a file resource.
- */
-public InputStream getContents(String text) {
-	return new ByteArrayInputStream(text.getBytes());
-}
-/**
- * Returns invalid sets of natures
- */
-protected String[][] getInvalidNatureSets() {
-	return new String[][] {
-		{NATURE_SNOW},//missing water pre-req
-		{NATURE_WATER, NATURE_EARTH},//duplicates from state-set
-		{NATURE_WATER, NATURE_MUD},//missing earth pre-req
-		{NATURE_WATER, NATURE_EARTH, NATURE_MUD},//duplicates from state-set
-		{NATURE_SIMPLE, NATURE_SNOW, NATURE_WATER, NATURE_MUD},//dups from other-set, missing pre-req
-		{NATURE_MISSING},//doesn't exist
-		{NATURE_SIMPLE, NATURE_MISSING},//missing doesn't exist
-		{NATURE_MISSING_PREREQ},//requires nature that doesn't exist
-		{NATURE_SIMPLE, NATURE_MISSING_PREREQ},//requires nature that doesn't exist
-		{NATURE_CYCLE1},//missing pre-req
-		{NATURE_CYCLE2, NATURE_CYCLE3},//missing pre-req
-		{NATURE_CYCLE1, NATURE_SIMPLE, NATURE_CYCLE2, NATURE_CYCLE3},//cycle
-	};
-}
-public IProgressMonitor getMonitor() {
-	return new FussyProgressMonitor();
-}
-/**
- * Return an input stream with some random text to use
- * as contents for a file resource.
- */
-public InputStream getRandomContents() {
-	return new ByteArrayInputStream(getRandomString().getBytes());
-}
-/**
- * Return String with some random text to use
- * as contents for a file resource.
- */
-public String getRandomString() {
-	switch ((int) Math.round(Math.random() * 10)) {
-		case 0 :
-			return "este e' o meu conteudo (portuguese)";
-		case 1 :
-			return "ho ho ho";
-		case 2 :
-			return "I'll be back";
-		case 3 :
-			return "don't worry, be happy";
-		case 4 :
-			return "there is no imagination for more sentences";
-		case 5 :
-			return "customize yours";
-		case 6 :
-			return "foo";
-		case 7 :
-			return "bar";
-		case 8 :
-			return "foobar";
-		case 9 :
-			return "case 9";
-		default :
-			return "these are my contents";
-	}
-}
-/**
- * Returns valid sets of natures
- */
-protected String[][] getValidNatureSets() {
-	return new String[][] {
-		{},
-		{NATURE_SIMPLE},
-		{NATURE_SNOW, NATURE_WATER},
-		{NATURE_EARTH},
-		{NATURE_WATER, NATURE_SIMPLE, NATURE_SNOW},
-	};
-}
-public static IWorkspace getWorkspace() {
-	return ResourcesPlugin.getWorkspace();
-}
-/**
- * Modifies the content of the given file in the file system by
- * appending an 'f'.
- * @param file
- */
-protected void modifyInFileSystem(IFile file) {
-	String m = getClassName() + ".modifyInFileSystem(IFile): ";
-	String newContent = readStringInFileSystem(file) + "f";
-	java.io.File osFile = file.getLocation().toFile();
-	try {
-		FileOutputStream os = null;
-		try {
-			os = new FileOutputStream(osFile);
-			os.write(newContent.getBytes("UTF8"));
-		} finally {
-			os.close();
-		}
-	} catch (IOException e) {
-		fail(m + "0.0", e);
-	}
-}
-/**
- * Modifies the content of the given file in the workspace by
- * appending a 'w'.
- * @param file
- */
-protected void modifyInWorkspace(IFile file) throws CoreException {
-	String m = getClassName() + ".modifyInWorkspace(IFile): ";
-	try {
-		String newContent = readStringInWorkspace(file) + "w";
-		ByteArrayInputStream is = new ByteArrayInputStream(newContent.getBytes("UTF8"));
-		file.setContents(is, false, false, null);
-	} catch (UnsupportedEncodingException e) {
-		fail(m + "0.0");
-	}
-}
-/**
- * Returns the content of the given file in the file system as a
- * byte array.
- * @param file
- */
-protected byte[] readBytesInFileSystem(IFile file){
-	String m = getClassName()+".readBytesInFileSystem(IFile): ";
-	try {
-		java.io.File osFile = file.getLocation().toFile();
-		FileInputStream is = new FileInputStream(osFile);
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		transferData(is, os);
-		return os.toByteArray();
-	} catch(IOException e){
-		fail(m+"0.0", e);
-	}
-	return null;
-}
-/**
- * Returns the content of the given file in the workspace as a
- * byte array.
- */
-protected byte[] readBytesInWorkspace(IFile file){
-	String m = getClassName()+".readBytesInWorkspace(IFile): ";
-	try {
-		InputStream is = file.getContents(false);
-		ByteArrayOutputStream os = new ByteArrayOutputStream();
-		transferData(is, os);
-		return os.toByteArray();
-	} catch(CoreException e){
-		fail(m+"0.0", e);
-	}
-	return null;
-}
-/**
- * Returns the content of the given file in the file system as a
- * String (UTF8).
- * @param file
- */
-protected String readStringInFileSystem(IFile file){
-	String m = getClassName()+".readStringInFileSystem(IFile): ";
-	try {
-		return new String(readBytesInFileSystem(file), "UTF8");
-	} catch(UnsupportedEncodingException e){
-		fail(m+"0.0", e);
-	}
-	return null;
-}
-/**
- * Returns the content of the given file in the workspace as a
- * String (UTF8).
- * @param file
- */
-protected String readStringInWorkspace(IFile file){
-	String m = getClassName()+".readStringInWorkspace(IFile): ";
-	try {
-		return new String(readBytesInWorkspace(file), "UTF8");
-	} catch(UnsupportedEncodingException e){
-		fail(m+"0.0", e);
-	}
-	return null;
-}
-/**
- * The environment should be set-up in the main method.
- */
-protected void setUp() throws Exception {
-	assertNotNull("Workspace was not setup", getWorkspace());
-	if (EclipseTestHarnessApplication.deltasEnabled() && deltaListener == null) {
-		deltaListener = new DeltaDebugListener();
-		getWorkspace().addResourceChangeListener(deltaListener);
-	}
-}
-/**
- * Returns the test suite for this test class.
- */
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	return suite;
-}
-/**
- * Copy the data from the input stream to the output stream.
- * Close both streams when finished.
- */
-public void transferData(InputStream input, OutputStream output) {
-	try {
-		try {
-			int c = 0;
-			while ((c = input.read()) != -1) {
-				output.write(c);
-			}
-		} finally {
-			input.close();
-			output.close();
-		}
-	} catch (IOException e) {
-		e.printStackTrace();
-		assertTrue(e.toString(), false);
-	}
-}
-/**
- * Copy the data from the input stream to the output stream.
- * Do not close either of the streams.
- */
-public void transferDataWithoutClose(InputStream input, OutputStream output) {
-	try {
-		int c = 0;
-		while ((c = input.read()) != -1) {
-			output.write(c);
-		}
-	} catch (IOException e) {
-		e.printStackTrace();
-		assertTrue(e.toString(), false);
-	}
-}
-/**
- * Log messages if we are in debug mode.
- */
-public static void log(String message) {
-	String id = "org.eclipse.core.tests.harness";
-	Plugin plugin = Platform.getPlugin(id);
-	if (plugin.isDebugging())
-		System.out.println(message);
-}
-protected void tearDown() throws Exception {
-	super.tearDown();
-	// Ensure everything is in a clean state for next one.
-	// Session tests should overwrite it.
-	ensureDoesNotExistInWorkspace(getWorkspace().getRoot());
-	getWorkspace().save(true, null);
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/ExampleTest.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/ExampleTest.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/ExampleTest.java
deleted file mode 100644
index b05bda4..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/ExampleTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.Arrays;
-import java.util.Comparator;
-
-import junit.framework.*;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * Tests which use the Eclipse Platform runtime only.
- */
-public class ExampleTest extends TestCase {
-/**
- * Need a zero argument constructor to satisfy the test harness.
- * This constructor should not do any real work nor should it be
- * called by user code.
- */
-public ExampleTest() {
-	super(null);
-}
-public ExampleTest(String name) {
-	super(name);
-}
-public static Test suite() {
-	return new TestSuite(ExampleTest.class);
-}
-public void testPluginRegistry() throws Throwable {
-	System.out.println();
-	IPluginDescriptor[] descriptors = Platform.getPluginRegistry().getPluginDescriptors();
-	Comparator c = new Comparator() {
-		public int compare(Object a, Object b) {
-			return ((IPluginDescriptor) a).getLabel().compareTo(((IPluginDescriptor) b).getLabel());
-		}
-	};
-	Arrays.sort(descriptors, c);
-	for (int i = 0; i < descriptors.length; i++) {
-		IPluginDescriptor descriptor = descriptors[i];
-		System.out.print(descriptor.isPluginActivated() ? "+\t" : "-\t");
-		System.out.println(descriptor.getLabel() + " (" + descriptor.getUniqueIdentifier() + ") [" + descriptor.getVersionIdentifier() + "]");
-	}
-}
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/ExampleWorkspaceTest.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/ExampleWorkspaceTest.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/ExampleWorkspaceTest.java
deleted file mode 100644
index c671ef5..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/ExampleWorkspaceTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.InputStream;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-
-/**
- * Tests which use the Eclipse Platform workspace.
- */
-public class ExampleWorkspaceTest extends EclipseWorkspaceTest {
-/**
- * Need a zero argument constructor to satisfy the test harness.
- * This constructor should not do any real work nor should it be
- * called by user code.
- */
-public ExampleWorkspaceTest() {
-	super();
-}
-public ExampleWorkspaceTest(String name) {
-	super(name);
-}
-protected IProject getTestProject() {
-	return getWorkspace().getRoot().getProject("testProject");
-}
-/**
- * Returns the test suite for this test class.
- */
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ExampleWorkspaceTest("testProjectCreation"));
-	suite.addTest(new ExampleWorkspaceTest("testFolderCreation"));
-	suite.addTest(new ExampleWorkspaceTest("testFileCreation"));
-	suite.addTest(new ExampleWorkspaceTest("testFileInFolderCreation"));
-	suite.addTest(new ExampleWorkspaceTest("testSetContents"));
-	suite.addTest(new ExampleWorkspaceTest("testFileOverFolder"));
-	suite.addTest(new ExampleWorkspaceTest("testFolderOverFile"));
-	suite.addTest(new ExampleWorkspaceTest("testFolderDeletion"));
-	suite.addTest(new ExampleWorkspaceTest("testFileDeletion"));
-	suite.addTest(new ExampleWorkspaceTest("testProjectDeletion"));
-	return suite;
-}
-public void testFileCreation() throws Throwable {
-	IFile target = getTestProject().getFile("testFile");
-	target.create(null, true, getMonitor());
-	assertTrue(target.exists());
-}
-public void testFileDeletion() throws Throwable {
-	IFile target = getTestProject().getFile("testFileForDelete");
-	target.create(null, true, getMonitor());
-	assertTrue(target.exists());
-	target.delete(true, getMonitor());
-	assertTrue(!target.exists());
-}
-public void testFileInFolderCreation() throws Throwable {
-	IFile target = getTestProject().getFile(new Path("testFolder/testFile2"));
-	target.create(getRandomContents(), true, getMonitor());
-	assertTrue(target.exists());
-}
-public void testFileOverFolder() throws Throwable {
-	IFolder existing = getTestProject().getFolder("testFolder");
-	assertTrue(existing.exists());
-	IFile target = getWorkspace().getRoot().getFile(existing.getFullPath());
-	try {
-		target.create(null, true, getMonitor());
-	} catch (CoreException e) {
-		assertTrue(existing.exists());
-		return;
-	}
-	fail("Should not be able to create file over folder");
-}
-public void testFolderCreation() throws Throwable {
-	IFolder target = getTestProject().getFolder("testFolder");
-	target.create(true, true, getMonitor());
-	assertTrue(target.exists());
-}
-public void testFolderDeletion() throws Throwable {
-	IProject project = getTestProject();
-	IResource[] before = buildResources(project, new String[] {"c/", "c/b/", "c/x", "c/b/y", "c/b/z"});
-	ensureExistsInWorkspace(before, true);
-	//
-	assertExistsInWorkspace(before);
-	project.getFolder("c").delete(true, getMonitor());
-	assertDoesNotExistInWorkspace(before);
-}
-public void testFolderOverFile() throws Throwable {
-	IFile existing = getTestProject().getFile("testFile");
-	assertTrue(existing.exists());
-	IFolder target = getWorkspace().getRoot().getFolder(existing.getFullPath());
-	try {
-		target.create(true, true, getMonitor());
-	} catch (CoreException e) {
-		assertTrue(existing.exists());
-		return;
-	}
-	fail("Should not be able to create folder over a file");
-}
-public void testProjectCreation() throws Throwable {
-	IProject target = getTestProject();
-	target.create(null, getMonitor());
-	assertTrue(target.exists());
-	target.open(getMonitor());
-	assertTrue(target.isOpen());
-}
-public void testProjectDeletion() throws Throwable {
-	IProject target = getTestProject();
-	target.delete(true, getMonitor());
-	assertTrue("Project Deletion failed", !target.exists());
-}
-public void testSetContents() throws Throwable {
-	IFile target = getTestProject().getFile("testFile");
-	String testString = getRandomString();
-	target.setContents(getContents(testString), true, false, getMonitor());
-	InputStream content = null;
-	try {
-		content = target.getContents();
-		assertTrue("get not equal set", compareContent(content, getContents(testString)));
-	} finally {
-		content.close();
-	}
-}
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java
deleted file mode 100644
index 3159240..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FussyProgressMonitor.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import junit.framework.AssertionFailedError;
-
-/**
- * This class can be used for testing progress monitoring.
- * If you want to reuse one instance of this class for several
- * invocations, make sure that you call prepare() before every
- * invocation.
- * Call sanityCheck() after the operation whose progress monitoring
- * you are testing.
- */
-
-public class FussyProgressMonitor extends TestProgressMonitor {
-	private static final double EPS_FACTOR = 0.01;
-	private String taskName;
-	private int totalWork;
-	private double workedSoFar = 0;
-	private boolean beginTaskCalled = false;
-	private long beginTime;
-	private static final long NOTICEABLE_DELAY = 1000; // milliseconds
-	private int doneCalls = 0;
-	private boolean sanityCheckCalled = true;
-	private boolean hasFailed = false;
-	public class FussyProgressAssertionFailed extends AssertionFailedError {
-		FussyProgressAssertionFailed(String name) {
-			super(name);
-		}
-	}
-public FussyProgressMonitor() {
-	prepare();
-}
-/**
- * 
- * @param reason java.lang.String
- * @param condition boolean
- */
-private void assert(String reason, boolean condition) {
-	// silently ignore follow-up failures
-	if (hasFailed)
-		return;
-	if (!condition) {
-		hasFailed = true;
-		throw new FussyProgressAssertionFailed(reason);
-	}
-	//Assert.assert(reason, condition);
-}
-/**
- * @see IProgressMonitor#beginTask
- */
-public void beginTask(String name, int totalWork) {
-	//if (beginTaskCalled && doneCalls > 0) {
-		// this is a second call to beginTask which is allowed because
-		// the previous task is done.
-		//prepare();
-	//}
-	assert("beginTask may only be called once (old name=" + taskName + ")", beginTaskCalled == false);
-	beginTaskCalled = true;
-	taskName = name;
-	assert("total work must be positive or UNKNOWN", totalWork > 0 || totalWork == UNKNOWN);
-	this.totalWork = totalWork;
-}
-/**
- * @see IProgressMonitor#done
- */
-public void done() {
-	assert("done must be called after beginTask", beginTaskCalled);
-	assert("done can only be called once", doneCalls==0);
-	//assert("done is called before all work is done", totalWork==UNKNOWN || totalWork==workedSoFar);
-	workedSoFar = totalWork;
-	doneCalls++;
-}
-public void internalWorked(double work) {
-	assert("can accept calls to worked/internalWorked only after beginTask", beginTaskCalled);
-	assert("can accept calls to worked/internalWorked only before done is called", doneCalls == 0);
-	assert("amount worked should be positive, not " + work, work >= 0);
-	if(work==0) EclipseWorkspaceTest.log("INFO: amount worked should be positive, not " + work);
-	workedSoFar += work;
-	assert("worked " + (workedSoFar - totalWork) + " more than totalWork", totalWork == UNKNOWN || workedSoFar <= totalWork + (totalWork * EPS_FACTOR));
-}
-/**
- * @see IProgressMonitor#isCanceled
- */
-public boolean isCanceled() {
-	return false;
-}
-/**
- * should be called before every use of a FussyProgressMonitor
- */
-public void prepare() {
-	//if (!sanityCheckCalled)
-	//EclipseWorkspaceTest.log("sanityCheck has not been called for previous use");
-	sanityCheckCalled = false;
-	taskName = null;
-	totalWork = 0;
-	workedSoFar = 0;
-	beginTaskCalled = false;
-	doneCalls = 0;
-	hasFailed = false;
-	beginTime = System.currentTimeMillis();
-}
-/**
- *  should be called after every use of a FussyProgressMonitor
- */
-public void sanityCheck() {
-	if (sanityCheckCalled)
-		EclipseWorkspaceTest.log("sanityCheck has already been called");
-	sanityCheckCalled = true;
-//	EclipseWorkspaceTest.log("sanity checking: " + taskName + " : " + (System.currentTimeMillis() - beginTime) + " ms, " + workedSoFar);
-	if (System.currentTimeMillis() - beginTime > NOTICEABLE_DELAY) {
-		assert("this operation took a long time, it should report progress", workedSoFar > 0);
-	}
-	assert("done has not been called on ProgressMonitor", hasFailed || !beginTaskCalled || doneCalls > 0);
-}
-/**
- * @see IProgressMonitor#setCanceled
- */
-public void setCanceled(boolean b) {
-	assert("1FV0BJL: Who might be calling this method?", false);
-}
-/**
- * @see IProgressMonitor#setTaskName
- */
-public void setTaskName(String name) {
-	taskName = name;
-}
-/**
- * @see IProgressMonitor#subTask
- */
-public void subTask(String name) {
-	// do nothing
-}
-/**
- * @see IProgressMonitor#worked
- */
-public void worked(int work) {
-	internalWorked(work);
-}
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/LoggingPerformanceTestResult.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/LoggingPerformanceTestResult.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/LoggingPerformanceTestResult.java
deleted file mode 100644
index 426ae25..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/LoggingPerformanceTestResult.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.*;
-import java.util.Enumeration;
-
-import junit.framework.TestFailure;
-/**
- * A LoggingPerformanceTestResult adds the ability to create an HTML or
- * other output file, and have test results written to that file instead
- * of the standard output.
- */
-public class LoggingPerformanceTestResult extends PerformanceTestResult {
-	PrintWriter fLog;
-/**
- * LoggingPerformanceTestResult constructor comment.
- */
-public LoggingPerformanceTestResult(File logFile) {
-	super();
-	try {
-		fLog = new PrintWriter(new FileOutputStream(logFile));
-		printHTMLHeader(fLog);
-	} catch (IOException e) {
-		System.out.println("Unable to open log output file: " + logFile);
-		fLog = new PrintWriter(System.out);
-	}
-}
-	/**
-	 * Logs the given string in the test log file
-	 */
-	public synchronized void log(String s) {
-		fLog.println(s);
-	}
-	/**
-	 * Prints the test result
-	 */
-	public synchronized void print() {
-		stopTimers();
-		printHeader(fLog);
-		printTimings(fLog);
-		printErrors(fLog);
-		printHTMLTrailer(fLog);
-	}
-/**
- * Prints the errors to the standard output
- */
-protected void printErrors(PrintWriter out) {
-	out.println("<h3>Error summary</h3>");
-	int count = errorCount();
-	if (count != 0) {
-		if (count == 1)
-			out.println("There was " + count + " error:<p>");
-		else
-			out.println("There were " + count + " errors:<p>");
-		int i = 1;
-		for (Enumeration e = errors(); e.hasMoreElements(); i++) {
-			TestFailure failure = (TestFailure) e.nextElement();
-			out.println(i + ") " + failure.failedTest() + "<p>");
-			failure.thrownException().printStackTrace();
-			out.println("<p>");
-		}
-	} else {
-		out.println("No errors reported.");
-	}
-}
-	/**
-	 * Prints the header of the report
-	 */
-	protected void printHeader(PrintWriter out) {
-	}
-	/**
-	 * Prints the header of the report
-	 */
-	protected void printHTMLHeader(PrintWriter out) {
-		StringBuffer buf = new StringBuffer();
-		buf.append("<html>\n<head>\n<title>Leapfrog Performance Test Output Page</title>");
-		buf.append("<author>AutoGen imagebuilder.tests.LoggingPerformanceTestResult</author>\n");
-		buf.append("</head>\n<body>\n");
-		out.println(buf.toString());
-	}
-	/**
-	 * Prints the header of the report
-	 */
-	protected void printHTMLTrailer(PrintWriter out) {
-		out.println("</body>");
-		out.println("</html>");
-	}
-	/**
-	 * Prints the timings of the result.
-	 */
-
-	protected void printTimings(PrintWriter out) {
-		out.println("<h3>Timing summary</h3>");
-		out.println("<ul>");
-		
-		// print out all timing results to the console
-		Enumeration enum = fTimerList.elements();
-		while (enum.hasMoreElements()) {
-			PerformanceTimer timer = (PerformanceTimer)enum.nextElement();
-			out.println("<li>" + timer.getName() + " : " + timer.getElapsedTime() + " ms</li>");
-		}
-		out.println("</ul>");
-	}
-/**
- * Start the timer with the given name.  If the timer has already
- * been created, send it a startTiming message.  If not, create it
- * and send the new timer the startTiming message.
- */
-
- public synchronized void startTimer(String timerName) {
-	super.startTimer(timerName);
-	//log("Starting timer: " + timerName);
- } 
-/**
- * Look up the timer with the given name and send it a stopTiming
- * message.  If the timer does not exist, report an error.
- */
-
- public synchronized void stopTimer(String timerName) {
-	super.stopTimer(timerName);
-	//log("Stopping timer: " + timerName);
- } 
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTestResult.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTestResult.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTestResult.java
deleted file mode 100644
index 2c4c597..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTestResult.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.io.PrintStream;
-import java.util.*;
-
-import junit.framework.*;
-
-/**
- * Test result for a performance test.  Keeps track of all timers that
- * have been created within the test. 
- */
-
-public class PerformanceTestResult extends TestResult {
-	Hashtable fTimers = new Hashtable();
-	Vector fTimerList = new Vector();
-/**
- * PerformanceTestResult constructor comment.
- */
-public PerformanceTestResult() {
-	super();
-}
-/**
- * Informs the result that a test was completed.
- */
-public synchronized void endTest(Test test) {
-	print();
-}
-/**
- * Prints the test result
- */
-
-
-public synchronized void print() {
-	stopTimers();
-	printHeader(System.out);
-	printErrors(System.out);
-	printTimings(System.out);
-}
-/**
- * Prints the errors to the standard output
- */
-protected void printErrors(PrintStream out) {
-	int count = errorCount();
-	if (count != 0) {
-		if (count == 1)
-			out.println("There was " + count + " error:");
-		else
-			out.println("There were " + count + " errors:");
-		int i = 1;
-		for (Enumeration e = errors(); e.hasMoreElements(); i++) {
-			TestFailure failure = (TestFailure) e.nextElement();
-			out.println(i + ") " + failure.failedTest());
-			failure.thrownException().printStackTrace();
-		}
-	}
-}
-/**
- * Prints the header of the report
- */
-protected void printHeader(PrintStream out) {
-	if (wasSuccessful()) {
-		out.println();
-		out.print("OK");
-		out.println(" (" + runCount() + " tests)");
-	} else {
-		out.println();
-		out.println("!!!FAILURES!!!");
-		out.println("Test Results:");
-		out.println("Run: " + runCount() + " Failures: " + failureCount() + " Errors: " + errorCount());
-	}
-}
-	/**
-	 * Prints the timings of the result.
-	 */
-
-	protected void printTimings(PrintStream out) {
-		
-		// print out all timing results to the console
-		Enumeration enum = fTimerList.elements();
-		while (enum.hasMoreElements()) {
-			PerformanceTimer timer = (PerformanceTimer)enum.nextElement();
-			out.println("Timing " + timer.getName() + " : " + timer.getElapsedTime() + " ms ");
-		}
-	}
-/**
- * Start the test
- */
-
-public synchronized void startTest(Test test) {
-	super.startTest(test);
-	System.out.print(".");
-}
-/**
- * Start the timer with the given name.  If the timer has already
- * been created, send it a startTiming message.  If not, create it
- * and send the new timer the startTiming message.
- */
-
- public synchronized void startTimer(String timerName) {
-	PerformanceTimer timer = (PerformanceTimer) fTimers.get(timerName);
-	if( timer == null) {
-		timer = new PerformanceTimer(timerName);
-		fTimers.put(timerName, timer);
-		fTimerList.addElement(timer);
-	}
-	timer.startTiming();
- } 
-/**
- * Look up the timer with the given name and send it a stopTiming
- * message.  If the timer does not exist, report an error.
- */
-
- public synchronized void stopTimer(String timerName) {
-	PerformanceTimer timer = (PerformanceTimer) fTimers.get(timerName);
-	if (timer == null) {
-		throw new Error(timerName + " is not a valid timer name ");
-	}
-	timer.stopTiming();
- } 
-	/**
-	 * Stops all timers
-	 */
-
-	protected void stopTimers() {
-
-		Enumeration enum = fTimerList.elements();
-		PerformanceTimer timer = null;
-
-		while (enum.hasMoreElements()) {
-			((PerformanceTimer) enum.nextElement()).stopTiming();
-		}	
-	}
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTimer.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTimer.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTimer.java
deleted file mode 100644
index 0682671..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/PerformanceTimer.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import java.util.*;
-
-/**
- * The timer class used by performance tests.
- */
-
-class PerformanceTimer {
-	private String fName;
-	private long fElapsedTime;
-	private long fStartTime;
-/**
- * 
- */
-public PerformanceTimer(String name) {
-	fName = name;
-	fElapsedTime = 0;
-	fStartTime = 0;
-}
-/**
- * Return the elapsed time.
- */
-public long getElapsedTime() {
-	return fElapsedTime;
-}
-/**
- * Return the timer name.
- */
-public String getName() {
-	return fName;
-}
-/**
- * Start the timer.
- */
-public void startTiming() {
-	fStartTime = System.currentTimeMillis();
-}
-/**
- * Stop the timer, add the elapsed time to the total.
- */
-public void stopTiming() {
-	if (fStartTime == 0) return;
-	long timeNow = System.currentTimeMillis();
-	fElapsedTime += (timeNow - fStartTime);
-	fStartTime = 0;
-}
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/SessionTestApplication.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/SessionTestApplication.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/SessionTestApplication.java
deleted file mode 100644
index aab6fca..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/SessionTestApplication.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-/**
- * Harness for running eclipse workspace session tests.  See the class comments in 
- * the class WorkspaceSessionTest for more information.
- */
-public class SessionTestApplication extends EclipseTestHarnessApplication {
-/**
- * Test names can have two forms:
- * 1) Unqualified test ID -> Run the suite method for that test class
- * 2) Qualified ID + method name -> Run the single test method with the given name.
- */
-protected Object run(String testName) throws Exception {
-	if (testName.indexOf('#') == -1) {
-		return super.run(testName);
-	} else {
-		return runSingleTest(testName);
-	}
-}
-/**
- * Runs a single test method of the given test class.
- * The test method is supplied after the '#' in the test name.
- */
-protected Object runSingleTest(String testName) throws Exception {
-	int hash = testName.indexOf('#');
-	String testID = testName.substring(0, hash);
-	String testMethod = testName.substring(hash+1);
-	
-	Object testClass = findTestFor(testID);
-	if (testClass == null) {
-		return null;
-	}
-	if (!(testClass instanceof TestCase)) {
-		System.out.println("Session tests must conform to the TestCase interface: " + testClass);
-		return null;
-	}
-	TestCase testCase = (TestCase)testClass;
-	testCase.setName(testMethod);
-	run(testCase);
-	return null;
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/TestProgressMonitor.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/TestProgressMonitor.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/TestProgressMonitor.java
deleted file mode 100644
index cb98068..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/TestProgressMonitor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.core.tests.harness;
-
-/*
- * (c) Copyright IBM Corp. 2000, 2001.
- * All Rights Reserved.
- */
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public abstract class TestProgressMonitor implements IProgressMonitor {
-/**
- * @see IProgressMonitor#beginTask
- */
-public void beginTask(String name, int totalWork) {
-}
-/**
- * @see IProgressMonitor#done
- */
-public void done() {
-}
-public void internalWorked(double work) {
-}
-/**
- * @see IProgressMonitor#isCanceled
- */
-public boolean isCanceled() {
-	return false;
-}
-/**
- * @see IProgressMonitor#setCanceled
- */
-public void setCanceled(boolean b) {
-}
-/**
- * @see IProgressMonitor#setTaskName
- */
-public void setTaskName(String name) {
-}
-/**
- * @see IProgressMonitor#subTask
- */
-public void subTask(String name) {
-}
-/**
- * @see IProgressMonitor#worked
- */
-public void worked(int work) {
-}
-}

tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/WorkspaceSessionTest.java

diff --git a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/WorkspaceSessionTest.java b/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/WorkspaceSessionTest.java
deleted file mode 100644
index ba68e45..0000000
--- a/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/WorkspaceSessionTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.harness;
-
-import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-/**
- * Workspace session tests function as follows:  Each test class looks like a typical JUnit test,
- * except the platform is shutdown and restarted after each test method.  The steps for each
- * test method are:
- *  - startup the platform
- *  - run setUp
- *  - run the test method
- *  - run tearDown
- *  - shutdown the platform
- * 
- * Tests are run according to the natural order of their method names.  This is the
- * partial ordering defined by the String.compareTo() operation.  Each test method
- * must begin with the prefix "test", and have no parameters (thus overloading is
- * not supported).
- * 
- * After all test methods in the class have been run, the platform location is deleted.
- * This way, each test class plays like a series of related operations on the same
- * workspace, with each operation running in a separate platform instance.
- * 
- * The class SessionTestLauncher acts as a harness for running the tests.  Each string
- * passed to the main method of SessionTestLauncher represents a separate fully-qualified 
- * session test class name.  There must be a corresponding test ID in some XML file that exactly
- * matches the fully qualified class name.
- */
-public class WorkspaceSessionTest extends EclipseWorkspaceTest {
-	protected String testName;
-
-/**
- * Constructor for WorkspaceSessionTest.
- */
-public WorkspaceSessionTest() {
-	super();
-}
-
-/**
- * Constructor for WorkspaceSessionTest.
- * @param name
- */
-public WorkspaceSessionTest(String name) {
-	super(name);
-}
-
-protected void tearDown() throws Exception {
-	// We should not run super.tearDown() on session tests.
-	// If needed, we should call it explicitly.
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.harness/test.xml

diff --git a/tests/org.eclipse.core.tests.harness/test.xml b/tests/org.eclipse.core.tests.harness/test.xml
deleted file mode 100644
index ca979f1..0000000
--- a/tests/org.eclipse.core.tests.harness/test.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0"?>
-<project name="Core Resources Automated Tests" default="run" basedir=".">
-
-  <!-- The property ${eclipse-home} should be passed into this script -->
-  <!-- sets the properties eclipse-home, and library-file -->
-  <property name="eclipse-home" value="${basedir}/../../"/>
-  <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-  <property name="location" value="${eclipse-home}/core_sniff_folder"/>
-
-  <!-- This target holds all initialization code that needs to be done for -->
-  <!-- all tests that are to be run. Initialization for individual tests -->
-  <!-- should be done within the body of the suite target. -->
-  <target name="init">
-    <tstamp/>
-  </target>
-
-  <!-- This target holds code to cleanup the testing environment after the tests -->
-  <!-- have been run. You can use this to delete temporary files that are created. -->
-  <target name="cleanup">
-    <delete dir="${location}" quiet="true"/>
-  </target>
-
-  <!-- This target runs the test suite. Any actions that need to happen after all -->
-  <!-- the tests have been run should go here. -->
-  <target name="run" depends="init,suite,cleanup">
-    <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="includes" value="org*.xml"/>
-      <property name="output-file" value="org.eclipse.core.tests.xml"/>
-    </ant>
-  </target>
-
-  <target name="ResourcesTests" depends="init,cleanup">
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.AutomatedTests"/>
-    </ant>
-  </target>
-
-  <target name="PR_1G1N9GZ_SessionTests" depends="init,cleanup">
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.regression.PR_1G1N9GZ_1Test"/>
-    </ant>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.regression.PR_1G1N9GZ_2Test"/>
-    </ant>
-  </target>
-
-  <target name="PR_1GALH44_SessionTests" depends="init,cleanup">
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.regression.PR_1GALH44_1Test"/>
-    </ant>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.regression.PR_1GALH44_2Test"/>
-    </ant>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.regression.PR_1GALH44_3Test"/>
-    </ant>
-  </target>
-
-  <target name="Snapshot_SessionTests" depends="init,cleanup">
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.usecase.Snapshot1Test"/>
-    </ant>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.usecase.Snapshot2Test"/>
-    </ant>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.usecase.Snapshot3Test"/>
-    </ant>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.usecase.Snapshot4Test"/>
-    </ant>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.usecase.Snapshot5Test"/>
-    </ant>
-  </target>
-
-  <target name="SaveManager_SessionTests" depends="init,cleanup">
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources.saveparticipant"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.saveparticipant.SaveManager1Test"/>
-    </ant>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources.saveparticipant"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.saveparticipant.SaveManager2Test"/>
-    </ant>
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.resources.saveparticipant"/>
-      <property name="classname" value="org.eclipse.core.tests.resources.saveparticipant.SaveManager3Test"/>
-    </ant>
-  </target>
-
-  <target name="RuntimeTests" depends="init,cleanup">
-    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location}"/>
-      <property name="plugin-name" value="org.eclipse.core.tests.runtime"/>
-      <property name="classname" value="org.eclipse.core.tests.runtime.AutomatedTests"/>
-    </ant>
-  </target>
-
-  <!-- This target defines the tests that need to be run. -->
-  <target name="suite" depends="ResourcesTests,RuntimeTests"/>
-  <!--target name="suite" depends="ResourcesTests,RuntimeTests,PR_1G1N9GZ_SessionTests,PR_1GALH44_SessionTests,Snapshot_SessionTests,SaveManager_SessionTests"/-->
- </project>
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/.classpath

diff --git a/tests/org.eclipse.core.tests.runtime/.classpath b/tests/org.eclipse.core.tests.runtime/.classpath
deleted file mode 100644
index 2bda792..0000000
--- a/tests/org.eclipse.core.tests.runtime/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
-    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
-    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
-    <classpathentry kind="src" path="/org.eclipse.core.tests.harness"/>
-    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="/org.apache.xerces"/>
-    <classpathentry kind="src" path="/org.junit"/>
-    <classpathentry kind="output" path="bin"/>
-</classpath>

tests/org.eclipse.core.tests.runtime/.cvsignore

diff --git a/tests/org.eclipse.core.tests.runtime/.cvsignore b/tests/org.eclipse.core.tests.runtime/.cvsignore
deleted file mode 100644
index c5e82d7..0000000
--- a/tests/org.eclipse.core.tests.runtime/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/.project

diff --git a/tests/org.eclipse.core.tests.runtime/.project b/tests/org.eclipse.core.tests.runtime/.project
deleted file mode 100644
index ded4722..0000000
--- a/tests/org.eclipse.core.tests.runtime/.project
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.core.tests.runtime</name>
-	<comment></comment>
-	<projects>
-		<project>org.apache.xerces</project>
-		<project>org.eclipse.core.boot</project>
-		<project>org.eclipse.core.resources</project>
-		<project>org.eclipse.core.runtime</project>
-		<project>org.eclipse.core.tests.harness</project>
-		<project>org.junit</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.team.cvs.core.cvsnature</nature>
-	</natures>
-</projectDescription>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/.plugin-path
deleted file mode 100644
index 49b86e0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/.plugin-path
+++ /dev/null
@@ -1,2 +0,0 @@
-base=file:c:/20011219/eclipse/plugins/

-test=file:c:/LibraryLookupTests/JarLookupTests/
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest1/plugin.xml
deleted file mode 100644
index 9904fc2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest1/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="%pluginName"
-  id="JarLookupTest1"
-  version="1.0.0"
-  provider-name="Object Technology International, Inc.">
-
-  <runtime>
-      <library name="$ws$/jarLookupTest1.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest1/ws/win32/jarLookupTest1.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest1/ws/win32/jarLookupTest1.jar b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest1/ws/win32/jarLookupTest1.jar
deleted file mode 100644
index 6e2a578..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest1/ws/win32/jarLookupTest1.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest2/jarLookupTest2.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest2/jarLookupTest2.jar b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest2/jarLookupTest2.jar
deleted file mode 100644
index db48b65..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest2/jarLookupTest2.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest2/plugin.xml
deleted file mode 100644
index e2b06ef..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest2/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="%pluginName"
-  id="JarLookupTest2"
-  version="1.0.0"
-  provider-name="Object Technology International, Inc.">
-
-  <runtime>
-      <library name="$ws$/jarLookupTest2.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest3/plugin.xml
deleted file mode 100644
index 8f8e5ac..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest3/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="%pluginName"
-  id="JarLookupTest3"
-  version="1.0.0"
-  provider-name="Object Technology International, Inc.">
-
-  <runtime>
-      <library name="$ws$/jarLookupTest3.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest3/ws/jarLookupTest3.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest3/ws/jarLookupTest3.jar b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest3/ws/jarLookupTest3.jar
deleted file mode 100644
index e38f718..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest3/ws/jarLookupTest3.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest4/os/win32/x86/jarLookupTest4.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest4/os/win32/x86/jarLookupTest4.jar b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest4/os/win32/x86/jarLookupTest4.jar
deleted file mode 100644
index b773ebb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest4/os/win32/x86/jarLookupTest4.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest4/plugin.xml
deleted file mode 100644
index 524c9f6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/LibraryLookupTests/JarLookupTests/jarLookupTest4/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="%pluginName"
-  id="JarLookupTest4"
-  version="1.0.0"
-  provider-name="Object Technology International, Inc.">
-
-  <runtime>
-      <library name="$os$/jarLookupTest4.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/PR1GHFPFY.txt

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/PR1GHFPFY.txt b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/PR1GHFPFY.txt
deleted file mode 100644
index 18f4088..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/PR1GHFPFY.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-1GHFPFY: ITPCORE:ALL - fragment runtime libs added twice
-
-PRODUCT VERSION:
-0.9
-
-DESCRIPTION:
-
-When you have a runtime statement in a fragment, the library is added to the base plugin twice.
-
-NOTES:
-
-DDW (26/07/2001 11:32:17 AM)
-	RegistryResolver was adding any fragment element to the relevant plugin twice (see
-	resolvePluginRegistry).  Fixed in 1.0 and current development stream.
-=======================================

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionPointTest/fragment/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionPointTest/fragment/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionPointTest/fragment/plugin.xml
deleted file mode 100644
index 6ad2111..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionPointTest/fragment/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="PR1GHFPFY Fragment Test"
-  id="PR1GHFPFYFragmentTest"
-  plugin-id="PR1GHFPFYPluginTest"
-  version="1.2"
-  plugin-version="1.2"
-  vendor-name="OTI">
-
-  <extension-point id="xpt3" name="Thirdextension point"/>
-  <extension-point id="xpt4" name="Fourth extension point"/>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionPointTest/plugin/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionPointTest/plugin/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionPointTest/plugin/plugin.xml
deleted file mode 100644
index c0bbed4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionPointTest/plugin/plugin.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="PR1GHFPFY Plugin Test"
-  id="PR1GHFPFYPluginTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension-point id="xpt1" name="First extension point"/>
-  <extension-point id="xpt2" name="Second extension point"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionTest/fragment/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionTest/fragment/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionTest/fragment/plugin.xml
deleted file mode 100644
index d025bf3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionTest/fragment/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="PR1GHFPFY Fragment Test"
-  id="PR1GHFPFYFragmentTest"
-  plugin-id="PR1GHFPFYPluginTest"
-  version="1.2"
-  plugin-version="1.2"
-  vendor-name="OTI">
-
-  <extension id="x3" name="Third extension" point="xpt4"/>
-  <extension id="x4" name="Fourth extension" point="xpt3"/>
-
-  <extension-point id="xpt3" name="Thirdextension point"/>
-  <extension-point id="xpt4" name="Fourth extension point"/>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionTest/plugin/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionTest/plugin/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionTest/plugin/plugin.xml
deleted file mode 100644
index d87d9fd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/extensionTest/plugin/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="PR1GHFPFY Plugin Test"
-  id="PR1GHFPFYPluginTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension id="x1" name="First extension" point="xpt1"/>
-  <extension id="x2" name="Second extension" point="xpt2"/>
-
-  <extension-point id="xpt1" name="First extension point"/>
-  <extension-point id="xpt2" name="Second extension point"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/libraryTest/fragment/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/libraryTest/fragment/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/libraryTest/fragment/plugin.xml
deleted file mode 100644
index 7b3c731..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/libraryTest/fragment/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="PR1GHFPFY Fragment Test"
-  id="PR1GHFPFYFragmentTest"
-  plugin-id="PR1GHFPFYPluginTest"
-  version="1.2"
-  plugin-version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-     </library>
-     <library name="lib4.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/libraryTest/plugin/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/libraryTest/plugin/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/libraryTest/plugin/plugin.xml
deleted file mode 100644
index e6c3798..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/libraryTest/plugin/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="PR1GHFPFY Plugin Test"
-  id="PR1GHFPFYPluginTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar">
-        <export name="a.b.C"/>
-     </library>
-     <library name="lib2.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/fragment/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/fragment/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/fragment/plugin.xml
deleted file mode 100644
index 5ed624e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/fragment/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="PR1GHFPFY Fragment Test"
-  id="PR1GHFPFYFragmentTest"
-  plugin-id="PR1GHFPFYPluginTest"
-  version="1.2"
-  plugin-version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="testc"/>
-     <import plugin="testd" version="1.0.0"/>
-  </requires>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/plugin/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/plugin/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/plugin/plugin.xml
deleted file mode 100644
index 53e949a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/plugin/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="PR1GHFPFY Plugin Test"
-  id="PR1GHFPFYPluginTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="testa"/>
-     <import plugin="testb" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testa/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testa/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testa/plugin.xml
deleted file mode 100644
index 472b689..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testa/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test A"
-  id="testa"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testb/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testb/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testb/plugin.xml
deleted file mode 100644
index 58f769f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testb/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test B"
-  id="testb"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testc/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testc/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testc/plugin.xml
deleted file mode 100644
index 93fff08..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testc/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test C"
-  id="testc"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testd/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testd/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testd/plugin.xml
deleted file mode 100644
index c1016e5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHFPFYTest/requiresTest/testd/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test D"
-  id="testd"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/PR1GHH81D.txt

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/PR1GHH81D.txt b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/PR1GHH81D.txt
deleted file mode 100644
index 6d06e7b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/PR1GHH81D.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-1GHH81D: ITPCORE:WIN2000 - Multiple versions of fragments not handled properly
-
-PRODUCT VERSION:
-0.9
-
-DESCRIPTION:
-If you have muliple fragments with the same id but each with a different version number, we will
-non-deterministically pick one of these fragments to augment the related plugin.
-
-NOTES:
-
-=======================================

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment1.xml
deleted file mode 100644
index b1cf67d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment1.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="PR1GHH81D Fragment Test"
-  id="PR1GHH81DFragmentTest"
-  plugin-id="PR1GHH81DPluginTest"
-  version="1.2"
-  plugin-version="1.2">
-
-  <runtime>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-     </library>
-     <library name="lib4.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment2.xml
deleted file mode 100644
index 7a200e4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment2.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="PR1GHH81D Fragment Test"
-  id="PR1GHH81DFragmentTest"
-  plugin-id="PR1GHH81DPluginTest"
-  version="1.8"
-  plugin-version="1.2">
-
-  <runtime>
-     <library name="lib5.jar">
-        <export name="a.b.C"/>
-     </library>
-     <library name="lib6.jar"/>
-     <library name="lib7.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment3.xml
deleted file mode 100644
index 9e8b5f8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="PR1GHH81D Fragment Test"
-  id="PR1GHH81DFragmentTest"
-  plugin-id="PR1GHH81DPluginTest"
-  version="1.0"
-  plugin-version="1.2">
-
-  <runtime>
-     <library name="lib8.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/plugin.xml
deleted file mode 100644
index d92a2d2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/PR1GHH81DTest/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="PR1GHH81D Plugin Test"
-  id="PR1GHH81DPluginTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar">
-        <export name="a.b.C"/>
-     </library>
-     <library name="lib2.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent1AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent1AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent1AttributesTest.xml
deleted file mode 100644
index 025be0b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent1AttributesTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component
-  name="Bad Component 1 Attributes Test"
-  id="badComponent1AttributesTest"
-  version="1.2"
-  vendor-name="OTI"
-  a-bad-attribute="nothing">
-
-</component>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent2AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent2AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent2AttributesTest.xml
deleted file mode 100644
index 181f1c8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent2AttributesTest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component
-  name="Bad Component 2 Attributes Test"
-  id="badComponent2AttributesTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <plugin
-      name="A component plugin"
-      id="aComponentPlugin"
-      version="0.1"
-      vendor-name="OTI">
-  </plugin>
-
-</component>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent3AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent3AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent3AttributesTest.xml
deleted file mode 100644
index dcb9b5c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badComponent3AttributesTest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component
-  name="Bad Component 3 Attributes Test"
-  id="badComponent3AttributesTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <fragment
-      name="A component fragment"
-      id="aComponentFragment"
-      version="0.1"
-      vendor-name="OTI">
-  </fragment>
-
-</component>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badConfigurationAttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badConfigurationAttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badConfigurationAttributesTest.xml
deleted file mode 100644
index dc90459..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badConfigurationAttributesTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration
-  name="Bad ConfigurationAttributes Test"
-  id="badConfigurationAttributesTest"
-  version="1.2"
-  vendor-name="OTI"
-  a-bad-attribute="nothing">
-
-</configuration>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionAttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionAttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionAttributesTest.xml
deleted file mode 100644
index ef14f56..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionAttributesTest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Extension Attributes Test"
-  id="badExtensionAttributesTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension point="xpt1" id="ext1" hello="world" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionPointAttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionPointAttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionPointAttributesTest.xml
deleted file mode 100644
index 6a9268f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionPointAttributesTest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Extension Point Attributes Test"
-  id="badExtensionPointAttributesTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension-point id="xpt1" name="First extension point" bogusAttribute="nothing" schema="pde\xpt1.xml"/>
-  <extension-point id="xpt2" somethingElse="Second extension point"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionPointElementsTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionPointElementsTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionPointElementsTest.xml
deleted file mode 100644
index fde9b7c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badExtensionPointElementsTest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Extension Point Elements Test"
-  id="badExtensionPointElementsTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension-point id="xpt1" name="First extension point" schema="pde\xpt1.xml">
-    <nameless name="noname"/>
-  </extension-point>
-  <extension-point id="xpt2" somethingElse="Second extension point"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragment1AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragment1AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragment1AttributesTest.xml
deleted file mode 100644
index 686207c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragment1AttributesTest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Bad Fragment 1 Attributes Test"
-  id="badFragment1AttributesTest"
-  version="1.2"
-  vendor-name="OTI"
-  plugin-id="aPlugin"
-  plugin-version="1.1.1"
-  a-bad-attribute="nothing">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragment2AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragment2AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragment2AttributesTest.xml
deleted file mode 100644
index 7af2f05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragment2AttributesTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Bad Fragment 2 Attributes Test"
-  id="badFragment2AttributesTest"
-  version="1.2"
-  plugin-id="aPlugin"
-  plugin-version="1.1.1"
-  match="nothing">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentPluginVersionTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentPluginVersionTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentPluginVersionTest.xml
deleted file mode 100644
index 110dfe0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentPluginVersionTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Bad Fragment Plugin Version Test"
-  id="BadFragmentPluginVersionTest"
-  version="1.2.0"
-  plugin-id="aPlugin"
-  plugin-version="1.1.bad">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentVersionTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentVersionTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentVersionTest.xml
deleted file mode 100644
index a682ca1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentVersionTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Bad Fragment Version Test"
-  id="BadFragmentVersionTest"
-  version="1.2.bad"
-  plugin-id="aPlugin"
-  plugin-version="1.1.1">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentsPluginTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentsPluginTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentsPluginTest.xml
deleted file mode 100644
index ec9d274..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentsPluginTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Fragments Plugin Test"
-  id="badFragmentsPluginTest"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentsTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentsTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentsTest.xml
deleted file mode 100644
index 1c4c941..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badFragmentsTest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-   name="Bug Fragment"
-   id="badFragmentsTest"
-   version="1.0.0"
-   plugin-id="org.eclipse.not.there"
-   plugin-version="1.0.0">
-   <runtime>
-      <library name="bug.jar"/>
-   </runtime>
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary1AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary1AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary1AttributesTest.xml
deleted file mode 100644
index c823add..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary1AttributesTest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Library 1 Attributes Test"
-  id="badLibrary1AttributesTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar" badAttribute="rudeness">
-        <export name="a"/>
-        <export name="*"/>
-        <export name="b"/>
-     </library>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-        <export name="a.b.D"/>
-     </library>
-  </runtime>
-
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary1ElementsTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary1ElementsTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary1ElementsTest.xml
deleted file mode 100644
index 752d348..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary1ElementsTest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Library 1 Elements Test"
-  id="badLibrary1ElementsTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar">
-        <notAnExport name="a"/>
-        <export name="*"/>
-        <export name="b"/>
-     </library>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-        <export name="a.b.D"/>
-     </library>
-  </runtime>
-
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary2AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary2AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary2AttributesTest.xml
deleted file mode 100644
index 605ba06..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary2AttributesTest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Library 2 Attributes Test"
-  id="badLibrary2AttributesTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar">
-        <export name="a"/>
-        <export badExportAttribute="nothing"/>
-        <export name="b"/>
-     </library>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-        <export name="a.b.D"/>
-     </library>
-  </runtime>
-
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary2ElementsTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary2ElementsTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary2ElementsTest.xml
deleted file mode 100644
index 6fb4124..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary2ElementsTest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Library 2 Elements Test"
-  id="badLibrary2ElementsTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar">
-        <export name="a">
-          <badElement name="noname"/>
-        </export>
-        <export name="*"/>
-        <export name="b"/>
-     </library>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-        <export name="a.b.D"/>
-     </library>
-  </runtime>
-
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary3AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary3AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary3AttributesTest.xml
deleted file mode 100644
index 84153b9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badLibrary3AttributesTest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Library 3 Attributes Test"
-  id="badLibrary3AttributesTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar" type="source"/>
-     <library name="lib2.jar">
-        <export name="a"/>
-        <export name="b"/>
-     </library>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-        <export name="a.b.D"/>
-     </library>
-  </runtime>
-
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginAttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginAttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginAttributesTest.xml
deleted file mode 100644
index cc9fadc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginAttributesTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Plugin Attributes Test"
-  id="badPluginAttributesTest"
-  version="1.2"
-  vendor-name="OTI"
-  a-bad-attribute="nothing">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginElementsTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginElementsTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginElementsTest.xml
deleted file mode 100644
index 805ebc5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginElementsTest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Plugin Elements Test"
-  id="badPluginElementsTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <somethingBad>
-  </somethingBad>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion2Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion2Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion2Test.xml
deleted file mode 100644
index 3f4c5db..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion2Test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Plugin Version 2 Test"
-  id="BadPluginVersion2Test"
-  version="1.bad.0"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion3Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion3Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion3Test.xml
deleted file mode 100644
index 4e7a922..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion3Test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Plugin Version 3 Test"
-  id="BadPluginVersion3Test"
-  version="..."
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion4Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion4Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion4Test.xml
deleted file mode 100644
index b0b01c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion4Test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Plugin Version 4 Test"
-  id="BadPluginVersion4Test"
-  version="one"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion5Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion5Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion5Test.xml
deleted file mode 100644
index 3c9d4f8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersion5Test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Plugin Version 5 Test"
-  id="BadPluginVersion5Test"
-  version="1.2.3.4.5"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersionTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersionTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersionTest.xml
deleted file mode 100644
index 9bd1210..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badPluginVersionTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Plugin Version Test"
-  id="BadPluginVersionTest"
-  version="1.2.bad"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresElementsTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresElementsTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresElementsTest.xml
deleted file mode 100644
index 5d40f9f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresElementsTest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Requires Elements Test"
-  id="badRequiresElementsTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="firstPrerequisite"/>
-     <import plugin="secondPrerequisite" version="1.0.0"/>
-     <import plugin="thirdPrerequisite"/>
-     <notAnImport plugin="badPrerequisite"/>
-     <import plugin="fourthPrerequisite"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport1AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport1AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport1AttributesTest.xml
deleted file mode 100644
index 3efefc7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport1AttributesTest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Requires Import 1 Attributes Test"
-  id="badRequiresImport1AttributesTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="firstPrerequisite"/>
-     <import plugin="secondPrerequisite" version="1.0.0"/>
-     <import plugin="thirdPrerequisite"/>
-     <import plugin="fourthPrerequisite" badImportAttr="notGood"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport2AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport2AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport2AttributesTest.xml
deleted file mode 100644
index 70d4683..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport2AttributesTest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Requires Import 2 Attributes Test"
-  id="badRequiresImport2AttributesTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="firstPrerequisite"/>
-     <import plugin="secondPrerequisite" version="1.0.0"/>
-     <import plugin="thirdPrerequisite"/>
-     <import plugin="fifthPrerequisite" export="notTrue"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport3AttributesTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport3AttributesTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport3AttributesTest.xml
deleted file mode 100644
index 65cf8b1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImport3AttributesTest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Requires Import 3 Attributes Test"
-  id="badRequiresImport3AttributesTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="firstPrerequisite"/>
-     <import plugin="secondPrerequisite" version="1.0.0"/>
-     <import plugin="thirdPrerequisite"/>
-     <import plugin="sixthPrerequisite" version="6.9.10" match="incompatible"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImportElementsTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImportElementsTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImportElementsTest.xml
deleted file mode 100644
index ec577a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRequiresImportElementsTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Requires Import Elements Test"
-  id="badRequiresImportElementsTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="firstPrerequisite"/>
-     <import plugin="secondPrerequisite" version="1.0.0"/>
-     <import plugin="thirdPrerequisite">
-       <unrecognizedElement name="noname"/>
-     </import>
-     <import plugin="fourthPrerequisite"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRuntimeElementsTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRuntimeElementsTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRuntimeElementsTest.xml
deleted file mode 100644
index 935e4bf..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badRuntimeElementsTest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Bad Runtime Elements Test"
-  id="badRuntimeElementsTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar">
-        <export name="*"/>
-        <export name="b"/>
-     </library>
-     <notALibrary/>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-        <export name="a.b.D"/>
-     </library>
-  </runtime>
-
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badTopLevelElementsTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badTopLevelElementsTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badTopLevelElementsTest.xml
deleted file mode 100644
index c12c7d4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/badTopLevelElementsTest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notAPlugin
-  name="Bad Top Level Elements Test"
-  id="badTopLevelElementsTest"
-  version="1.2"
-  vendor-name="OTI">
-</notAPlugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentIdTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentIdTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentIdTest.xml
deleted file mode 100644
index 3515b54..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentIdTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Blank Fragment Id Test"
-  id=""
-  version="1.2"
-  plugin-id="aPlugin"
-  plugin-version="1.1.1">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentNameTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentNameTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentNameTest.xml
deleted file mode 100644
index b9385f9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentNameTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name=""
-  id="BlankFragmentNameTest"
-  version="1.2"
-  plugin-id="aPlugin"
-  plugin-version="1.1.1">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentPluginIdTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentPluginIdTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentPluginIdTest.xml
deleted file mode 100644
index 9ba5493..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentPluginIdTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Blank Fragment Plugin Id Test"
-  id="BlankFragmentPluginIdTest"
-  version="1.2.0"
-  plugin-id=""
-  plugin-version="1.1.1">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentPluginVersionTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentPluginVersionTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentPluginVersionTest.xml
deleted file mode 100644
index 3f5f2fe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentPluginVersionTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Blank Fragment Plugin Version Test"
-  id="BlankFragmentPluginVersionTest"
-  version="1.2.0"
-  plugin-id="aPlugin"
-  plugin-version="">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentVersionTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentVersionTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentVersionTest.xml
deleted file mode 100644
index 60c2f88..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankFragmentVersionTest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Blank Fragment Version Test"
-  id="BlankFragmentVersionTest"
-  version=""
-  plugin-id="aPlugin"
-  plugin-version="1.1.1">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginIdTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginIdTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginIdTest.xml
deleted file mode 100644
index 3a9ba48..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginIdTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Blank Plugin Id Test"
-  id=""
-  version="1.2"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginNameTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginNameTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginNameTest.xml
deleted file mode 100644
index 5be0733..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginNameTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name=""
-  id="BlankPluginNameTest"
-  version="1.2"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginVersionTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginVersionTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginVersionTest.xml
deleted file mode 100644
index 91c32da..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/blankPluginVersionTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Blank Plugin Version Test"
-  id="BlankPluginVersionTest"
-  version=""
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/duplicatePlugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/duplicatePlugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/duplicatePlugin1.xml
deleted file mode 100644
index 9666fbc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/duplicatePlugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Duplicate Plugin Test"
-  id="duplicatePluginTest"
-  version="1.2"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/duplicatePlugin2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/duplicatePlugin2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/duplicatePlugin2.xml
deleted file mode 100644
index 9666fbc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/duplicatePlugin2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Duplicate Plugin Test"
-  id="duplicatePluginTest"
-  version="1.2"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/fragment10799.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/fragment10799.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/fragment10799.xml
deleted file mode 100644
index 543537d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/fragment10799.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-   name="Fragment 10799"
-   id="fragment10799"
-   version="1.0.0"
-   plugin-id="badFragmentsPluginTest"
-   plugin-version="1.2.0">
-
-  <requires>
-    <import plugin="org.apache.something.which.does.not.exist"/>
-  </requires>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentIdTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentIdTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentIdTest.xml
deleted file mode 100644
index 86f6199..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentIdTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="No Fragment Id Test"
-  version="1.2"
-  plugin-id="aPlugin"
-  plugin-version="1.1.1">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentNameTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentNameTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentNameTest.xml
deleted file mode 100644
index 6a809c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentNameTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  id="NoFragmentNameTest"
-  version="1.2"
-  plugin-id="aPlugin"
-  plugin-version="1.1.1">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentPluginIdTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentPluginIdTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentPluginIdTest.xml
deleted file mode 100644
index 4a5ac0a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentPluginIdTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="No Fragment Plugin Id Test"
-  id="NoFragmentPluginIdTest"
-  version="1.2.0"
-  plugin-version="1.1.1">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentPluginVersionTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentPluginVersionTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentPluginVersionTest.xml
deleted file mode 100644
index 8cfbf92..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentPluginVersionTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="No Fragment Plugin Version Test"
-  id="NoFragmentPluginVersionTest"
-  version="1.2.0"
-  plugin-id="aPlugin">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentVersionTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentVersionTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentVersionTest.xml
deleted file mode 100644
index 9db72ac..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noFragmentVersionTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="No Fragment Version Test"
-  id="NoFragmentVersionTest"
-  plugin-id="aPlugin"
-  plugin-version="1.1.1">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginIdTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginIdTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginIdTest.xml
deleted file mode 100644
index 136cbb4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginIdTest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="No Plugin Id Test"
-  version="1.2"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginNameTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginNameTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginNameTest.xml
deleted file mode 100644
index 7151477..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginNameTest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  id="NoPluginNameTest"
-  version="1.2"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginVersionTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginVersionTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginVersionTest.xml
deleted file mode 100644
index 8bfdcaa..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/badPluginsTest/noPluginVersionTest.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="No Plugin Version Test"
-  id="NoPluginVersionTest"
-  provider-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.a.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.a.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.a.xml
deleted file mode 100644
index 726293a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.a.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.b.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.b.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.b.xml
deleted file mode 100644
index f1d3bc0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.b.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.a"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.top.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.top.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.top.xml
deleted file mode 100644
index 2502f47..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/circular/tests.top.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.top"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.a"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.a/plugin.xml
deleted file mode 100644
index 2615913..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_1.2.0/plugin.xml
deleted file mode 100644
index 41554fe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 3808bd5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-     <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_1.2.0/plugin.xml
deleted file mode 100644
index b1ec236..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index d78b063..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_1.0.0/plugin.xml
deleted file mode 100644
index 4ce2949..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_1.1.0/plugin.xml
deleted file mode 100644
index 43fc285..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_2.0.0/plugin.xml
deleted file mode 100644
index 884e4d0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.1/tests.d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.a/plugin.xml
deleted file mode 100644
index 2615913..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_1.2.0/plugin.xml
deleted file mode 100644
index 41554fe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 21aeac9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.2.0"/>
-     <import plugin="tests.d" version="1.0.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_1.2.0/plugin.xml
deleted file mode 100644
index b1ec236..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index d78b063..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_1.0.0/plugin.xml
deleted file mode 100644
index 4ce2949..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_1.1.0/plugin.xml
deleted file mode 100644
index 43fc285..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_2.0.0/plugin.xml
deleted file mode 100644
index 1475e20..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.2/tests.d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.a/plugin.xml
deleted file mode 100644
index 2615913..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_1.2.0/plugin.xml
deleted file mode 100644
index 41554fe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 3808bd5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-     <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_1.2.0/plugin.xml
deleted file mode 100644
index b1ec236..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 8ba12f3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_1.0.0/plugin.xml
deleted file mode 100644
index 2615c1e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_1.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_1.1.0/plugin.xml
deleted file mode 100644
index 43fc285..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_2.0.0/plugin.xml
deleted file mode 100644
index 884e4d0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.e_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.e_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.e_1.1.0/plugin.xml
deleted file mode 100644
index 5d5dfcc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.e_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.f" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.f_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.f_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.f_1.2.0/plugin.xml
deleted file mode 100644
index 2dc8e44..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.3/tests.f_1.2.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.f"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="1.0.0"/>
-     <import plugin="tests.d" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.a/plugin.xml
deleted file mode 100644
index 2615913..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_1.2.0/plugin.xml
deleted file mode 100644
index 41554fe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 3808bd5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-     <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_1.2.0/plugin.xml
deleted file mode 100644
index b1ec236..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 8ba12f3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_1.0.0/plugin.xml
deleted file mode 100644
index 2615c1e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_1.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_1.1.0/plugin.xml
deleted file mode 100644
index 43fc285..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_2.0.0/plugin.xml
deleted file mode 100644
index 884e4d0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.e_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.e_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.e_1.1.0/plugin.xml
deleted file mode 100644
index 5d5dfcc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.e_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.f" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.f_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.f_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.f_1.2.0/plugin.xml
deleted file mode 100644
index 3e40463..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.4/tests.f_1.2.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.f"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-     <import plugin="tests.d" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.a/plugin.xml
deleted file mode 100644
index 2615913..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_1.2.0/plugin.xml
deleted file mode 100644
index 41554fe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 3808bd5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-     <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_1.2.0/plugin.xml
deleted file mode 100644
index b1ec236..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 8ba12f3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_1.0.0/plugin.xml
deleted file mode 100644
index 2615c1e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_1.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_1.1.0/plugin.xml
deleted file mode 100644
index 43fc285..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_2.0.0/plugin.xml
deleted file mode 100644
index 884e4d0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.e_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.e_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.e_1.1.0/plugin.xml
deleted file mode 100644
index 5d5dfcc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.e_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.f" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.f_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.f_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.f_1.2.0/plugin.xml
deleted file mode 100644
index 7a3a0ca..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.5/tests.f_1.2.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.f"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="1.0.0" optional="true"/>
-     <import plugin="tests.d" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.a/plugin.xml
deleted file mode 100644
index 2615913..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_1.2.0/plugin.xml
deleted file mode 100644
index 41554fe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 3808bd5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-     <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_1.2.0/plugin.xml
deleted file mode 100644
index b1ec236..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 8ba12f3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_1.0.0/plugin.xml
deleted file mode 100644
index 2615c1e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_1.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_1.1.0/plugin.xml
deleted file mode 100644
index 43fc285..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_2.0.0/plugin.xml
deleted file mode 100644
index 884e4d0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.e_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.e_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.e_1.1.0/plugin.xml
deleted file mode 100644
index 5d5dfcc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.e_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.f" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.f_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.f_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.f_1.2.0/plugin.xml
deleted file mode 100644
index 9ba1f6d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.6/tests.f_1.2.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.f"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0" optional="true"/>
-     <import plugin="tests.d" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.a/plugin.xml
deleted file mode 100644
index 2615913..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_1.2.0/plugin.xml
deleted file mode 100644
index 41554fe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 3808bd5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-     <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_1.2.0/plugin.xml
deleted file mode 100644
index b1ec236..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 8ba12f3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_1.0.0/plugin.xml
deleted file mode 100644
index 2615c1e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_1.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_1.1.0/plugin.xml
deleted file mode 100644
index 43fc285..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_2.0.0/plugin.xml
deleted file mode 100644
index 884e4d0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.e_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.e_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.e_1.1.0/plugin.xml
deleted file mode 100644
index 5d5dfcc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.e_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.f" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.f_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.f_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.f_1.2.0/plugin.xml
deleted file mode 100644
index 66c7c7c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/conflictResolve.7/tests.f_1.2.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.f"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-     <import plugin="tests.d" version="2.0.0" optional="true"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension1Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension1Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension1Test.xml
deleted file mode 100644
index c59841b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension1Test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Extension 1 Test"
-  id="extension1Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension id="xpt1" name="First extension" point="firstPoint"/>
-  <extension id="xpt2" name="Second extension" point="secondPoint"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension2Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension2Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension2Test.xml
deleted file mode 100644
index f33a0cf..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension2Test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Extension 2 Test"
-  id="extension2Test"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension3Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension3Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension3Test.xml
deleted file mode 100644
index 060dfaa..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension3Test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Extension 3 Test"
-  id="extension3Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension id="xpt1" name="First extension" point="firstPoint"/>
-  <extension id="xpt2" name="Second extension" point="secondPoint"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension4Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension4Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension4Test.xml
deleted file mode 100644
index 6ebbd63..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension4Test.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Extension 4 Test"
-  id="extension4Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension id="xpt1" name="First extension" point="firstPoint"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension5Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension5Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension5Test.xml
deleted file mode 100644
index 0550c61..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extension5Test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Extension5 Test"
-  id="extension5Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension id="xpt1" name="First extension" point="firstPoint"/>
-  <extension id="xpt2" name="Second extension" point="secondPoint"/>
-  <extension id="xpt4" name="Fourth extension" point="fourthPoint"/>
-  <extension id="xpt6" name="Sixth extension" point="sixthPoint"/>
-  <extension id="xpt8" name="Eighth extension" point="eighthPoint"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint1Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint1Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint1Test.xml
deleted file mode 100644
index 58033bd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint1Test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Extension Point 1 Test"
-  id="extensionPoint1Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension-point id="xpt1" name="First extension point" schema="pde\xpt1.xml"/>
-  <extension-point id="xpt2" name="Second extension point"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint2Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint2Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint2Test.xml
deleted file mode 100644
index 5205e83..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint2Test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Extension Point 2 Test"
-  id="extensionPoint2Test"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint3Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint3Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint3Test.xml
deleted file mode 100644
index 3b3bd69..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint3Test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Extension Point 3 Test"
-  id="extensionPoint3Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension-point id="xpt1" name="First extension" schema="pde\xpt1.xml"/>
-  <extension-point id="xpt2" name="Second extension"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint4Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint4Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint4Test.xml
deleted file mode 100644
index 1807896..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint4Test.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Extension Point 4 Test"
-  id="extensionPoint4Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension-point id="xpt1" name="First extension point" schema="pde\xpt1.xml"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint5Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint5Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint5Test.xml
deleted file mode 100644
index 7c8a9f4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/extensionPoint5Test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Extension Point 5 Test"
-  id="extensionPoint5Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <extension-point id="xpt1" name="First extension point" schema="pde\xpt1.xml"/>
-  <extension-point id="xpt2" name="Second extension point"/>
-  <extension-point id="xpt4" name="Fourth extension point"/>
-  <extension-point id="xpt6" name="Sixth extension point"/>
-  <extension-point id="xpt8" name="Eighth extension point"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension1Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension1Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension1Test.xml
deleted file mode 100644
index 5f49bd1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension1Test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Extension 1 Test"
-  id="fragmentExtension1Test"
-  version="1.0"
-  plugin-id="extension1Test"
-  plugin-version="1.2">
-
-  <extension id="xpt3" name="Third extension" point="thirdPoint"/>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension2Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension2Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension2Test.xml
deleted file mode 100644
index 05ef691..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension2Test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Extension 2 Test"
-  id="fragmentExtension2Test"
-  version="1.0"
-  plugin-id="extension2Test"
-  plugin-version="1.2">
-
-  <extension id="xpt3" name="Third extension" point="thirdPoint"/>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension3Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension3Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension3Test.xml
deleted file mode 100644
index 5ffff30..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension3Test.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Extension 3 Test"
-  id="fragmentExtension3Test"
-  version="1.0"
-  plugin-id="extension3Test"
-  plugin-version="1.2">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension4Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension4Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension4Test.xml
deleted file mode 100644
index 26db7aa..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension4Test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Extension 4 Test"
-  id="fragmentExtension4Test"
-  version="1.0"
-  plugin-id="extension4Test"
-  plugin-version="1.2">
-
-  <extension id="xpt3" name="Third extension" point="thirdPoint"/>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension5Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension5Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension5Test.xml
deleted file mode 100644
index ca6456a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtension5Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Extension 5 Test"
-  id="fragmentExtension5Test"
-  version="1.0"
-  plugin-id="extension5Test"
-  plugin-version="1.2">
-
-  <extension id="xpt3" name="Third extension" point="thirdPoint"/>
-  <extension id="xpt5" name="Fifth extension " point="fifthPoint"/>
-  <extension id="xpt7" name="Seventh extension" point="seventhPoint"/>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint1Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint1Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint1Test.xml
deleted file mode 100644
index a6fbd0f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint1Test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Extension Point 1 Test"
-  id="fragmentExtensionPoint1Test"
-  version="1.0"
-  plugin-id="extensionPoint1Test"
-  plugin-version="1.2">
-
-  <extension-point id="xpt3" name="Third extension point"/>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint2Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint2Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint2Test.xml
deleted file mode 100644
index 2faca4f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint2Test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Extension Point 2 Test"
-  id="fragmentExtensionPoint2Test"
-  version="1.0"
-  plugin-id="extensionPoint2Test"
-  plugin-version="1.2">
-
-  <extension-point id="xpt3" name="Third extension point"/>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint3Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint3Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint3Test.xml
deleted file mode 100644
index e017200..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint3Test.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Extension Point 3 Test"
-  id="fragmentExtensionPoint3Test"
-  version="1.0"
-  plugin-id="extensionPoint3Test"
-  plugin-version="1.2">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint4Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint4Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint4Test.xml
deleted file mode 100644
index f0652a6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint4Test.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Extension Point 4 Test"
-  id="fragmentExtensionPoint4Test"
-  version="1.0"
-  plugin-id="extensionPoint4Test"
-  plugin-version="1.2">
-
-  <extension-point id="xpt3" name="Third extension point"/>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint5Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint5Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint5Test.xml
deleted file mode 100644
index fab5155..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint5Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Extension Point 5 Test"
-  id="fragmentExtensionPoint5Test"
-  version="1.0"
-  plugin-id="extensionPoint5Test"
-  plugin-version="1.2">
-
-  <extension-point id="xpt3" name="Third extension point"/>
-  <extension-point id="xpt5" name="Fifth extension point"/>
-  <extension-point id="xpt7" name="Seventh extension point"/>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary1Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary1Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary1Test.xml
deleted file mode 100644
index 851b253..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary1Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Library 1 Test"
-  id="fragmentLibrary1Test"
-  version="1.0"
-  plugin-id="library1Test"
-  plugin-version="1.2">
-
-  <runtime>
-     <library name="lib3.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary2Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary2Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary2Test.xml
deleted file mode 100644
index 75fc8a1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary2Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Library 2 Test"
-  id="fragmentLibrary2Test"
-  version="1.0"
-  plugin-id="library2Test"
-  plugin-version="1.2">
-
-  <runtime>
-     <library name="lib3.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary3Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary3Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary3Test.xml
deleted file mode 100644
index 3266163..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary3Test.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Library 3 Test"
-  id="fragmentLibrary3Test"
-  version="1.0"
-  plugin-id="library3Test"
-  plugin-version="1.2">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary4Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary4Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary4Test.xml
deleted file mode 100644
index 0ecc6a4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary4Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Library 4 Test"
-  id="fragmentLibrary4Test"
-  version="1.0"
-  plugin-id="library4Test"
-  plugin-version="1.2">
-
-  <runtime>
-     <library name="lib3.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary5Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary5Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary5Test.xml
deleted file mode 100644
index 50be84d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentLibrary5Test.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Library 5 Test"
-  id="fragmentLibrary5Test"
-  version="1.0"
-  plugin-id="library5Test"
-  plugin-version="1.2">
-
-  <runtime>
-     <library name="lib3.jar"/>
-     <library name="lib5.jar"/>
-     <library name="lib7.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires1Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires1Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires1Test.xml
deleted file mode 100644
index 391375c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires1Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Requires 1 Test"
-  id="fragmentRequires1Test"
-  version="1.0"
-  plugin-id="requires1Test"
-  plugin-version="1.2">
-
-  <requires>
-     <import plugin="plugin3"/>
-  </requires>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires2Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires2Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires2Test.xml
deleted file mode 100644
index abe986a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires2Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Requires 2 Test"
-  id="fragmentRequires2Test"
-  version="1.0"
-  plugin-id="requires2Test"
-  plugin-version="1.2">
-
-  <requires>
-     <import plugin="plugin3"/>
-  </requires>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires3Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires3Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires3Test.xml
deleted file mode 100644
index a87390a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires3Test.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Requires 3 Test"
-  id="fragmentRequires3Test"
-  version="1.0"
-  plugin-id="requires3Test"
-  plugin-version="1.2">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires4Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires4Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires4Test.xml
deleted file mode 100644
index ad63094..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires4Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Requires 4 Test"
-  id="fragmentRequires4Test"
-  version="1.0"
-  plugin-id="requires4Test"
-  plugin-version="1.2">
-
-  <requires>
-     <import plugin="plugin3"/>
-  </requires>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires5Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires5Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires5Test.xml
deleted file mode 100644
index 18df74a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/fragmentRequires5Test.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Requires 5 Test"
-  id="fragmentRequires5Test"
-  version="1.0"
-  plugin-id="requires5Test"
-  plugin-version="1.2">
-
-  <requires>
-     <import plugin="plugin3"/>
-     <import plugin="plugin5"/>
-     <import plugin="plugin7"/>
-  </requires>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library1Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library1Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library1Test.xml
deleted file mode 100644
index 0161534..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library1Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Library 1 Test"
-  id="library1Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library2Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library2Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library2Test.xml
deleted file mode 100644
index 370cccd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library2Test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Library 2 Test"
-  id="library2Test"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library3Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library3Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library3Test.xml
deleted file mode 100644
index 0d9b4a7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library3Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Library 3 Test"
-  id="library3Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library4Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library4Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library4Test.xml
deleted file mode 100644
index 8f7e4b6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library4Test.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Library 4 Test"
-  id="library4Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library5Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library5Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library5Test.xml
deleted file mode 100644
index 30210ce..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/library5Test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Library 5 Test"
-  id="library5Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib4.jar"/>
-     <library name="lib6.jar"/>
-     <library name="lib8.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin1.xml
deleted file mode 100644
index ce69681..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin 1"
-  id="plugin1"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin2.xml
deleted file mode 100644
index f02d315..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin 2"
-  id="plugin2"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin3.xml
deleted file mode 100644
index c4157aa..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin 3"
-  id="plugin3"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin4.xml
deleted file mode 100644
index 247c642..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin 4"
-  id="plugin4"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin5.xml
deleted file mode 100644
index ae3c4ee..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin 5"
-  id="plugin5"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin6.xml
deleted file mode 100644
index 24827d6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin6.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin 6"
-  id="plugin6"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin7.xml
deleted file mode 100644
index f71d72d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin7.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin 7"
-  id="plugin7"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin8.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin8.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin8.xml
deleted file mode 100644
index 42a41c6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/plugin8.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin 8"
-  id="plugin8"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires1Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires1Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires1Test.xml
deleted file mode 100644
index 6efacb6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires1Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Requires 1 Test"
-  id="requires1Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="plugin1"/>
-     <import plugin="plugin2"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires2Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires2Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires2Test.xml
deleted file mode 100644
index 61bbfcd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires2Test.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Requires 2 Test"
-  id="requires2Test"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires3Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires3Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires3Test.xml
deleted file mode 100644
index ca524d6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires3Test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Requires 3 Test"
-  id="requires3Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="plugin1"/>
-     <import plugin="plugin2"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires4Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires4Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires4Test.xml
deleted file mode 100644
index 3286127..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires4Test.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Requires 4 Test"
-  id="requires4Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="plugin1"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires5Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires5Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires5Test.xml
deleted file mode 100644
index c7ebbfc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveFragmentTest/requires5Test.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Requires 5 Test"
-  id="requires5Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="plugin1"/>
-     <import plugin="plugin2"/>
-     <import plugin="plugin4"/>
-     <import plugin="plugin6"/>
-     <import plugin="plugin8"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/emptyLibraryTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/emptyLibraryTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/emptyLibraryTest.xml
deleted file mode 100644
index 6f7aaf2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/emptyLibraryTest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Empty Library Test"
-  id="emptyLibraryTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library />
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/multiLibraryMultiExportTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/multiLibraryMultiExportTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/multiLibraryMultiExportTest.xml
deleted file mode 100644
index d4eeade..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/multiLibraryMultiExportTest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Multi Library Multi Export Test"
-  id="multiLibraryMultiExportTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar">
-        <export name="a"/>
-        <export name="*"/>
-        <export name="b"/>
-     </library>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-        <export name="a.b.D"/>
-     </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/multiLibraryOneExportTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/multiLibraryOneExportTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/multiLibraryOneExportTest.xml
deleted file mode 100644
index 42382c8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/multiLibraryOneExportTest.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Multi Library One Export Test"
-  id="multiLibraryOneExportTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar">
-        <export name="*"/>
-     </library>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-     </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/noLibraryTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/noLibraryTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/noLibraryTest.xml
deleted file mode 100644
index 45b5d08..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/noLibraryTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="No Library Test"
-  id="noLibraryTest"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport1Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport1Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport1Test.xml
deleted file mode 100644
index 2b07ee8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport1Test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="One Library One Export 1Test"
-  id="oneLibraryOneExport1Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib2.jar">
-        <export name="*"/>
-     </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport2Test.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport2Test.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport2Test.xml
deleted file mode 100644
index c59e9f6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport2Test.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="One Library One Export 2 Test"
-  id="oneLibraryOneExport2Test"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib2.jar">
-        <export name="abc"/>
-     </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryTest.xml
deleted file mode 100644
index fe18906..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveLibraryTest/oneLibraryTest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="One Library Test"
-  id="oneLibraryTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/emptyRequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/emptyRequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/emptyRequiresTest.xml
deleted file mode 100644
index 29de037..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/emptyRequiresTest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Empty Requires Test"
-  id="emptyRequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export1RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export1RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export1RequiresTest.xml
deleted file mode 100644
index 596cfbc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export1RequiresTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Export 1 Requires Test"
-  id="export1RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.b"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export2RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export2RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export2RequiresTest.xml
deleted file mode 100644
index 05e5378..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export2RequiresTest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Export 2 Requires Test"
-  id="export2RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="tests.b" export="true"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export3RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export3RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export3RequiresTest.xml
deleted file mode 100644
index 57a7bce..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export3RequiresTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Export 3 Requires Test"
-  id="export3RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.b" export="false"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export4RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export4RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export4RequiresTest.xml
deleted file mode 100644
index 6b9cfba..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/export4RequiresTest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Export 4 Requires Test"
-  id="export4RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.a" export="true"/>
-     <import plugin="tests.b"/>
-     <import plugin="tests.c" export="false"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match1RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match1RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match1RequiresTest.xml
deleted file mode 100644
index 9acc799..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match1RequiresTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Match 1 Requires Test"
-  id="match1RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.b"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match2RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match2RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match2RequiresTest.xml
deleted file mode 100644
index 4b126c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match2RequiresTest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Match 2 Requires Test"
-  id="match2RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="tests.b" match="compatible"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match3RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match3RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match3RequiresTest.xml
deleted file mode 100644
index 641162c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match3RequiresTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Match 3 Requires Test"
-  id="match3RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.b" match="equivalent"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match4RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match4RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match4RequiresTest.xml
deleted file mode 100644
index 88c07e7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match4RequiresTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Match 4 Requires Test"
-  id="match4RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.c" match="perfect"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match5RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match5RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match5RequiresTest.xml
deleted file mode 100644
index e516bd5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match5RequiresTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Match 5 Requires Test"
-  id="match5RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.c" match="greaterOrEqual"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match6RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match6RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match6RequiresTest.xml
deleted file mode 100644
index bef8be7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/match6RequiresTest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Match 6 Requires Test"
-  id="match6RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.a"/>
-     <import plugin="tests.b" match="greaterOrEqual"/>
-     <import plugin="tests.c" match="compatible"/>
-     <import plugin="tests.c" match="equivalent"/>
-     <import plugin="tests.c" match="perfect"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/multiRequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/multiRequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/multiRequiresTest.xml
deleted file mode 100644
index 95e34c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/multiRequiresTest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Multi Requires Test"
-  id="multiRequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="firstPrerequisite"/>
-     <import plugin="secondPrerequisite" version="1.0.0"/>
-     <import plugin="thirdPrerequisite"/>
-     <import plugin="fourthPrerequisite"/>
-     <import plugin="fifthPrerequisite"/>
-     <import plugin="sixthPrerequisite" version="6.9.10"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/noRequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/noRequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/noRequiresTest.xml
deleted file mode 100644
index 09da86a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/noRequiresTest.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="No Requires Test"
-  id="noRequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/oneRequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/oneRequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/oneRequiresTest.xml
deleted file mode 100644
index ced0aa9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/oneRequiresTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="One Requires Test"
-  id="oneRequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.b"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional1RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional1RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional1RequiresTest.xml
deleted file mode 100644
index 07fa43b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional1RequiresTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Optional 1 Requires Test"
-  id="optional1RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.b"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional2RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional2RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional2RequiresTest.xml
deleted file mode 100644
index 89a014f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional2RequiresTest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Optional 2 Requires Test"
-  id="optional2RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="tests.b" optional="true"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional3RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional3RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional3RequiresTest.xml
deleted file mode 100644
index 4200c12..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional3RequiresTest.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Optional 3 Requires Test"
-  id="optional3RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.b" optional="false"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional4RequiresTest.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional4RequiresTest.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional4RequiresTest.xml
deleted file mode 100644
index 4d9daea..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/extensiveRequiresTest/optional4RequiresTest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Optional 4 Requires Test"
-  id="optional4RequiresTest"
-  version="1.2"
-  vendor-name="OTI">
-  <requires>
-     <import plugin="tests.a" optional="true"/>
-     <import plugin="tests.b"/>
-     <import plugin="tests.c" optional="false"/>
-  </requires>
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment1.xml
deleted file mode 100644
index 674f6e7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment2.xml
deleted file mode 100644
index 172403d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.3">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment3.xml
deleted file mode 100644
index 2032855..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.1">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment4.xml
deleted file mode 100644
index 81b22df..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="2.0">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment5.xml
deleted file mode 100644
index 675b4f6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.1">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment6.xml
deleted file mode 100644
index 0d62ac1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.4">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment7.xml
deleted file mode 100644
index 6b4aad6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/fragment7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.8">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/plugin1.xml
deleted file mode 100644
index d0fbf95..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/plugin2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/plugin2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/plugin2.xml
deleted file mode 100644
index 3c4f7e9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.1/plugin2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.6"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment1.xml
deleted file mode 100644
index c8aaf35..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="5.9.8" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment2.xml
deleted file mode 100644
index 20dc058..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.3" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment3.xml
deleted file mode 100644
index cce7bd8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.4" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment4.xml
deleted file mode 100644
index 0e9316f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="2.0.0" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment5.xml
deleted file mode 100644
index 888fd54..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.0.4" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment6.xml
deleted file mode 100644
index 7b7f35b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="4.6.2" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment7.xml
deleted file mode 100644
index 59a3201..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="4.5.8" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment8.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment8.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment8.xml
deleted file mode 100644
index caa31a4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="4.4.2" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment9.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment9.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment9.xml
deleted file mode 100644
index b7afcfc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/fragment9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="4.5.1" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin1.xml
deleted file mode 100644
index 2a5f853..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin2.xml
deleted file mode 100644
index 92b034c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.8"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin3.xml
deleted file mode 100644
index 43cc24a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin4.xml
deleted file mode 100644
index 97e8cb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.3.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin5.xml
deleted file mode 100644
index 0c32796..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="3.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin6.xml
deleted file mode 100644
index c528461..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.10/plugin6.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="4.5.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/fragment1.xml
deleted file mode 100644
index 4dbdb48..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.0"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/fragment2.xml
deleted file mode 100644
index 54d1783..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/fragment2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.0.1"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/plugin1.xml
deleted file mode 100644
index 204219f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.11/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin One"
-  id="pluginOne"
-  version="1.2.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment1.xml
deleted file mode 100644
index 4dbdb48..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.0"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment2.xml
deleted file mode 100644
index 54d1783..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.0.1"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment3.xml
deleted file mode 100644
index 81c5158..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment3.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.0.2"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment4.xml
deleted file mode 100644
index 93f98c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment4.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.1.2"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-     <library name="lib4.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment5.xml
deleted file mode 100644
index f2d9044..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment5.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.7.2"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-     <library name="lib4.jar"/>
-     <library name="lib5.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment6.xml
deleted file mode 100644
index f9785fb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment6.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.2.0"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-     <library name="lib4.jar"/>
-     <library name="lib5.jar"/>
-     <library name="lib6.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment7.xml
deleted file mode 100644
index 9bb0b05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment7.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.4.0"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-     <library name="lib4.jar"/>
-     <library name="lib5.jar"/>
-     <library name="lib6.jar"/>
-     <library name="lib7.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment8.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment8.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment8.xml
deleted file mode 100644
index 36e637d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/fragment8.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.5.1"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-     <library name="lib4.jar"/>
-     <library name="lib5.jar"/>
-     <library name="lib6.jar"/>
-     <library name="lib7.jar"/>
-     <library name="lib8.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/plugin1.xml
deleted file mode 100644
index 204219f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.12/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin One"
-  id="pluginOne"
-  version="1.2.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment1.xml
deleted file mode 100644
index 4e1112a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.9.9"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment2.xml
deleted file mode 100644
index 346727f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment2.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="2.3.5"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment21.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment21.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment21.xml
deleted file mode 100644
index 3d57b34..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment21.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Two"
-  id="fragmentTwo"
-  version="3.0.0"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib21.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment22.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment22.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment22.xml
deleted file mode 100644
index f60a337..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment22.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Two"
-  id="fragmentTwo"
-  version="2.3.5"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib21.jar"/>
-     <library name="lib22.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment23.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment23.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment23.xml
deleted file mode 100644
index cfea91c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment23.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Two"
-  id="fragmentTwo"
-  version="2.5"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib21.jar"/>
-     <library name="lib22.jar"/>
-     <library name="lib23.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment24.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment24.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment24.xml
deleted file mode 100644
index 852c238..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment24.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Two"
-  id="fragmentTwo"
-  version="1.1.2"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib21.jar"/>
-     <library name="lib22.jar"/>
-     <library name="lib23.jar"/>
-     <library name="lib24.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment25.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment25.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment25.xml
deleted file mode 100644
index e6a4152..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment25.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Two"
-  id="fragmentTwo"
-  version="1.7.2"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib21.jar"/>
-     <library name="lib22.jar"/>
-     <library name="lib23.jar"/>
-     <library name="lib24.jar"/>
-     <library name="lib25.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment26.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment26.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment26.xml
deleted file mode 100644
index 68da0ab..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment26.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Two"
-  id="fragmentTwo"
-  version="2.9.0"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib21.jar"/>
-     <library name="lib22.jar"/>
-     <library name="lib23.jar"/>
-     <library name="lib24.jar"/>
-     <library name="lib25.jar"/>
-     <library name="lib26.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment27.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment27.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment27.xml
deleted file mode 100644
index f81a091..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment27.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Two"
-  id="fragmentTwo"
-  version="1.4.0"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib21.jar"/>
-     <library name="lib22.jar"/>
-     <library name="lib23.jar"/>
-     <library name="lib24.jar"/>
-     <library name="lib25.jar"/>
-     <library name="lib26.jar"/>
-     <library name="lib27.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment3.xml
deleted file mode 100644
index 619445f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment3.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="4.5"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment4.xml
deleted file mode 100644
index 93f98c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment4.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.1.2"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-     <library name="lib4.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment5.xml
deleted file mode 100644
index 0a65e1c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment5.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="2.7.2"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-     <library name="lib4.jar"/>
-     <library name="lib5.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment6.xml
deleted file mode 100644
index d41a851..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment6.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.9.0"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-     <library name="lib4.jar"/>
-     <library name="lib5.jar"/>
-     <library name="lib6.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment7.xml
deleted file mode 100644
index 4587b01..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment7.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="3.4.0"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-     <library name="lib4.jar"/>
-     <library name="lib5.jar"/>
-     <library name="lib6.jar"/>
-     <library name="lib7.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment8.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment8.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment8.xml
deleted file mode 100644
index 36e637d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/fragment8.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment One"
-  id="fragmentOne"
-  version="1.5.1"
-  plugin-id="pluginOne"
-  plugin-version="1.2.5">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar"/>
-     <library name="lib3.jar"/>
-     <library name="lib4.jar"/>
-     <library name="lib5.jar"/>
-     <library name="lib6.jar"/>
-     <library name="lib7.jar"/>
-     <library name="lib8.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/plugin1.xml
deleted file mode 100644
index 204219f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.13/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin One"
-  id="pluginOne"
-  version="1.2.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment1.xml
deleted file mode 100644
index 53b8fba..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.3">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment2.xml
deleted file mode 100644
index 7c28ebc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment3.xml
deleted file mode 100644
index 94727f7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="2.1.1">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment4.xml
deleted file mode 100644
index 87caa3f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="2.5.0">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment5.xml
deleted file mode 100644
index 0d62ac1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.4">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment6.xml
deleted file mode 100644
index c852105..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.0.0">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment7.xml
deleted file mode 100644
index ce57d92..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/fragment7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="2.4.0">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin1.xml
deleted file mode 100644
index 9f5741d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin2.xml
deleted file mode 100644
index 8882863..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin3.xml
deleted file mode 100644
index 568b52c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin4.xml
deleted file mode 100644
index bc9b794..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.2/plugin4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment1.xml
deleted file mode 100644
index d862a4e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.1" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment2.xml
deleted file mode 100644
index 1487052..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.2" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment3.xml
deleted file mode 100644
index 29b915b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.0" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment4.xml
deleted file mode 100644
index d343ad1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.1.0" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment5.xml
deleted file mode 100644
index 0e36c02..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.1.1" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment6.xml
deleted file mode 100644
index 73ddfdc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.5.0" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment7.xml
deleted file mode 100644
index e9bbf5a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.5.1" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment8.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment8.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment8.xml
deleted file mode 100644
index 7025238..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.0.0" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment9.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment9.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment9.xml
deleted file mode 100644
index b71cd5a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/fragment9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.2.1" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/plugin1.xml
deleted file mode 100644
index fe7cd5a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.3/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment1.xml
deleted file mode 100644
index d862a4e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.1" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment2.xml
deleted file mode 100644
index 1487052..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.2" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment3.xml
deleted file mode 100644
index 29b915b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.0" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment4.xml
deleted file mode 100644
index d343ad1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.1.0" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment5.xml
deleted file mode 100644
index 0e36c02..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.1.1" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment6.xml
deleted file mode 100644
index 73ddfdc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.5.0" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment7.xml
deleted file mode 100644
index e9bbf5a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.5.1" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment8.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment8.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment8.xml
deleted file mode 100644
index 7025238..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.0.0" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment9.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment9.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment9.xml
deleted file mode 100644
index b71cd5a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/fragment9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.2.1" match="perfect">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin1.xml
deleted file mode 100644
index fe7cd5a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin2.xml
deleted file mode 100644
index cd3271f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin3.xml
deleted file mode 100644
index 8360cc5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.7"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin4.xml
deleted file mode 100644
index fc511f2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="3.0.2"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin5.xml
deleted file mode 100644
index 2d9d893..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.4/plugin5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="0.2.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment1.xml
deleted file mode 100644
index fbcd03f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.3.2" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment10.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment10.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment10.xml
deleted file mode 100644
index de697ff..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.0.0" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment11.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment11.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment11.xml
deleted file mode 100644
index b03f827..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.2.5" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment12.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment12.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment12.xml
deleted file mode 100644
index ca52259..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.2.4" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment2.xml
deleted file mode 100644
index 781c12c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.3.7" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment3.xml
deleted file mode 100644
index 6e4cc3a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.5" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment4.xml
deleted file mode 100644
index 36c09fe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.8" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment5.xml
deleted file mode 100644
index 3131a96..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.2" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment6.xml
deleted file mode 100644
index 25fed6a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.0" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment7.xml
deleted file mode 100644
index 0504fc6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.1.5" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment8.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment8.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment8.xml
deleted file mode 100644
index a9380f5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.1.0" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment9.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment9.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment9.xml
deleted file mode 100644
index 533d770..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/fragment9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.3.5" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/plugin1.xml
deleted file mode 100644
index 2a5f853..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.5/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment1.xml
deleted file mode 100644
index 5730093..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="5.9.8" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment2.xml
deleted file mode 100644
index 154160e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.3" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment3.xml
deleted file mode 100644
index 8a97b91..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.4" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment4.xml
deleted file mode 100644
index bf607bb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="2.0.0" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment5.xml
deleted file mode 100644
index cf652a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.0.4" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment6.xml
deleted file mode 100644
index 9f152b6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="4.6.2" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment7.xml
deleted file mode 100644
index da66f16..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="4.5.8" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment8.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment8.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment8.xml
deleted file mode 100644
index 13bf9bc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="4.4.2" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment9.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment9.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment9.xml
deleted file mode 100644
index b7afcfc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/fragment9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="4.5.1" match="equivalent">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin1.xml
deleted file mode 100644
index 2a5f853..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin2.xml
deleted file mode 100644
index 92b034c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.8"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin3.xml
deleted file mode 100644
index 43cc24a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin4.xml
deleted file mode 100644
index 97e8cb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.3.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin5.xml
deleted file mode 100644
index 0c32796..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin5.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="3.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin6.xml
deleted file mode 100644
index c528461..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.6/plugin6.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="4.5.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment1.xml
deleted file mode 100644
index a4b7888..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment2.xml
deleted file mode 100644
index 30196b4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.3" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment3.xml
deleted file mode 100644
index f2dbf64..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.1" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment4.xml
deleted file mode 100644
index 2403f53..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="2.0" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment5.xml
deleted file mode 100644
index bc0e666..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.1" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment6.xml
deleted file mode 100644
index 439e209..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.4" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment7.xml
deleted file mode 100644
index df9da1e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/fragment7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.8" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/plugin1.xml
deleted file mode 100644
index d0fbf95..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/plugin2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/plugin2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/plugin2.xml
deleted file mode 100644
index 3c4f7e9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.7/plugin2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.6"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment1.xml
deleted file mode 100644
index b8bfdf5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.3" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment2.xml
deleted file mode 100644
index 91e851b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment3.xml
deleted file mode 100644
index a94f807..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="2.1.1" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment4.xml
deleted file mode 100644
index 089c2a9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="2.5.0" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment5.xml
deleted file mode 100644
index 439e209..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.4" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment6.xml
deleted file mode 100644
index e810b11..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.0.0" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment7.xml
deleted file mode 100644
index 8e1bc73..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/fragment7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="2.4.0" match="compatible">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin1.xml
deleted file mode 100644
index 9f5741d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin2.xml
deleted file mode 100644
index 8882863..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin2.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin3.xml
deleted file mode 100644
index 568b52c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin3.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin4.xml
deleted file mode 100644
index bc9b794..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.8/plugin4.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment1.xml
deleted file mode 100644
index 01fd4f9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.3.2" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment10.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment10.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment10.xml
deleted file mode 100644
index c1990e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.0.0" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment11.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment11.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment11.xml
deleted file mode 100644
index e19e857..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment11.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.2.5" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment12.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment12.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment12.xml
deleted file mode 100644
index a3e2f8a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment12.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="3.2.4" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment2.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment2.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment2.xml
deleted file mode 100644
index a6cbe86..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.3.7" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment3.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment3.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment3.xml
deleted file mode 100644
index d393397..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment3.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.5" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment4.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment4.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment4.xml
deleted file mode 100644
index ac51121..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment4.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.8" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment5.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment5.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment5.xml
deleted file mode 100644
index f06f169..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment5.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.2" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment6.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment6.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment6.xml
deleted file mode 100644
index 0e2984e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment6.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.2.0" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment7.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment7.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment7.xml
deleted file mode 100644
index 0d9124b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment7.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.1.5" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment8.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment8.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment8.xml
deleted file mode 100644
index eca71ad..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment8.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.1.0" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment9.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment9.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment9.xml
deleted file mode 100644
index 849b2f5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/fragment9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Test"
-  id="fragmentTest"
-  version="1.0"
-  plugin-id="tests.a"
-  plugin-version="1.3.5" match="greaterOrEqual">
-
-  <runtime>
-     <library name="lib1.jar"/>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/plugin1.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/plugin1.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/plugin1.xml
deleted file mode 100644
index 2a5f853..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/fragment.resolve.9/plugin1.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/numberOfRequires/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/numberOfRequires/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/numberOfRequires/plugin.xml
deleted file mode 100644
index cdbea99..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/numberOfRequires/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Number of Requires Test"
-  id="reqTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <requires>
-     <import plugin="tests.b"/>
-     <import plugin="tests.c" version="1.0.0"/>
-  </requires>
-
-  <requires>
-     <import plugin="tests.a"/>
-     <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/numberOfRuntimes/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/numberOfRuntimes/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/numberOfRuntimes/plugin.xml
deleted file mode 100644
index fc36056..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/numberOfRuntimes/plugin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Number of Runtime Test"
-  id="runtimeTest"
-  version="1.2"
-  vendor-name="OTI">
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar">
-        <export name="*"/>
-     </library>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-     </library>
-  </runtime>
-
-  <runtime>
-     <library name="lib4.jar"/>
-     <library name="lib5.jar">
-        <export name="*"/>
-     </library>
-     <library name="lib6.jar">
-        <export name="a.b.C"/>
-     </library>
-     <library name="lib7.jar"/>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/.plugin-path
deleted file mode 100644
index 16127c5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/.plugin-path
+++ /dev/null
@@ -1 +0,0 @@
-test=file:c:/20020319/eclipse/plugins/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin.properties
deleted file mode 100644
index 418f56b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test String
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin.xml
deleted file mode 100644
index 692319e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="plugin.a"
-  version="1.0"
-  class="org.eclipse.core.tests.internal.plugin.a.PluginClass"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="plugin.b"/>
- </requires>
-
-  <runtime>
-    <library name="plugin_a.jar">
-      <export name="org.eclipse.core.tests.internal.plugin.a.api.*"/>
-    </library>
-  </runtime>
-
-  <extension-point id="case" name="CaseExtPt"/>
-
-  <extension point="case" id="base">
-    <test run="org.eclipse.core.tests.internal.plugin.a.BaseExtension"/>
-  </extension>
-
-  <extension point="case" id="referencePlugin">
-    <test run="org.eclipse.core.tests.internal.plugin.a.ExtensionDirectCompilerReferenceToPluginClass"/>
-  </extension>
-
-  <extension point="case" id="referenceOther">
-    <test run="org.eclipse.core.tests.internal.plugin.a.ExtensionDirectCompilerReferenceToOtherClass"/>
-  </extension>
-
-  <extension point="case" id="lookupPlugin">
-    <test run="org.eclipse.core.tests.internal.plugin.a.ExtensionIndirectReferenceToPlugin"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin_a.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin_a.jar b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin_a.jar
deleted file mode 100644
index 64fed09..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin_a.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin_a_external.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin_a_external.jar b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin_a_external.jar
deleted file mode 100644
index 97f6df5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.a/plugin_a_external.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin.properties
deleted file mode 100644
index 418f56b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test String
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin.xml
deleted file mode 100644
index d57b074..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin B"
-  id="plugin.b"
-  version="1.0"
-  class="org.eclipse.core.tests.internal.plugin.b.PluginClass"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="plugin.c" export="true"/>
-    <import plugin="plugin.d"/>
-  </requires>
-
-  <runtime>
-    <library name="plugin_b.jar">
-      <export name="org.eclipse.core.tests.internal.plugin.b.api.*"/>
-      <export name="org.eclipse.core.tests.internal.plugin.b.PluginClass"/>
-    </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin_b.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin_b.jar b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin_b.jar
deleted file mode 100644
index 68d5189..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.b/plugin_b.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin.properties
deleted file mode 100644
index 418f56b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test String
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin.xml
deleted file mode 100644
index 5fa9a4d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin C"
-  id="plugin.c"
-  version="1.0"
-  class="org.eclipse.core.tests.internal.plugin.c.PluginClass"
-  vendor-name="IBM">
-
-  <runtime>
-    <library name="plugin_c.jar">
-      <export name="org.eclipse.core.tests.internal.plugin.c.api.*"/>
-      <export name="org.eclipse.core.tests.internal.plugin.c.ExportedClass"/>
-      <export name="org.eclipse.core.tests.internal.plugins.TestClass"/>
-    </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin_c.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin_c.jar b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin_c.jar
deleted file mode 100644
index 108414e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.c/plugin_c.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/plugin.xml
deleted file mode 100644
index 8b2f1dc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin D"
-  id="plugin.d"
-  version="1.0"
-  class="org.eclipse.core.tests.internal.plugin.d.PluginClass"
-  vendor-name="IBM">
-
-  <runtime>
-    <library name="plugin_d.jar">
-      <export name="org.eclipse.core.tests.internal.plugin.d.api.*"/>
-      <export name="org.eclipse.core.tests.internal.plugins.TestClass"/>
-    </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/plugin_d.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/plugin_d.jar b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/plugin_d.jar
deleted file mode 100644
index fb24038..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/plugin_d.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/resource.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/resource.properties b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/resource.properties
deleted file mode 100644
index 38a30aa..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.activation.1/plugins/plugin.d/resource.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=resource.properties Test String
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/.plugin-path
deleted file mode 100644
index 0f1297e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/.plugin-path
+++ /dev/null
@@ -1,2 +0,0 @@
-base=file:c:/eclipse/plugins/

-test=file:d:/Plugin_Testing/plugins.parser.1/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.1/plugin.xml
deleted file mode 100644
index e4abe83..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.1/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="plugins.parser.1"
-  version="1.2"
-  class="com.ibm.eclipse.MyClass"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="plugins.parser.2" version="3.7" export="true"/>
-     <import plugin="plugins.parser.3"/>
-  </requires>
-
-  <runtime>
-     <library name="lib1.jar"/>
-     <library name="lib2.jar">
-        <export name="*"/>
-     </library>
-     <library name="lib3.jar">
-        <export name="a.b.C"/>
-     </library>
-  </runtime>
-
-  <extension-point id="xpt1" name="First extension point" schema="pde/xpt1.xml"/>
-  <extension-point id="xpt2" name="Second extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-  <extension point="plugins.parser.1.xpt1">
-     <config id="2"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.2/plugin.xml
deleted file mode 100644
index aec78e2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.2/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="plugins.parser.2"
-  version="3.7.9"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.3/plugin.xml
deleted file mode 100644
index ae389b7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.parser.1/plugins.parser.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="plugins.parser.3"
-  version="1.2"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/.plugin-path
deleted file mode 100644
index 6347db6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/.plugin-path
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Nov 13 23:12:14 EST 2000

-base=file:c:/eclipse/plugins/

-test=file:d:/Plugin_Testing/plugins.resolve.1/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.a/plugin.xml
deleted file mode 100644
index d51f5c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-     <import plugin="tests.c" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.b/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 9b4e2d7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6972d1b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index cf9d0a9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.1/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/.plugin-path
deleted file mode 100644
index 1943c23..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/.plugin-path
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Nov 13 23:12:14 EST 2000

-base=file:c:/eclipse/plugins/

-test=file:d:/Plugin_Testing/plugins.resolve.10/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.a/plugin.xml
deleted file mode 100644
index 0205bad..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-     <import plugin="tests.d"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.b/plugin.xml
deleted file mode 100644
index 1092985..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.b/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6972d1b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index cf9d0a9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.d/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.d/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.d/plugin.xml
deleted file mode 100644
index ced5b43..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.10/tests.d/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.5"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.a/plugin.xml
deleted file mode 100644
index d51f5c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-     <import plugin="tests.c" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.b/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 6efef81..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.5" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6972d1b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index cf9d0a9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.11/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.a/plugin.xml
deleted file mode 100644
index d51f5c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-     <import plugin="tests.c" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.b/plugin.xml
deleted file mode 100644
index aabadc2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.b/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 9b4e2d7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 5966614..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index cf9d0a9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.12/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.a/plugin.xml
deleted file mode 100644
index d51f5c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-     <import plugin="tests.c" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.b/plugin.xml
deleted file mode 100644
index aabadc2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.b/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 6efef81..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.5" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 5966614..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index cf9d0a9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.13/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.a/plugin.xml
deleted file mode 100644
index b2e0e2d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-     <import plugin="tests.c" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.b/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 6efef81..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.5" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6972d1b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index cf9d0a9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.14/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.a/plugin.xml
deleted file mode 100644
index b2e0e2d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-     <import plugin="tests.c" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.b/plugin.xml
deleted file mode 100644
index aabadc2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.b/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 6efef81..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.5" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 5966614..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index cf9d0a9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.15/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.a/plugin.xml
deleted file mode 100644
index 6ca139d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.0.1" match="perfect"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.0/plugin.xml
deleted file mode 100644
index 2ad03bc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.1/plugin.xml
deleted file mode 100644
index dbd23be..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.2/plugin.xml
deleted file mode 100644
index 1fdeaaf..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.0.2/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.0.2"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.16/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.a/plugin.xml
deleted file mode 100644
index 6ca139d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.0.1" match="perfect"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.0.0/plugin.xml
deleted file mode 100644
index 2ad03bc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.0.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.0.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.0.2/plugin.xml
deleted file mode 100644
index 1fdeaaf..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.0.2/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.0.2"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.17/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.a/plugin.xml
deleted file mode 100644
index f851fc2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.0.1" match="equivalent"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.0.0/plugin.xml
deleted file mode 100644
index 2ad03bc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.0.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.0.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.0.2/plugin.xml
deleted file mode 100644
index 1fdeaaf..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.0.2/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.0.2"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.18/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.a/plugin.xml
deleted file mode 100644
index f851fc2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.0.1" match="equivalent"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.0/plugin.xml
deleted file mode 100644
index 2ad03bc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.1/plugin.xml
deleted file mode 100644
index dbd23be..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.2/plugin.xml
deleted file mode 100644
index 1fdeaaf..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.0.2/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.0.2"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.19/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/.plugin-path
deleted file mode 100644
index 3a1b638..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/.plugin-path
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Nov 13 23:12:14 EST 2000

-base=file:c:/eclipse/plugins/

-test=file:d:/Plugin_Testing/plugins.resolve.2/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.0/plugin.xml
deleted file mode 100644
index 3b209d6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0"/>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.1/plugin.xml
deleted file mode 100644
index f551f66..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.1/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.1"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.2/plugin.xml
deleted file mode 100644
index f0de7fc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.a_1.2.2/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index ec9bc5e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.c" version="1.0.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 0429290..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index 774276c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_1.0.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_1.0.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_1.0.2/plugin.xml
deleted file mode 100644
index 7b845e1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_1.0.2/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.2"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.d" version="1.1.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6c425fd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index c4cfdc5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.d"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.0.0/plugin.xml
deleted file mode 100644
index 58b3262..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.0.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.1.0/plugin.xml
deleted file mode 100644
index a2d7ac2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.1.1/plugin.xml
deleted file mode 100644
index 6c77f9c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_1.1.1/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.1"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e" version="1.1.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_2.0.0/plugin.xml
deleted file mode 100644
index adb384d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.0.0/plugin.xml
deleted file mode 100644
index 9f3584b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.1.1/plugin.xml
deleted file mode 100644
index 55b7e92..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.2.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.2.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.2.1/plugin.xml
deleted file mode 100644
index 4d01e43..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_1.2.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.2.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_2.0.0/plugin.xml
deleted file mode 100644
index c2ba37e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_2.1.0/plugin.xml
deleted file mode 100644
index 1f0e387..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.2/tests.e_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.a/plugin.xml
deleted file mode 100644
index f851fc2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.0.1" match="equivalent"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.20/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.a/plugin.xml
deleted file mode 100644
index 38c53f7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3" match="compatible"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.2.4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.2.4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.2.4/plugin.xml
deleted file mode 100644
index b1c1568..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_2.2.4/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.21/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.a/plugin.xml
deleted file mode 100644
index 38c53f7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3" match="compatible"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.3/plugin.xml
deleted file mode 100644
index ac7c8e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.4/plugin.xml
deleted file mode 100644
index b1c1568..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_2.2.4/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.22/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.a/plugin.xml
deleted file mode 100644
index 38c53f7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3" match="compatible"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.2.4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.2.4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.2.4/plugin.xml
deleted file mode 100644
index b1c1568..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.2.4/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.3.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.3.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.3.0/plugin.xml
deleted file mode 100644
index 79f64db..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_2.3.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.3.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.23/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.a/plugin.xml
deleted file mode 100644
index 38c53f7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3" match="compatible"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.3/plugin.xml
deleted file mode 100644
index ac7c8e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.4/plugin.xml
deleted file mode 100644
index b1c1568..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.2.4/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.3.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.3.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.3.0/plugin.xml
deleted file mode 100644
index 79f64db..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_2.3.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.3.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.24/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.a/plugin.xml
deleted file mode 100644
index 38c53f7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3" match="compatible"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.25/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.a/plugin.xml
deleted file mode 100644
index 795d7ea..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3" match="greaterOrEqual"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.2.4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.2.4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.2.4/plugin.xml
deleted file mode 100644
index b1c1568..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_2.2.4/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.26/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.a/plugin.xml
deleted file mode 100644
index 795d7ea..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3" match="greaterOrEqual"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.3/plugin.xml
deleted file mode 100644
index ac7c8e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.4/plugin.xml
deleted file mode 100644
index b1c1568..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_2.2.4/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.27/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.a/plugin.xml
deleted file mode 100644
index 795d7ea..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3" match="greaterOrEqual"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.28/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.a/plugin.xml
deleted file mode 100644
index af78801..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.2.4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.2.4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.2.4/plugin.xml
deleted file mode 100644
index b1c1568..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_2.2.4/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.29/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/.plugin-path
deleted file mode 100644
index a4505fb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/.plugin-path
+++ /dev/null
@@ -1,2 +0,0 @@
-base=file:c:/eclipse/plugins/

-test=file:d:/Plugin_Testing/plugins.resolve.3/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.a_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.a_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.a_1.2.0/plugin.xml
deleted file mode 100644
index ea9af8c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.a_1.2.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="b" version="2.1.0" match="exact"/>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.a_1.2.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.a_1.2.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.a_1.2.1/plugin.xml
deleted file mode 100644
index f551f66..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.a_1.2.1/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.1"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index ec9bc5e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.c" version="1.0.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 0429290..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index 774276c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_1.0.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_1.0.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_1.0.2/plugin.xml
deleted file mode 100644
index 7b845e1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_1.0.2/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.2"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.d" version="1.1.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6c425fd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index e2a0490..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id=tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.d"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.0.0/plugin.xml
deleted file mode 100644
index 58b3262..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.0.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.1.0/plugin.xml
deleted file mode 100644
index a2d7ac2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.1.1/plugin.xml
deleted file mode 100644
index 6c77f9c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_1.1.1/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.1"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e" version="1.1.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_2.0.0/plugin.xml
deleted file mode 100644
index adb384d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.0.0/plugin.xml
deleted file mode 100644
index 9f3584b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.1.1/plugin.xml
deleted file mode 100644
index 55b7e92..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.2.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.2.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.2.1/plugin.xml
deleted file mode 100644
index 4d01e43..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_1.2.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.2.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_2.0.0/plugin.xml
deleted file mode 100644
index c2ba37e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_2.1.0/plugin.xml
deleted file mode 100644
index 1f0e387..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.3/tests.e_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.a/plugin.xml
deleted file mode 100644
index af78801..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.3/plugin.xml
deleted file mode 100644
index ac7c8e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.4/plugin.xml
deleted file mode 100644
index b1c1568..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_2.2.4/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.30/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.a/plugin.xml
deleted file mode 100644
index af78801..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.2.4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.2.4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.2.4/plugin.xml
deleted file mode 100644
index b1c1568..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.2.4/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.3.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.3.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.3.0/plugin.xml
deleted file mode 100644
index 79f64db..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_2.3.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.3.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.31/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.a/plugin.xml
deleted file mode 100644
index af78801..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.3/plugin.xml
deleted file mode 100644
index ac7c8e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.4/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.4/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.4/plugin.xml
deleted file mode 100644
index b1c1568..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.2.4/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.4"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.3.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.3.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.3.0/plugin.xml
deleted file mode 100644
index 79f64db..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_2.3.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.3.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.32/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.a/plugin.xml
deleted file mode 100644
index af78801..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.2.3"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 87ef40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_3.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_3.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_3.0.1/plugin.xml
deleted file mode 100644
index 8eb8bb2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.33/tests.b_3.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/.plugin-path
deleted file mode 100644
index fa360bb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/.plugin-path
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Nov 13 23:12:14 EST 2000

-base=file:c:/eclipse/plugins/;

-test=file:d:/Plugin_Testing/plugins.resolve.4/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.a_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.a_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.a_1.2.0/plugin.xml
deleted file mode 100644
index ba70412..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.a_1.2.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.0" match="exact"/>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index ec9bc5e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.c" version="1.0.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 0429290..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index 774276c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_1.0.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_1.0.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_1.0.2/plugin.xml
deleted file mode 100644
index 7b845e1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_1.0.2/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.2"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.d" version="1.1.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6c425fd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index c4cfdc5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="tests.d"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.0.0/plugin.xml
deleted file mode 100644
index 58b3262..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.0.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.1.0/plugin.xml
deleted file mode 100644
index a2d7ac2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.1.1/plugin.xml
deleted file mode 100644
index 6c77f9c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_1.1.1/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.1.1"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e" version="1.1.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_2.0.0/plugin.xml
deleted file mode 100644
index adb384d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.e" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.0.0/plugin.xml
deleted file mode 100644
index 9f3584b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.1.1/plugin.xml
deleted file mode 100644
index 55b7e92..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.2.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.2.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.2.1/plugin.xml
deleted file mode 100644
index 4d01e43..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_1.2.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="1.2.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_2.0.0/plugin.xml
deleted file mode 100644
index c2ba37e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_2.1.0/plugin.xml
deleted file mode 100644
index 1f0e387..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.4/tests.e_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.e"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/.plugin-path
deleted file mode 100644
index ab507fe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/.plugin-path
+++ /dev/null
@@ -1,2 +0,0 @@
-base=file:c:/eclipse/plugins/;

-test=file:d:/Plugin_Testing/plugins.resolve.5/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.a/plugin.xml
deleted file mode 100644
index 726293a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.b/plugin.xml
deleted file mode 100644
index 00ac852..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.b/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.c/plugin.xml
deleted file mode 100644
index abab4b5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.c/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.d/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.d/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.d/plugin.xml
deleted file mode 100644
index e8692e7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.5/tests.d/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/.plugin-path
deleted file mode 100644
index b7bdbe2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/.plugin-path
+++ /dev/null
@@ -1,2 +0,0 @@
-base=file:c:/eclipse/plugins/

-test=file:d:/Plugin_Testing/plugins.resolve.6/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.a/plugin.xml
deleted file mode 100644
index f430cd4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.0.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.b/plugin.xml
deleted file mode 100644
index fa2c0f1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.b/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.c_1.0.9/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.c_1.0.9/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.c_1.0.9/plugin.xml
deleted file mode 100644
index 1964bfe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.c_1.0.9/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.9"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.c_2.5.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.c_2.5.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.c_2.5.0/plugin.xml
deleted file mode 100644
index cb8300a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.6/tests.c_2.5.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.5.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/.plugin-path
deleted file mode 100644
index d380b61..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/.plugin-path
+++ /dev/null
@@ -1,2 +0,0 @@
-base=file:c:/eclipse/plugins/;

-test=file:d:/Plugin_Testing/plugins.resolve.7/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.a/plugin.xml
deleted file mode 100644
index f430cd4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.0.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.b/plugin.xml
deleted file mode 100644
index fa2c0f1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.b/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.c_1.0.9/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.c_1.0.9/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.c_1.0.9/plugin.xml
deleted file mode 100644
index 1964bfe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.c_1.0.9/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.9"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.c_2.5.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.c_2.5.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.c_2.5.0/plugin.xml
deleted file mode 100644
index 57fac41..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.7/tests.c_2.5.0/plugin.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id=tests.c"
-  version="2.5.0"
-  vendor-name="IBM">
-
-  <extension-point id="point1"/>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/.plugin-path
deleted file mode 100644
index 570a4d6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/.plugin-path
+++ /dev/null
@@ -1,2 +0,0 @@
-base=file:c:/eclipse/plugins/;

-test=file:d:/Plugin_Testing/plugins.resolve.8/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.a/plugin.xml
deleted file mode 100644
index f430cd4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.0.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.b/plugin.xml
deleted file mode 100644
index 8a00594..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.b/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="3.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.c_1.0.9/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.c_1.0.9/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.c_1.0.9/plugin.xml
deleted file mode 100644
index 1964bfe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.c_1.0.9/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.9"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.c_2.5.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.c_2.5.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.c_2.5.0/plugin.xml
deleted file mode 100644
index cb8300a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.8/tests.c_2.5.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.5.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/.plugin-path
deleted file mode 100644
index 6347db6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/.plugin-path
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Nov 13 23:12:14 EST 2000

-base=file:c:/eclipse/plugins/

-test=file:d:/Plugin_Testing/plugins.resolve.1/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.a/plugin.xml
deleted file mode 100644
index d51f5c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-     <import plugin="tests.c" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.b/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 9b4e2d7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index b140ab0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.d" version="1.0.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c_2.0.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c_2.0.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c_2.0.5/plugin.xml
deleted file mode 100644
index cf9d0a9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.c_2.0.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.d/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.d/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.d/plugin.xml
deleted file mode 100644
index 4ce2949..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.d/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.d_2.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.d_2.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.d_2.0.1/plugin.xml
deleted file mode 100644
index ed4f080..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.resolve.9/tests.d_2.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/.plugin-path
deleted file mode 100644
index 3e60d07..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/.plugin-path
+++ /dev/null
@@ -1,2 +0,0 @@
-base=file:c:/eclipse/plugins/;

-test=file:d:/Plugin_Testing/plugins.version.1/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a/plugin.xml
deleted file mode 100644
index 6277eb1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="plugin.a"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.0.0/plugin.xml
deleted file mode 100644
index 6277eb1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="plugin.a"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.0.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.0.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.0.1/plugin.xml
deleted file mode 100644
index dc33914..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.0.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="plugin.a"
-  version="1.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.1.0/plugin.xml
deleted file mode 100644
index 9547280..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="plugin.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.0/plugin.xml
deleted file mode 100644
index bcf9fdd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="plugin.a"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.0_copy/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.0_copy/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.0_copy/plugin.xml
deleted file mode 100644
index bcf9fdd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.0_copy/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="plugin.a"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.15/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.15/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.15/plugin.xml
deleted file mode 100644
index f7dcbbe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.a_2.0.15/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="plugin.a"
-  version="2.0.15"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.1/plugin.xml
deleted file mode 100644
index 443c560..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.1/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="next.1"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="plugin.a" version="1.0.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.2/plugin.xml
deleted file mode 100644
index e0c9499..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.2/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="next.2"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="plugin.a" version="1.1.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.3/plugin.xml
deleted file mode 100644
index fc0664c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.next.3/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests - Test Plugin A"
-  id="next.3"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="plugin.a" version="2.0.0" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.root/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.root/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.root/plugin.xml
deleted file mode 100644
index 7315cd7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.1/plugin.root/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="plugin.root"
-  version="1.0.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="next.1"/>
-    <import plugin="next.2"/>
-    <import plugin="next.3"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/.plugin-path

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/.plugin-path b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/.plugin-path
deleted file mode 100644
index e8c6a0c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/.plugin-path
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Nov 13 23:12:14 EST 2000

-base=file:c:/eclipse/plugins/;

-test=file:d:/Plugin_Testing/plugins.version.2/

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.1.0/plugin.xml
deleted file mode 100644
index 622118f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="b"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.1.1/plugin.xml
deleted file mode 100644
index c7acb07..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.1.1/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="a"
-  version="1.1.1"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="b"/>
-    <import plugin="d" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.2.0/plugin.xml
deleted file mode 100644
index b9f41d8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="b" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_2.0.0/plugin.xml
deleted file mode 100644
index 552a2f2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/a_2.0.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="a"
-  version="2.0.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="b" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/b_1.1.0/plugin.xml
deleted file mode 100644
index 22b79ea..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/b_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/b_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/b_1.2.0/plugin.xml
deleted file mode 100644
index 4c92e78..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/b_1.2.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="b"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.1.0/plugin.xml
deleted file mode 100644
index b0de87d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="d" version="1.2.0"/>
-    <import plugin="e" version="1.3.1" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.2.0/plugin.xml
deleted file mode 100644
index ddae834..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.2.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="c"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="d" version="1.2.0"/>
-    <import plugin="e" version="1.3.1" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.3.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.3.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.3.0/plugin.xml
deleted file mode 100644
index 27586d2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/c_1.3.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="c"
-  version="1.3.0"
-  vendor-name="IBM">
-
-  <requires>
-    <import plugin="d" version="1.2.0"/>
-    <import plugin="e" version="1.3.1" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_1.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_1.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_1.2.0/plugin.xml
deleted file mode 100644
index 6e9d0c2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_1.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="d"
-  version="1.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_1.3.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_1.3.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_1.3.0/plugin.xml
deleted file mode 100644
index 3d2d617..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_1.3.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="d"
-  version="1.3.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_2.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_2.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_2.0.0/plugin.xml
deleted file mode 100644
index a65d004..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/d_2.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="d"
-  version="2.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.3.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.3.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.3.1/plugin.xml
deleted file mode 100644
index 36ca60d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.3.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="e"
-  version="1.3.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.3.2/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.3.2/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.3.2/plugin.xml
deleted file mode 100644
index a6092e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.3.2/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="e"
-  version="1.3.2"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.4.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.4.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.4.0/plugin.xml
deleted file mode 100644
index b9e7a33..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/plugins.version.2/e_1.4.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin"
-  id="e"
-  version="1.4.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.a/plugin.xml
deleted file mode 100644
index 5b62ebb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.1.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.1.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.1.5/plugin.xml
deleted file mode 100644
index 69ae779..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.1.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.1/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.a/plugin.xml
deleted file mode 100644
index 0376309..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.3/plugin.xml
deleted file mode 100644
index 92282e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.5/plugin.xml
deleted file mode 100644
index 69ae779..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.1.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.10/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.a/plugin.xml
deleted file mode 100644
index 5b62ebb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.3/plugin.xml
deleted file mode 100644
index 92282e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.5/plugin.xml
deleted file mode 100644
index 69ae779..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.1.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.2/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.a/plugin.xml
deleted file mode 100644
index 5b62ebb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.1.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.1.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.1.3/plugin.xml
deleted file mode 100644
index 92282e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.1.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.3/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.a/plugin.xml
deleted file mode 100644
index 5b62ebb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.1.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.1.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.1.5/plugin.xml
deleted file mode 100644
index 69ae779..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.1.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.1/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.a/plugin.xml
deleted file mode 100644
index 0376309..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.3/plugin.xml
deleted file mode 100644
index 92282e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.5/plugin.xml
deleted file mode 100644
index 69ae779..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.1.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.10/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.a/plugin.xml
deleted file mode 100644
index 5b62ebb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.3/plugin.xml
deleted file mode 100644
index 92282e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.5/plugin.xml
deleted file mode 100644
index 69ae779..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.1.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.2/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.a/plugin.xml
deleted file mode 100644
index 5b62ebb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3" match="exact"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.1.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.1.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.1.3/plugin.xml
deleted file mode 100644
index 92282e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.1.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/regression.resolve.3/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.a/plugin.xml
deleted file mode 100644
index 5bcabbe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3" match="compatible"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.1.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.1.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.1.5/plugin.xml
deleted file mode 100644
index 69ae779..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.1.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.4/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.a/plugin.xml
deleted file mode 100644
index 5bcabbe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3" match="compatible"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.3/plugin.xml
deleted file mode 100644
index 92282e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.5/plugin.xml
deleted file mode 100644
index 69ae779..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.1.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.5/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.a/plugin.xml
deleted file mode 100644
index 5bcabbe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3" match="compatible"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_2.1.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_2.1.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_2.1.3/plugin.xml
deleted file mode 100644
index 92282e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_2.1.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.6/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.a/plugin.xml
deleted file mode 100644
index 04b3af6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.1.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.1.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.1.5/plugin.xml
deleted file mode 100644
index 69ae779..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.1.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.7/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.a/plugin.xml
deleted file mode 100644
index 04b3af6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.3/plugin.xml
deleted file mode 100644
index 92282e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.5/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.5/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.5/plugin.xml
deleted file mode 100644
index 69ae779..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.1.5/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.5"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.2.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.2.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.2.0/plugin.xml
deleted file mode 100644
index d465d05..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_2.2.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.8/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.a/plugin.xml
deleted file mode 100644
index 04b3af6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" version="2.1.3"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_2.1.1/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_2.1.1/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_2.1.1/plugin.xml
deleted file mode 100644
index 07d68a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_2.1.1/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_2.1.3/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_2.1.3/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_2.1.3/plugin.xml
deleted file mode 100644
index 92282e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_2.1.3/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.3"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_3.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_3.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_3.1.0/plugin.xml
deleted file mode 100644
index 4e1e9c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/regression.resolve.9/tests.b_3.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="3.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.1/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.1/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.1/tests.a/plugin.xml
deleted file mode 100644
index 9c60e76..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.1/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.a/plugin.xml
deleted file mode 100644
index 3805dc1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 194b145..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.1.0"/>
-     <import plugin="tests.d" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 6c73a50..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6972d1b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 44acda9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.d/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.d/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.d/plugin.xml
deleted file mode 100644
index 546e359..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.10/tests.d/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.11/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.11/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.11/tests.a/plugin.xml
deleted file mode 100644
index 131f083..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.11/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.11/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.11/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.11/tests.b/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.11/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.12/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.12/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.12/tests.a/plugin.xml
deleted file mode 100644
index 131f083..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.12/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.13/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.13/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.13/tests.a/plugin.xml
deleted file mode 100644
index 3592f6a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.13/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true" match="exact" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.13/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.13/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.13/tests.b/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.13/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.14/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.14/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.14/tests.a/plugin.xml
deleted file mode 100644
index 3592f6a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.14/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true" match="exact" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.15/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.15/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.15/tests.a/plugin.xml
deleted file mode 100644
index 476920b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.15/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true" match="compatible" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.15/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.15/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.15/tests.b/plugin.xml
deleted file mode 100644
index 8af738a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.15/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.16/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.16/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.16/tests.a/plugin.xml
deleted file mode 100644
index 6911006..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.16/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true" match="compatible" version="1.2.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.17/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.17/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.17/tests.a/plugin.xml
deleted file mode 100644
index dc73e55..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.17/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c"/>
-     <import plugin="tests.b" optional="true"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.17/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.17/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.17/tests.c/plugin.xml
deleted file mode 100644
index bfb2c61..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.17/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.18/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.18/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.18/tests.a/plugin.xml
deleted file mode 100644
index dc73e55..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.18/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c"/>
-     <import plugin="tests.b" optional="true"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.19/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.19/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.19/tests.a/plugin.xml
deleted file mode 100644
index dc73e55..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.19/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c"/>
-     <import plugin="tests.b" optional="true"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.19/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.19/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.19/tests.b/plugin.xml
deleted file mode 100644
index 3c393a1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.19/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.2/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.2/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.2/tests.a/plugin.xml
deleted file mode 100644
index 9c60e76..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.2/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.2/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.2/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.2/tests.b/plugin.xml
deleted file mode 100644
index 44bed7e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.2/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.a/plugin.xml
deleted file mode 100644
index dc73e55..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c"/>
-     <import plugin="tests.b" optional="true"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.b/plugin.xml
deleted file mode 100644
index 3c393a1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.c/plugin.xml
deleted file mode 100644
index bfb2c61..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.20/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.a/plugin.xml
deleted file mode 100644
index 0bc585b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-     <import plugin="tests.b" optional="true" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index b00e4e5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 6c73a50..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6972d1b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 8ba12f3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.21/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.a/plugin.xml
deleted file mode 100644
index 0bc585b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-     <import plugin="tests.b" optional="true" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index b00e4e5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 6c73a50..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 5966614..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 8ba12f3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.22/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.3/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.3/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.3/tests.a/plugin.xml
deleted file mode 100644
index d498e02..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.3/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true"/>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.3/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.3/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.3/tests.c/plugin.xml
deleted file mode 100644
index bfb2c61..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.3/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.4/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.4/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.4/tests.a/plugin.xml
deleted file mode 100644
index d498e02..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.4/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true"/>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.5/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.5/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.5/tests.a/plugin.xml
deleted file mode 100644
index d498e02..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.5/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true"/>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.5/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.5/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.5/tests.b/plugin.xml
deleted file mode 100644
index 3c393a1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.5/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.a/plugin.xml
deleted file mode 100644
index d498e02..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true"/>
-     <import plugin="tests.c"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.b/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.b/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.b/plugin.xml
deleted file mode 100644
index 3c393a1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.b/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.1"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.c/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.c/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.c/plugin.xml
deleted file mode 100644
index bfb2c61..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.6/tests.c/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.a/plugin.xml
deleted file mode 100644
index f75a19f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true" version="1.1.0"/>
-     <import plugin="tests.c" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index b00e4e5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 6c73a50..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6972d1b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 8ba12f3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.7/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.a/plugin.xml
deleted file mode 100644
index f75a19f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.a/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true" version="1.1.0"/>
-     <import plugin="tests.c" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index b00e4e5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 6c73a50..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 5966614..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <extension-point id="xpt1" name="First extension point"/>
-
-  <extension point="xpt1" id="ext1" name="First extension">
-     <config id="1"/>
-  </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 8ba12f3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.8/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.a/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.a/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.a/plugin.xml
deleted file mode 100644
index 3805dc1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.a/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.a"
-  version="1.2"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.b" optional="true" version="1.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_1.0.0/plugin.xml
deleted file mode 100644
index 919a7e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_1.1.0/plugin.xml
deleted file mode 100644
index 194b145..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_1.1.0/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="1.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="1.1.0"/>
-     <import plugin="tests.d" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_2.1.0/plugin.xml
deleted file mode 100644
index 6c73a50..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.b_2.1.0/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.b"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_1.0.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_1.0.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_1.0.0/plugin.xml
deleted file mode 100644
index 7d8bce2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_1.0.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.0.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_1.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_1.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_1.1.0/plugin.xml
deleted file mode 100644
index 6972d1b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_1.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="1.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_2.1.0/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_2.1.0/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_2.1.0/plugin.xml
deleted file mode 100644
index 8ba12f3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.c_2.1.0/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.c"
-  version="2.1.0"
-  vendor-name="IBM">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.d/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.d/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.d/plugin.xml
deleted file mode 100644
index 546e359..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugin_Testing/softPrereq.9/tests.d/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="IBM Tooling Platform Core Tests"
-  id="tests.d"
-  version="2.1.0"
-  vendor-name="IBM">
-
-  <requires>
-     <import plugin="tests.c" version="2.1.0"/>
-  </requires>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/Bug3093/codePluginA.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/Bug3093/codePluginA.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/Bug3093/codePluginA.jar
deleted file mode 100644
index 5b2d198..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/Bug3093/codePluginA.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/Bug3093/plugins/pluginA/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/Bug3093/plugins/pluginA/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/Bug3093/plugins/pluginA/plugin.xml
deleted file mode 100644
index e878267..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/Bug3093/plugins/pluginA/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test 3093 Plugin A"
-  id="test3093PluginA"
-  version="1.0"
-  vendor-name="OTI">
-
- <runtime>
-    <library name="$nl$/">
-      <export name="*"/>
-    </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/interestingFragmentFindTest/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/interestingFragmentFindTest/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/interestingFragmentFindTest/fragment.xml
deleted file mode 100644
index fdfb747..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/interestingFragmentFindTest/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Interesting Fragment Find Test"
-  id="interestingFragmentFindTest"
-  version="1.0.0"
-  plugin-id="interestingPluginFindTest"
-  plugin-version="1.2.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/interestingPluginFindTest/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/interestingPluginFindTest/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/interestingPluginFindTest/plugin.xml
deleted file mode 100644
index 17c6dd8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/interestingPluginFindTest/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Interesting Plugin Find Test"
-  id="interestingPluginFindTest"
-  version="1.2.0"
-  vendor-name="OTI">
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/nlFragmentFindTest/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/nlFragmentFindTest/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/nlFragmentFindTest/fragment.xml
deleted file mode 100644
index 2f1bcd2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/nlFragmentFindTest/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="NL Fragment Find Test"
-  id="nlFragmentFindTest"
-  version="1.0.0"
-  plugin-id="nlPluginFindTest"
-  plugin-version="1.2.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/nlPluginFindTest/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/nlPluginFindTest/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/nlPluginFindTest/plugin.xml
deleted file mode 100644
index 9577dd5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/nlPluginFindTest/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="NL Plugin Find Test"
-  id="nlPluginFindTest"
-  version="1.2.0"
-  vendor-name="OTI">
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/osFragmentFindTest/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/osFragmentFindTest/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/osFragmentFindTest/fragment.xml
deleted file mode 100644
index 2d18c36..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/osFragmentFindTest/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="OS Fragment Find Test"
-  id="osFragmentFindTest"
-  version="1.0.0"
-  plugin-id="osPluginFindTest"
-  plugin-version="1.2.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/osPluginFindTest/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/osPluginFindTest/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/osPluginFindTest/plugin.xml
deleted file mode 100644
index 0953e23..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/osPluginFindTest/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="OS Plugin Find Test"
-  id="osPluginFindTest"
-  version="1.2.0"
-  vendor-name="OTI">
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/rootFragmentFindTest/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/rootFragmentFindTest/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/rootFragmentFindTest/fragment.xml
deleted file mode 100644
index af54504..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/rootFragmentFindTest/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Root Fragment Find Test"
-  id="rootFragmentFindTest"
-  version="1.0.0"
-  plugin-id="rootPluginFindTest"
-  plugin-version="1.2.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/rootPluginFindTest/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/rootPluginFindTest/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/rootPluginFindTest/plugin.xml
deleted file mode 100644
index 0a37d5e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/rootPluginFindTest/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Root Plugin Find Test"
-  id="rootPluginFindTest"
-  version="1.2.0"
-  vendor-name="OTI">
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/wsFragmentFindTest/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/wsFragmentFindTest/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/wsFragmentFindTest/fragment.xml
deleted file mode 100644
index d8aa9b1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/wsFragmentFindTest/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="WS Fragment Find Test"
-  id="wsFragmentFindTest"
-  version="1.0.0"
-  plugin-id="wsPluginFindTest"
-  plugin-version="1.2.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/wsPluginFindTest/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/wsPluginFindTest/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/wsPluginFindTest/plugin.xml
deleted file mode 100644
index 89d01a0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/FindTests/plugins/wsPluginFindTest/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="WS Plugin Find Test"
-  id="wsPluginFindTest"
-  version="1.2.0"
-  vendor-name="OTI">
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentD/codePluginD.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentD/codePluginD.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentD/codePluginD.jar
deleted file mode 100644
index 9de9737..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentD/codePluginD.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentD/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentD/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentD/fragment.xml
deleted file mode 100644
index 84093b3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentD/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test D"
-  id="codeFragmentD"
-  version="1.0.0"
-  plugin-id="codePluginD"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginD.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentE/bin/codePluginE.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentE/bin/codePluginE.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentE/bin/codePluginE.jar
deleted file mode 100644
index f7fee80..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentE/bin/codePluginE.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentE/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentE/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentE/fragment.xml
deleted file mode 100644
index 9e8f2a6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentE/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test E"
-  id="codeFragmentE"
-  version="1.0.0"
-  plugin-id="codePluginE"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginE.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/bin/codePluginF.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/bin/codePluginF.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/bin/codePluginF.jar
deleted file mode 100644
index 7d834e6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/bin/codePluginF.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/codePluginF.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/codePluginF.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/codePluginF.jar
deleted file mode 100644
index b8ed413..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/codePluginF.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/fragment.xml
deleted file mode 100644
index e6f7e76..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentF/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test F"
-  id="codeFragmentF"
-  version="1.0.0"
-  plugin-id="codePluginF"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentG/codePluginG.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentG/codePluginG.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentG/codePluginG.jar
deleted file mode 100644
index e8e8719..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentG/codePluginG.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentG/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentG/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentG/fragment.xml
deleted file mode 100644
index 6b58234..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentG/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test G"
-  id="codeFragmentG"
-  version="1.0.0"
-  plugin-id="codePluginG"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginG.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentH/bin/codePluginH.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentH/bin/codePluginH.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentH/bin/codePluginH.jar
deleted file mode 100644
index 53c4bf0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentH/bin/codePluginH.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentH/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentH/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentH/fragment.xml
deleted file mode 100644
index 9771365..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentH/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test H"
-  id="codeFragmentH"
-  version="1.0.0"
-  plugin-id="codePluginH"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginH.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentI/codePluginI.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentI/codePluginI.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentI/codePluginI.jar
deleted file mode 100644
index fbd6d84..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentI/codePluginI.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentI/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentI/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentI/fragment.xml
deleted file mode 100644
index 8282c2f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentI/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test I"
-  id="codeFragmentI"
-  version="1.0.0"
-  plugin-id="codePluginI"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginI.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentJ/bin/codePluginJ.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentJ/bin/codePluginJ.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentJ/bin/codePluginJ.jar
deleted file mode 100644
index 72566f6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentJ/bin/codePluginJ.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentJ/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentJ/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentJ/fragment.xml
deleted file mode 100644
index 8ae5d56..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentJ/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test J"
-  id="codeFragmentJ"
-  version="1.0.0"
-  plugin-id="codePluginJ"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginJ.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentK/codePluginK.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentK/codePluginK.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentK/codePluginK.jar
deleted file mode 100644
index ce48356..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentK/codePluginK.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentK/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentK/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentK/fragment.xml
deleted file mode 100644
index addcfa1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentK/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test K"
-  id="codeFragmentK"
-  version="1.0.0"
-  plugin-id="codePluginK"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginK.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentL/bin/codePluginL.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentL/bin/codePluginL.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentL/bin/codePluginL.jar
deleted file mode 100644
index f315f45..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentL/bin/codePluginL.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentL/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentL/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentL/fragment.xml
deleted file mode 100644
index 2d1e2a7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentL/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test L"
-  id="codeFragmentL"
-  version="1.0.0"
-  plugin-id="codePluginL"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginL.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/bin/codePluginM.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/bin/codePluginM.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/bin/codePluginM.jar
deleted file mode 100644
index cc7a362..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/bin/codePluginM.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/codePluginM.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/codePluginM.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/codePluginM.jar
deleted file mode 100644
index 4a5a641..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/codePluginM.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/fragment.xml
deleted file mode 100644
index ff2acbe..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentM/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test M"
-  id="codeFragmentM"
-  version="1.0.0"
-  plugin-id="codePluginM"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginM.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/bin/codePluginN.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/bin/codePluginN.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/bin/codePluginN.jar
deleted file mode 100644
index 915b41d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/bin/codePluginN.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/codePluginN.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/codePluginN.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/codePluginN.jar
deleted file mode 100644
index 393594f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/codePluginN.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/fragment.xml
deleted file mode 100644
index b0ee879..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentN/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test N"
-  id="codeFragmentN"
-  version="1.0.0"
-  plugin-id="codePluginN"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginN.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/bin/codePluginO.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/bin/codePluginO.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/bin/codePluginO.jar
deleted file mode 100644
index 9bfc2fc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/bin/codePluginO.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/codePluginO.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/codePluginO.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/codePluginO.jar
deleted file mode 100644
index 713d0dc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/codePluginO.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/fragment.xml
deleted file mode 100644
index a6f6c0e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codeFragmentO/fragment.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Code Fragment Test O"
-  id="codeFragmentO"
-  version="1.0.0"
-  plugin-id="codePluginO"
-  plugin-version="1.0">
-
- <runtime>
-    <library name="codePluginO.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginA/codePluginA.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginA/codePluginA.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginA/codePluginA.jar
deleted file mode 100644
index 5b2d198..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginA/codePluginA.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginA/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginA/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginA/plugin.xml
deleted file mode 100644
index 3e4dee7..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginA/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin Test A"
-  id="codePluginA"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleA">
-
- <runtime>
-    <library name="codePluginA.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginB/bin/codePluginB.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginB/bin/codePluginB.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginB/bin/codePluginB.jar
deleted file mode 100644
index 2f8b9db..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginB/bin/codePluginB.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginB/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginB/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginB/plugin.xml
deleted file mode 100644
index a99f56a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginB/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin Test B"
-  id="codePluginB"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleB">
-
- <runtime>
-    <library name="codePluginB.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/bin/codePluginC.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/bin/codePluginC.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/bin/codePluginC.jar
deleted file mode 100644
index 4e94745..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/bin/codePluginC.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/codePluginC.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/codePluginC.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/codePluginC.jar
deleted file mode 100644
index 8c249ea..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/codePluginC.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/plugin.xml
deleted file mode 100644
index 4f28589..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginC/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin Test C"
-  id="codePluginC"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleCPB">
-
- <runtime>
-    <library name="codePluginC.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginD/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginD/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginD/plugin.xml
deleted file mode 100644
index 75af240..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginD/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin Test D"
-  id="codePluginD"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleD">
-
- <runtime>
-    <library name="codePluginD.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginE/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginE/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginE/plugin.xml
deleted file mode 100644
index bfc1c10..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginE/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin Test E"
-  id="codePluginE"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleE">
-
- <runtime>
-    <library name="codePluginE.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginF/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginF/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginF/plugin.xml
deleted file mode 100644
index c406092..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginF/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin Test F"
-  id="codePluginF"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleFFB">
-
- <runtime>
-    <library name="codePluginF.jar">
-      <export name="org.eclipse.core.tests.internal.runtimetests.*"/>
-    </library>
-  </runtime>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginG/codePluginG.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginG/codePluginG.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginG/codePluginG.jar
deleted file mode 100644
index c5017bc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginG/codePluginG.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginG/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginG/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginG/plugin.xml
deleted file mode 100644
index 5b8e54c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginG/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin TestG"
-  id="codePluginG"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleGPR">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginH/codePluginH.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginH/codePluginH.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginH/codePluginH.jar
deleted file mode 100644
index 8f08968..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginH/codePluginH.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginH/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginH/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginH/plugin.xml
deleted file mode 100644
index dd6f249..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginH/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin TestH"
-  id="codePluginH"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleHFB">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginI/bin/codePluginI.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginI/bin/codePluginI.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginI/bin/codePluginI.jar
deleted file mode 100644
index 47dab6f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginI/bin/codePluginI.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginI/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginI/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginI/plugin.xml
deleted file mode 100644
index a7b140c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginI/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin TestI"
-  id="codePluginI"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleIPB">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginJ/bin/codePluginJ.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginJ/bin/codePluginJ.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginJ/bin/codePluginJ.jar
deleted file mode 100644
index f2b19de..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginJ/bin/codePluginJ.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginJ/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginJ/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginJ/plugin.xml
deleted file mode 100644
index ac1f39e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginJ/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin TestJ"
-  id="codePluginJ"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleJPB">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/bin/codePluginK.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/bin/codePluginK.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/bin/codePluginK.jar
deleted file mode 100644
index 4725fba..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/bin/codePluginK.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/codePluginK.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/codePluginK.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/codePluginK.jar
deleted file mode 100644
index fe90bcf..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/codePluginK.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/plugin.xml
deleted file mode 100644
index de354a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginK/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin TestK"
-  id="codePluginK"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleKPB">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/bin/codePluginL.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/bin/codePluginL.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/bin/codePluginL.jar
deleted file mode 100644
index e363b33..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/bin/codePluginL.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/codePluginL.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/codePluginL.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/codePluginL.jar
deleted file mode 100644
index 243f6b3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/codePluginL.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/plugin.xml
deleted file mode 100644
index fe1413e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginL/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin TestL"
-  id="codePluginL"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleLPB">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginM/codePluginM.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginM/codePluginM.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginM/codePluginM.jar
deleted file mode 100644
index b02907d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginM/codePluginM.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginM/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginM/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginM/plugin.xml
deleted file mode 100644
index 134e79a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginM/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin TestM"
-  id="codePluginM"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleMFB">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginN/bin/codePluginN.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginN/bin/codePluginN.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginN/bin/codePluginN.jar
deleted file mode 100644
index d10a77f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginN/bin/codePluginN.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginN/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginN/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginN/plugin.xml
deleted file mode 100644
index 0cc69b6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginN/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin TestN"
-  id="codePluginN"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleNPB">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/bin/codePluginO.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/bin/codePluginO.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/bin/codePluginO.jar
deleted file mode 100644
index f88c86b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/bin/codePluginO.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/codePluginO.jar

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/codePluginO.jar b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/codePluginO.jar
deleted file mode 100644
index 02323b5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/codePluginO.jar
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/plugin.xml
deleted file mode 100644
index c0c4ef4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/codePluginO/plugin.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Code Plugin TestO"
-  id="codePluginO"
-  version="1.0"
-  vendor-name="OTI"
-  class="org.eclipse.core.tests.internal.runtimetests.SampleOPB">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentD/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentD/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentD/fragment.xml
deleted file mode 100644
index 64cd381..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentD/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment D"
-  id="fragmentd"
-  version="1.0.0"
-  plugin-id="plugind"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentD/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentD/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentD/plugin.properties
deleted file mode 100644
index 7587f77..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentD/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginD fragment root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentE/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentE/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentE/bin/plugin.properties
deleted file mode 100644
index 7725c61..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentE/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginE fragment bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentE/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentE/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentE/fragment.xml
deleted file mode 100644
index c9005a6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentE/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment E"
-  id="fragmente"
-  version="1.0.0"
-  plugin-id="plugine"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/bin/plugin.properties
deleted file mode 100644
index a2042bc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginF fragment bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/fragment.xml
deleted file mode 100644
index 76c8574..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment F"
-  id="fragmentf"
-  version="1.0.0"
-  plugin-id="pluginf"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/plugin.properties
deleted file mode 100644
index 0fe3ea0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentF/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginF fragment root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentG/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentG/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentG/fragment.xml
deleted file mode 100644
index fd760f9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentG/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment G"
-  id="fragmentg"
-  version="1.0.0"
-  plugin-id="pluging"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentG/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentG/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentG/plugin.properties
deleted file mode 100644
index d39a646..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentG/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginG fragment root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentH/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentH/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentH/bin/plugin.properties
deleted file mode 100644
index 9307aee..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentH/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginH fragment bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentH/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentH/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentH/fragment.xml
deleted file mode 100644
index c995c80..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentH/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment H"
-  id="fragmenth"
-  version="1.0.0"
-  plugin-id="pluginh"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentI/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentI/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentI/fragment.xml
deleted file mode 100644
index c4e9a3d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentI/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment I"
-  id="fragmenti"
-  version="1.0.0"
-  plugin-id="plugini"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentI/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentI/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentI/plugin.properties
deleted file mode 100644
index a386998..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentI/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginI fragment root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentJ/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentJ/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentJ/bin/plugin.properties
deleted file mode 100644
index ce4d615..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentJ/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginJ fragment bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentJ/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentJ/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentJ/fragment.xml
deleted file mode 100644
index f3d970b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentJ/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment J"
-  id="fragmentj"
-  version="1.0.0"
-  plugin-id="pluginj"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentK/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentK/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentK/fragment.xml
deleted file mode 100644
index c9ebc25..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentK/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment K"
-  id="fragmentk"
-  version="1.0.0"
-  plugin-id="plugink"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentK/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentK/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentK/plugin.properties
deleted file mode 100644
index 1d6689b..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentK/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginK fragment root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentL/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentL/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentL/bin/plugin.properties
deleted file mode 100644
index b1f14ee..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentL/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginL fragment bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentL/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentL/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentL/fragment.xml
deleted file mode 100644
index a3a632e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentL/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment L"
-  id="fragmentl"
-  version="1.0.0"
-  plugin-id="pluginl"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/bin/plugin.properties
deleted file mode 100644
index a7b3305..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginM fragment bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/fragment.xml
deleted file mode 100644
index 0378888..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment M"
-  id="fragmentm"
-  version="1.0.0"
-  plugin-id="pluginm"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/plugin.properties
deleted file mode 100644
index bd7a1c6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentM/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginM fragment root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/bin/plugin.properties
deleted file mode 100644
index 1e97281..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginN fragment bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/fragment.xml
deleted file mode 100644
index ad236ab..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment N"
-  id="fragmentn"
-  version="1.0.0"
-  plugin-id="pluginn"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/plugin.properties
deleted file mode 100644
index bebb54e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentN/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginN fragment root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/bin/plugin.properties
deleted file mode 100644
index 69a3d75..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginO fragment bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/fragment.xml
deleted file mode 100644
index 59ce72c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/fragment.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Test Fragment O"
-  id="fragmento"
-  version="1.0.0"
-  plugin-id="plugino"
-  plugin-version="1.0">
-
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/plugin.properties
deleted file mode 100644
index 98f3df0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/fragmentO/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginO fragment root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginA/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginA/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginA/plugin.properties
deleted file mode 100644
index 5ba457d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginA/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginA root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginA/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginA/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginA/plugin.xml
deleted file mode 100644
index 3a83d5e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginA/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin A"
-  id="plugina"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginB/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginB/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginB/bin/plugin.properties
deleted file mode 100644
index 1242b4f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginB/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginB bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginB/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginB/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginB/plugin.xml
deleted file mode 100644
index d5d5d1c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginB/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin B"
-  id="pluginb"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/bin/plugin.properties
deleted file mode 100644
index 5932830..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginC bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/plugin.properties
deleted file mode 100644
index f0c4eb0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginC root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/plugin.xml
deleted file mode 100644
index 36ead92..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginC/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin C"
-  id="pluginc"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginD/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginD/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginD/plugin.xml
deleted file mode 100644
index 182abd6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginD/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin D"
-  id="plugind"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginE/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginE/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginE/plugin.xml
deleted file mode 100644
index ab36687..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginE/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin E"
-  id="plugine"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginF/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginF/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginF/plugin.xml
deleted file mode 100644
index d19cef4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginF/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin F"
-  id="pluginf"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginG/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginG/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginG/plugin.properties
deleted file mode 100644
index ff1a9a4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginG/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginG root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginG/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginG/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginG/plugin.xml
deleted file mode 100644
index 17e00f2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginG/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin G"
-  id="pluging"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginH/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginH/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginH/plugin.properties
deleted file mode 100644
index e015ed9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginH/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginH root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginH/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginH/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginH/plugin.xml
deleted file mode 100644
index b138f1a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginH/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin H"
-  id="pluginh"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginI/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginI/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginI/bin/plugin.properties
deleted file mode 100644
index 542fc23..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginI/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginI bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginI/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginI/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginI/plugin.xml
deleted file mode 100644
index ca656a6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginI/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin I"
-  id="plugini"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginJ/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginJ/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginJ/bin/plugin.properties
deleted file mode 100644
index 145b356..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginJ/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginJ bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginJ/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginJ/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginJ/plugin.xml
deleted file mode 100644
index 0603fb8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginJ/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin J"
-  id="pluginj"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/bin/plugin.properties
deleted file mode 100644
index 71496e3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginK bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/plugin.properties
deleted file mode 100644
index ea570a0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginK root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/plugin.xml
deleted file mode 100644
index c9e22cd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginK/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin K"
-  id="plugink"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/bin/plugin.properties
deleted file mode 100644
index 19188a1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginL bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/plugin.properties
deleted file mode 100644
index 1b8d368..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginL root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/plugin.xml
deleted file mode 100644
index f5530bc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginL/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin L"
-  id="pluginl"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginM/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginM/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginM/plugin.properties
deleted file mode 100644
index 9ccce57..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginM/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginM root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginM/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginM/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginM/plugin.xml
deleted file mode 100644
index 4c66d32..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginM/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin M"
-  id="pluginm"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginN/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginN/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginN/bin/plugin.properties
deleted file mode 100644
index ded4749..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginN/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginN bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginN/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginN/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginN/plugin.xml
deleted file mode 100644
index 3dae8c9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginN/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin N"
-  id="pluginn"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/bin/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/bin/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/bin/plugin.properties
deleted file mode 100644
index a08e359..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/bin/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginO bin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/plugin.properties

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/plugin.properties b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/plugin.properties
deleted file mode 100644
index d3f96c6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/plugin.properties
+++ /dev/null
@@ -1 +0,0 @@
-key=Test string from pluginO root directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/plugin.xml
deleted file mode 100644
index bfcf637..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/LibraryLookupTests/plugins/pluginO/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Test Plugin O"
-  id="plugino"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/cmdLinePreferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/cmdLinePreferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/cmdLinePreferences.ini
deleted file mode 100644
index 84b508e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/cmdLinePreferences.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndPluginLocal/CommandLinePreference = From the command line specified file via the plugin cmdLineAndPluginLocal

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndPluginLocal/commonCmdLineAndPluginLocalPreference = Common preference from the command line via the plugin cmdLineAndPluginLocal

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/plugin.xml
deleted file mode 100644
index 6a20a0f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Command Line and Plugin Local Preferences"
-  id="cmdLineAndPluginLocal"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/preferences.ini
deleted file mode 100644
index 26d6674..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocal/preferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-PluginLocalPreference = From the local plugin directory of the plugin cmdLineAndPluginLocal

-commonCmdLineAndPluginLocalPreference = Common preference from the local plugin directory of plugin cmdLineAndPluginLocal

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/cmdLinePreferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/cmdLinePreferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/cmdLinePreferences.ini
deleted file mode 100644
index 414dc32..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/cmdLinePreferences.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndPluginLocalAndPrimaryFeature/CommandLinePreference = From the command line specified file via the plugin cmdLineAndPluginLocalAndPrimaryFeature

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndPluginLocalAndPrimaryFeature/commonCmdLineAndPluginLocalAndPrimaryFeaturePreference = Common preference from the command line via the plugin cmdLineAndPluginLocalAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini
deleted file mode 100644
index e2e7e53..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndPluginLocalAndPrimaryFeature/PrimaryFeaturePreference = From the primary feature plugin directory via the plugin cmdLineAndPluginLocalAndPrimaryFeature

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndPluginLocalAndPrimaryFeature/commonCmdLineAndPluginLocalAndPrimaryFeaturePreference = Common preference from the primary feature of plugin cmdLineAndPluginLocalAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/plugin.xml
deleted file mode 100644
index 99d5ff4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Command Line and Plugin Local and Primary Feature Preferences"
-  id="cmdLineAndPluginLocalAndPrimaryFeature"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/preferences.ini
deleted file mode 100644
index 1ede640..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPluginLocalAndPrimaryFeature/preferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-PluginLocalPreference = From the local plugin directory of the plugin cmdLineAndPluginLocalAndPrimaryFeature

-commonCmdLineAndPluginLocalAndPrimaryFeaturePreference = Common preference from the local plugin directory of plugin cmdLineAndPluginLocalAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/cmdLinePreferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/cmdLinePreferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/cmdLinePreferences.ini
deleted file mode 100644
index 9f1dc22..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/cmdLinePreferences.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndPrimaryFeature/CommandLinePreference = From the command line specified file via the plugin cmdLineAndPrimaryFeature

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndPrimaryFeature/commonCmdLineAndPrimaryFeaturePreference = Common preference from the command line via the plugin cmdLineAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/originalplugin_customization.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/originalplugin_customization.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/originalplugin_customization.ini
deleted file mode 100644
index 6fb4b3c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/originalplugin_customization.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndPrimaryFeature/PrimaryFeaturePreference = From the primary feature plugin directory via the plugin cmdLineAndPrimaryFeature

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndPrimaryFeature/commonCmdLineAndPrimaryFeaturePreference = Common preference from the primary feature of plugin cmdLineAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/plugin.xml
deleted file mode 100644
index db545b3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndPrimaryFeature/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Command Line and Primary Feature Preferences"
-  id="cmdLineAndPrimaryFeature"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/cmdLinePreferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/cmdLinePreferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/cmdLinePreferences.ini
deleted file mode 100644
index 77b55dc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/cmdLinePreferences.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndState/CommandLinePreference = From the command line specified file via the plugin cmdLineAndState

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndState/commonCommandLineAndStatePreference = Common preference from the command line via the plugin cmdLineAndState

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/originalpref_store.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/originalpref_store.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/originalpref_store.ini
deleted file mode 100644
index 03dfe69..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/originalpref_store.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-StateLocalPreference = From the plugin state area of plugin cmdLineAndState

-commonCommandLineAndStatePreference = Common preference from the plugin state area of plugin cmdLineAndState

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/plugin.xml
deleted file mode 100644
index e7ca055..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndState/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Command Line and State Preferences"
-  id="cmdLineAndState"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/cmdLinePreferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/cmdLinePreferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/cmdLinePreferences.ini
deleted file mode 100644
index 2b12d97..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/cmdLinePreferences.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndStateAndPluginLocal/CommandLinePreference = From the command line specified file via the plugin cmdLineAndStateAndPluginLocal

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndStateAndPluginLocal/commonCommandLineAndStateAndPluginLocalPreference = Common preference from the command line via the plugin cmdLineAndStateAndPluginLocal

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/originalpref_store.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/originalpref_store.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/originalpref_store.ini
deleted file mode 100644
index 1090215..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/originalpref_store.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-StateLocalPreference = From the plugin state area of plugin cmdLineAndStateAndPluginLocal

-commonCommandLineAndStateAndPluginLocalPreference = Common preference from the plugin state area of plugin cmdLineAndStateAndPluginLocal

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/plugin.xml
deleted file mode 100644
index f2e7039..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Command Line and State and Plugin Local Preferences"
-  id="cmdLineAndStateAndPluginLocal"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/preferences.ini
deleted file mode 100644
index a4e1cbc..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocal/preferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-PluginLocalPreference = From the local plugin directory of the plugin cmdLineAndStateAndPluginLocal

-commonCommandLineAndStateAndPluginLocalPreference = Common preference from the local plugin directory of plugin cmdLineAndStateAndPluginLocal

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/cmdLinePreferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/cmdLinePreferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/cmdLinePreferences.ini
deleted file mode 100644
index a812341..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/cmdLinePreferences.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndStateAndPluginLocalAndPrimaryFeature/CommandLinePreference = From the command line specified file via the plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndStateAndPluginLocalAndPrimaryFeature/commonCmdLineAndStateAndPluginLocalAndPrimaryFeaturePreference = Common preference from the command line via the plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini
deleted file mode 100644
index 00b4d7d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndStateAndPluginLocalAndPrimaryFeature/PrimaryFeaturePreference = From the primary feature plugin directory via the plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndStateAndPluginLocalAndPrimaryFeature/commonCmdLineAndStateAndPluginLocalAndPrimaryFeaturePreference = Common preference from the primary feature of plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/originalpref_store.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/originalpref_store.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/originalpref_store.ini
deleted file mode 100644
index 1435de4..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/originalpref_store.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-StateLocalPreference = From the plugin state area of plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature

-commonCmdLineAndStateAndPluginLocalAndPrimaryFeaturePreference = Common preference from the plugin state area of plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/plugin.xml
deleted file mode 100644
index cdd1392..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Command Line and State and Plugin Local and Primary Feature Preferences"
-  id="cmdLineAndStateAndPluginLocalAndPrimaryFeature"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/preferences.ini
deleted file mode 100644
index 20bc434..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPluginLocalAndPrimaryFeature/preferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-PluginLocalPreference = From the local plugin directory of the plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature

-commonCmdLineAndStateAndPluginLocalAndPrimaryFeaturePreference = Common preference from the local plugin directory of plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/cmdLinePreferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/cmdLinePreferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/cmdLinePreferences.ini
deleted file mode 100644
index 836900d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/cmdLinePreferences.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndStateAndPrimaryFeature/CommandLinePreference = From the command line specified file via the plugin cmdLineAndStateAndPrimaryFeature

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndStateAndPrimaryFeature/commonCmdLineAndStateAndPrimaryFeaturePreference = Common preference from the command line via the plugin cmdLineAndStateAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/originalplugin_customization.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/originalplugin_customization.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/originalplugin_customization.ini
deleted file mode 100644
index fceb898..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/originalplugin_customization.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-cmdLineAndStateAndPrimaryFeature/PrimaryFeaturePreference = From the primary feature plugin directory via the plugin cmdLineAndStateAndPrimaryFeature

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-cmdLineAndStateAndPrimaryFeature/commonCmdLineAndStateAndPrimaryFeaturePreference = Common preference from the primary feature of plugin cmdLineAndStateAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/originalpref_store.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/originalpref_store.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/originalpref_store.ini
deleted file mode 100644
index 0f95ec2..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/originalpref_store.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-StateLocalPreference = From the plugin state area of plugin cmdLineAndStateAndPrimaryFeature

-commonCmdLineAndStateAndPrimaryFeaturePreference = Common preference from the plugin state area of plugin cmdLineAndStateAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/plugin.xml
deleted file mode 100644
index 98c50d3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/cmdLineAndStateAndPrimaryFeature/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Command Line and State And Primary Feature Preferences"
-  id="cmdLineAndStateAndPrimaryFeature"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/commandLinePreferences/cmdLinePreferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/commandLinePreferences/cmdLinePreferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/commandLinePreferences/cmdLinePreferences.ini
deleted file mode 100644
index 20474c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/commandLinePreferences/cmdLinePreferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-commandLinePluginPreferences/CommandLinePreference = From the command line specified file

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/commandLinePreferences/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/commandLinePreferences/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/commandLinePreferences/plugin.xml
deleted file mode 100644
index 830faf5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/commandLinePreferences/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Command Line Plugin Preferences"
-  id="commandLinePluginPreferences"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/fragment.xml
deleted file mode 100644
index 1f7367d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/fragment.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Local And Primary Feature Preferences"
-  id="fragmentLocalAndPrimaryFeaturePreferences"
-  version="1.0"
-  plugin-id="fragmentLocalAndPrimaryFeaturePlugin"
-  plugin-version="1.0">
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/originalplugin_customization.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/originalplugin_customization.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/originalplugin_customization.ini
deleted file mode 100644
index c170521..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/originalplugin_customization.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-fragmentLocalAndPrimaryFeaturePlugin/PrimaryFeaturePreference = From the primary feature plugin directory via the plugin fragmentLocalAndPrimaryFeaturePlugin

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-fragmentLocalAndPrimaryFeaturePlugin/commonFragmentLocalAndPrimaryFeaturePreference = Common preference from the primary feature of plugin fragmentLocalAndPrimaryFeaturePlugin

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/preferences.ini
deleted file mode 100644
index 77e02a0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeature/preferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-FragmentLocalPreference = From the local fragment directory of the plugin fragmentLocalAndPrimaryFeaturePlugin

-commonFragmentLocalAndPrimaryFeaturePreference = Common preference from the local fragment directory of plugin fragmentLocalAndPrimaryFeaturePlugin

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeaturePlugin/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeaturePlugin/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeaturePlugin/plugin.xml
deleted file mode 100644
index a351a38..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalAndPrimaryFeaturePlugin/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Fragment Local And Primary Feature Preferences Plugin"
-  id="fragmentLocalAndPrimaryFeaturePlugin"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferences/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferences/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferences/fragment.xml
deleted file mode 100644
index b554885..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferences/fragment.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="Fragment Local Preferences"
-  id="fragmentLocalPreferences"
-  version="1.0"
-  plugin-id="fragmentLocalPreferencesPlugin"
-  plugin-version="1.0">
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferences/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferences/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferences/preferences.ini
deleted file mode 100644
index 6a492c8..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferences/preferences.ini
+++ /dev/null
@@ -1 +0,0 @@
-FragmentLocalPreference = From the local fragment directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferencesPlugin/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferencesPlugin/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferencesPlugin/plugin.xml
deleted file mode 100644
index e4f7136..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/fragmentLocalPreferencesPlugin/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Fragment Local Preferences Plugin"
-  id="fragmentLocalPreferencesPlugin"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/noPreferences/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/noPreferences/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/noPreferences/plugin.xml
deleted file mode 100644
index b04750e..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/noPreferences/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="No Preferences Plugin"
-  id="noPreferencesPlugin"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/originalplugin_customization.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/originalplugin_customization.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/originalplugin_customization.ini
deleted file mode 100644
index 9d65b76..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/originalplugin_customization.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-pluginLocalAndPrimaryFeaturePreferences/PrimaryFeaturePreference = From the primary feature plugin directory via the plugin pluginLocalAndPrimaryFeaturePreferences

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-pluginLocalAndPrimaryFeaturePreferences/commonPluginLocalAndPrimaryFeaturePreference = Common preference from the primary feature of plugin pluginLocalAndPrimaryFeaturePreferences

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/plugin.xml
deleted file mode 100644
index 9faa741..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin Local and Primary Feature Preferences"
-  id="pluginLocalAndPrimaryFeaturePreferences"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/preferences.ini
deleted file mode 100644
index 1845b3a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalAndPrimaryFeature/preferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-PluginLocalPreference = From the local plugin directory of the plugin pluginLocalAndPrimaryFeaturePreferences

-commonPluginLocalAndPrimaryFeaturePreference = Common preference from the local plugin directory of plugin pluginLocalAndPrimaryFeaturePreferences

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalPreferences/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalPreferences/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalPreferences/plugin.xml
deleted file mode 100644
index f5d4688..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalPreferences/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Plugin Local Preferences"
-  id="pluginLocalPreferences"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalPreferences/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalPreferences/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalPreferences/preferences.ini
deleted file mode 100644
index faac0c5..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/pluginLocalPreferences/preferences.ini
+++ /dev/null
@@ -1 +0,0 @@
-PluginLocalPreference = From the local plugin directory
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/primaryFeaturePluginPreferences/originalplugin_customization.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/primaryFeaturePluginPreferences/originalplugin_customization.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/primaryFeaturePluginPreferences/originalplugin_customization.ini
deleted file mode 100644
index 8a46a9a..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/primaryFeaturePluginPreferences/originalplugin_customization.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-primaryFeaturePluginPreferences/PrimaryFeaturePreference = From the primary feature plugin directory

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/primaryFeaturePluginPreferences/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/primaryFeaturePluginPreferences/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/primaryFeaturePluginPreferences/plugin.xml
deleted file mode 100644
index c56c401..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/primaryFeaturePluginPreferences/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Primary Feature Plugin Preferences"
-  id="primaryFeaturePluginPreferences"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/fragment.xml
deleted file mode 100644
index e74fa81..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/fragment.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="State And Fragment Local Preferences"
-  id="stateAndFragmentLocalPreferences"
-  version="1.0"
-  plugin-id="stateAndFragmentLocalPlugin"
-  plugin-version="1.0">
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/originalpref_store.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/originalpref_store.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/originalpref_store.ini
deleted file mode 100644
index 5cd3d90..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/originalpref_store.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-StateLocalPreference = From the plugin state area of the fragment for stateAndFragmentLocal

-commonStateAndFragmentLocalPreference = Common preference from the plugin state area for stateAndFragmentLocal

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/preferences.ini
deleted file mode 100644
index e00460d..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocal/preferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-FragmentLocalPreference = From the local fragment directory of stateAndFragmentLocal

-commonStateAndFragmentLocalPreference = Common preference from the local fragment directory of stateAndFragmentLocal

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/fragment.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/fragment.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/fragment.xml
deleted file mode 100644
index 6cef15f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/fragment.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fragment
-  name="State And Fragment Local And Primary Feature Preferences"
-  id="stateAndFragmentLocalAndPrimaryFeaturePreferences"
-  version="1.0"
-  plugin-id="stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin"
-  plugin-version="1.0">
-</fragment>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/originalplugin_customization.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/originalplugin_customization.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/originalplugin_customization.ini
deleted file mode 100644
index a7c8db9..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/originalplugin_customization.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin/PrimaryFeaturePreference = From the primary feature plugin directory via the plugin stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin/commonStateAndFragmentLocalAndPrimaryFeaturePreference = Common preference from the primary feature of plugin stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/originalpref_store.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/originalpref_store.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/originalpref_store.ini
deleted file mode 100644
index 22cca09..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/originalpref_store.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-StateLocalPreference = From the plugin state area of plugin stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin

-commonStateAndFragmentLocalAndPrimaryFeaturePreference = Common preference from the plugin state area of plugin stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/preferences.ini
deleted file mode 100644
index 2f590ec..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeature/preferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-FragmentLocalPreference = From the local fragment directory of plugin stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin

-commonStateAndFragmentLocalAndPrimaryFeaturePreference = Common preference from the local fragment directory of plugin stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeaturePlugin/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeaturePlugin/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeaturePlugin/plugin.xml
deleted file mode 100644
index 8276478..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalAndPrimaryFeaturePlugin/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="State And Fragment Local And Primary Feature Preferences Plugin"
-  id="stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalPlugin/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalPlugin/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalPlugin/plugin.xml
deleted file mode 100644
index 0d8c455..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndFragmentLocalPlugin/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="State And Fragment Local Plugin"
-  id="stateAndFragmentLocalPlugin"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/originalpref_store.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/originalpref_store.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/originalpref_store.ini
deleted file mode 100644
index 6ecb376..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/originalpref_store.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-StateLocalPreference = From the plugin state area of plugin stateAndPluginLocal

-commonStateAndPluginLocalPreference = Common preference from the plugin state area of plugin stateAndPluginLocal

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/plugin.xml
deleted file mode 100644
index 1d34ba1..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="State and Plugin Local Preferences"
-  id="stateAndPluginLocal"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/preferences.ini
deleted file mode 100644
index 8cbbde0..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocal/preferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-PluginLocalPreference = From the local plugin directory of plugin stateAndPluginLocal

-commonStateAndPluginLocalPreference = Common preference from the local plugin directory of plugin stateAndPluginLocal

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini
deleted file mode 100644
index a1ff157..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/originalplugin_customization.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-stateAndPluginLocalAndPrimaryFeature/PrimaryFeaturePreference = From the primary feature plugin directory via the plugin stateAndPluginLocalAndPrimaryFeature

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-stateAndPluginLocalAndPrimaryFeature/commonStateAndPluginLocalAndPrimaryFeaturePreference = Common preference from the primary feature of plugin stateAndPluginLocalAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/originalpref_store.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/originalpref_store.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/originalpref_store.ini
deleted file mode 100644
index 44f5dbd..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/originalpref_store.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-StateLocalPreference = From the plugin state area of plugin stateAndPluginLocalAndPrimaryFeature

-commonStateAndPluginLocalAndPrimaryFeaturePreference = Common preference from the plugin state area of plugin stateAndPluginLocalAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/plugin.xml
deleted file mode 100644
index 33c3c0f..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="State and Plugin Local and Primary Feature Preferences"
-  id="stateAndPluginLocalAndPrimaryFeature"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/preferences.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/preferences.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/preferences.ini
deleted file mode 100644
index fe1ffa3..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPluginLocalAndPrimaryFeature/preferences.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-PluginLocalPreference = From the local plugin directory of plugin stateAndPluginLocalAndPrimaryFeature

-commonStateAndPluginLocalAndPrimaryFeaturePreference = Common preference from the local plugin directory of plugin stateAndPluginLocalAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/originalplugin_customization.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/originalplugin_customization.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/originalplugin_customization.ini
deleted file mode 100644
index 1a8d7e6..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/originalplugin_customization.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-stateAndPrimaryFeature/PrimaryFeaturePreference = From the primary feature plugin directory via the plugin stateAndPrimaryFeature

-org.eclipse.core.runtime/SomeRandomPreference = For the runtime plugin only

-stateAndPrimaryFeature/commonStateAndPrimaryFeaturePreference = Common preference from the primary feature of plugin stateAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/originalpref_store.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/originalpref_store.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/originalpref_store.ini
deleted file mode 100644
index 473957c..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/originalpref_store.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-StateLocalPreference = From the plugin state area of plugin stateAndPrimaryFeature

-commonStateAndPrimaryFeaturePreference = Common preference from the plugin state area of plugin stateAndPrimaryFeature

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/plugin.xml
deleted file mode 100644
index 0ead264..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateAndPrimaryFeature/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="State and Primary Feature Preferences"
-  id="stateAndPrimaryFeature"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateLocalPreferences/originalpref_store.ini

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateLocalPreferences/originalpref_store.ini b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateLocalPreferences/originalpref_store.ini
deleted file mode 100644
index 3e4b912..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateLocalPreferences/originalpref_store.ini
+++ /dev/null
@@ -1 +0,0 @@
-StateLocalPreference = From the plugin state area
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateLocalPreferences/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateLocalPreferences/plugin.xml b/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateLocalPreferences/plugin.xml
deleted file mode 100644
index e9332eb..0000000
--- a/tests/org.eclipse.core.tests.runtime/Plugintests_Testing/PreferencesTests/plugins/stateLocalPreferences/plugin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="State Local Preferences"
-  id="stateLocalPreferences"
-  version="1.0"
-  vendor-name="OTI">
-
-</plugin>

tests/org.eclipse.core.tests.runtime/about.html

diff --git a/tests/org.eclipse.core.tests.runtime/about.html b/tests/org.eclipse.core.tests.runtime/about.html
deleted file mode 100644
index bc976dd..0000000
--- a/tests/org.eclipse.core.tests.runtime/about.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head>
-<title>About</title>
-<style type="text/css">
-p, table, td, th { font-family: arial, helvetica, geneva; font-size: 10pt}
-pre { font-family: "Courier New", Courier, mono; font-size: 10pt}
-h2 { font-family: arial, helvetica, geneva; font-size: 18pt; font-weight: bold ; line-height: 14px}
-code { font-family: "Courier New", Courier, mono; font-size: 10pt}
-sup { font-family: arial,helvetica,geneva; font-size: 10px}
-h3 { font-family: arial, helvetica, geneva; font-size: 14pt; font-weight: bold}
-li { font-family: arial, helvetica, geneva; font-size: 10pt}
-h1 { font-family: arial, helvetica, geneva; font-size: 28px; font-weight: bold}
-body { font-family: arial, helvetica, geneva; font-size: 10pt; clip: rect(   ); margin-top: 5mm; margin-left: 3mm}
-</style>
-</head>
-<body>
-<body lang=EN-US link=blue vlink=purple>
-<table border=0 cellspacing=5 cellpadding=2 width="100%" >
-  <tr> 
-    <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">About This Plug-in</font></b></td>
-  </tr>
-  <tr> 
-    <td> 
-<p>1st November, 2001</p>	
-<h3>License</h3>
-<p>Eclipse.org makes available all content in this plug-in.  The plug-in is provided to you under the terms and conditions of the
-<a href="http://www.eclipse.org/legal/cpl-v05.html">Common Public License Version 0.5</a>.  For purposes of the Common Public License, &quot;Program&quot; will mean the plug-in.</p>
-</td></tr></table>
-</body>
-</html>
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/build.properties

diff --git a/tests/org.eclipse.core.tests.runtime/build.properties b/tests/org.eclipse.core.tests.runtime/build.properties
deleted file mode 100644
index 20f6789..0000000
--- a/tests/org.eclipse.core.tests.runtime/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-source.runtimetests.jar = src/
-bin.includes = plugin.xml,*.jar,Plugin_Testing/,about.xml
-

tests/org.eclipse.core.tests.runtime/plugin.xml

diff --git a/tests/org.eclipse.core.tests.runtime/plugin.xml b/tests/org.eclipse.core.tests.runtime/plugin.xml
deleted file mode 100644
index 30d53d3..0000000
--- a/tests/org.eclipse.core.tests.runtime/plugin.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin
-  name="Eclipse Core Tests Runtime"
-  id="org.eclipse.core.tests.runtime"
-  version="2.0.0"
-  provider-name="Object Technology International, Inc.">
-
-  <requires>
-    <import plugin="org.eclipse.core.runtime"/>
-    <import plugin="org.eclipse.core.resources"/>
-    <import plugin="org.eclipse.core.tests.harness"/>
-    <import plugin="org.junit"/>
-    <import plugin="org.apache.xerces"/>
-  </requires>
-
-  <runtime>
-    <library name="runtimetests.jar">
-      <export name="*"/>
-    </library>
-  </runtime>
-
-  <extension point="org.eclipse.core.tests.harness.tests">
-    <test id="runtime.AutomatedTests">
-      <run class="org.eclipse.core.tests.runtime.AutomatedTests"/>
-    </test>
-    <test id="runtime.AllTests">
-      <run class="org.eclipse.core.tests.runtime.AllTests"/>
-    </test>
-    <test id="internal.core.runtime.AllTests">
-      <run class="org.eclipse.core.tests.internal.runtime.AllTests"/>
-    </test>
-   <test id="internal.core.runtime.AuthorizationDatabaseTest">
-      <run class="org.eclipse.core.tests.internal.runtime.AuthorizationDatabaseTest"/>
-    </test>
-   <test id="internal.core.runtime.CipherStreamsTest">
-      <run class="org.eclipse.core.tests.internal.runtime.CipherStreamsTest"/>
-    </test>
-   <test id="internal.core.runtime.CipherTest">
-      <run class="org.eclipse.core.tests.internal.runtime.CipherTest"/>
-    </test>
-   <test id="internal.core.runtime.LogSerializationTest">
-      <run class="org.eclipse.core.tests.internal.runtime.LogSerializationTest"/>
-    </test>
-   <test id="internal.core.registrycache.SimpleCacheTests">
-      <run class="org.eclipse.core.tests.internal.registrycache.SimpleCacheTests"/>
-    </test>
-   <test id="internal.core.registrycache.AllTests">
-      <run class="org.eclipse.core.tests.internal.registrycache.AllTests"/>
-    </test>
-   <test id="internal.core.plugins.AllTests">
-      <run class="org.eclipse.core.tests.internal.plugins.AllTests"/>
-    </test>
-   <test id="internal.core.plugins.BasicXMLTest">
-      <run class="org.eclipse.core.tests.internal.plugins.BasicXMLTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.ActivationTest_Base">
-      <run class="org.eclipse.core.tests.internal.plugins.ActivationTest_Base"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.ActivationTest_DirectOtherRef">
-      <run class="org.eclipse.core.tests.internal.plugins.ActivationTest_DirectOtherRef"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.ActivationTest_DirectPluginRef">
-      <run class="org.eclipse.core.tests.internal.plugins.ActivationTest_DirectPluginRef"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.ActivationTest_IndirectRef">
-      <run class="org.eclipse.core.tests.internal.plugins.ActivationTest_IndirectRef"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.ActivationTest_NoRef">
-      <run class="org.eclipse.core.tests.internal.plugins.ActivationTest_NoRef"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.PlatformURLPerformanceTest">
-      <run class="org.eclipse.core.tests.internal.plugins.PlatformURLPerformanceTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.PlatformURLPerformanceTestConnection">
-      <run class="org.eclipse.core.tests.internal.plugins.PlatformURLPerformanceTestConnection"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.PlatformURLTest">
-      <run class="org.eclipse.core.tests.internal.plugins.PlatformURLTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.LoaderTest">
-      <run class="org.eclipse.core.tests.internal.plugins.LoaderTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.GetPluginPathTest">
-      <run class="org.eclipse.core.tests.internal.plugins.GetPluginPathTest"/>
-    </test>
-
-   <test id="core.tests.runtime.BenchPath">
-      <run class="org.eclipse.core.tests.runtime.BenchPath"/>
-   </test>
-   <test id="core.tests.runtime.CoreExceptionTest">
-      <run class="org.eclipse.core.tests.runtime.CoreExceptionTest"/>
-   </test>
-   <test id="core.tests.runtime.OperationCanceledExceptionTest">
-      <run class="org.eclipse.core.tests.runtime.OperationCanceledExceptionTest"/>
-   </test>
-    <test id="runtime.PathTest">
-      <run class="org.eclipse.core.tests.runtime.PathTest"/>
-    </test>
-   <test id="core.tests.runtime.PlatformTest">
-      <run class="org.eclipse.core.tests.runtime.PlatformTest"/>
-   </test>
-   <test id="core.tests.runtime.PluginVersionIdentifierTest">
-      <run class="org.eclipse.core.tests.runtime.PluginVersionIdentifierTest"/>
-   </test>
-   <test id="core.tests.runtime.ProgressMonitorWrapperTest">
-      <run class="org.eclipse.core.tests.runtime.ProgressMonitorWrapperTest"/>
-   </test>
-   <test id="core.tests.runtime.QualifiedNameTest">
-      <run class="org.eclipse.core.tests.runtime.QualifiedNameTest"/>
-   </test>
-   <test id="core.tests.runtime.StatusTest">
-      <run class="org.eclipse.core.tests.runtime.StatusTest"/>
-   </test>
-    
-   <test id="core.tests.plugintests.PluginTests">
-      <run class="org.eclipse.core.tests.plugintests.PluginTests"/>
-    </test>
-
-   <test id="internal.plugins.PluginResolveTest_1">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginResolveTest_1"/>
-    </test>
-   <test id="internal.plugins.PluginResolveTest_2">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginResolveTest_2"/>
-    </test>
-    <test id="internal.plugins.PluginResolveTest_3">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginResolveTest_3"/>
-    </test>
-   <test id="internal.plugins.PluginResolveTest_4">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginResolveTest_4"/>
-    </test>
-   <test id="internal.plugins.PluginResolveTest_5">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginResolveTest_5"/>
-    </test>
-   <test id="internal.plugins.PluginResolveTest_6">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginResolveTest_6"/>
-    </test>
-   <test id="internal.plugins.PluginResolveTest_7">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginResolveTest_7"/>
-    </test>
-   <test id="internal.plugins.PluginResolveTest_8">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginResolveTest_8"/>
-    </test>
-   <test id="internal.plugins.PluginVersionTest">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginVersionTest"/>
-    </test>
-   <test id="internal.plugins.PluginVersionTest_2">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginVersionTest_2"/>
-    </test>
-   <test id="internal.plugins.PluginXmlTest">
-      <run class="org.eclipse.core.tests.internal.plugins.PluginXmlTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.JarSearchTests">
-      <run class="org.eclipse.core.tests.internal.plugins.JarSearchTests"/>
-    </test>
-   <test id="org.eclipse.core.tests.internal.plugins.JarPluginPathTest">
-      <run class="org.eclipse.core.tests.internal.plugins.JarPluginPathTest"/>
-    </test>
-   
-   <test id="org.eclipse.core.tests.plugintests.LibraryLookupTests">
-      <run class="org.eclipse.core.tests.plugintests.LibraryLookupTests"/>
-    </test>
-   <test id="org.eclipse.core.tests.plugintests.PluginFindTests">
-      <run class="org.eclipse.core.tests.plugintests.PluginFindTests"/>
-    </test>
-   <test id="org.eclipse.core.tests.plugintests.PreferencesRuntimeTests">
-      <run class="org.eclipse.core.tests.plugintests.PreferencesRuntimeTests"/>
-    </test>
-   <test id="org.eclipse.core.tests.plugintests.CmdLinePreferencesTest">
-      <run class="org.eclipse.core.tests.plugintests.CmdLinePreferencesTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.plugintests.CmdLineAndStateTest">
-      <run class="org.eclipse.core.tests.plugintests.CmdLineAndStateTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.plugintests.CmdLineAndPluginLocalTest">
-      <run class="org.eclipse.core.tests.plugintests.CmdLineAndPluginLocalTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.plugintests.CmdLineAndPrimaryFeatureTest">
-      <run class="org.eclipse.core.tests.plugintests.CmdLineAndPrimaryFeatureTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.plugintests.CmdLineAndStateAndPluginLocalTest">
-      <run class="org.eclipse.core.tests.plugintests.CmdLineAndStateAndPluginLocalTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.plugintests.CmdLineAndPluginLocalAndPrimaryFeatureTest">
-      <run class="org.eclipse.core.tests.plugintests.CmdLineAndPluginLocalAndPrimaryFeatureTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.plugintests.CmdLineAndStateAndPluginLocalAndPrimaryFeatureTest">
-      <run class="org.eclipse.core.tests.plugintests.CmdLineAndStateAndPluginLocalAndPrimaryFeatureTest"/>
-    </test>
-   <test id="org.eclipse.core.tests.plugintests.CmdLineAndStateAndPrimaryFeatureTest">
-      <run class="org.eclipse.core.tests.plugintests.CmdLineAndStateAndPrimaryFeatureTest"/>
-    </test>
- </extension>
-
-</plugin>

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/BaseExtension.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/BaseExtension.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/BaseExtension.java
deleted file mode 100644
index 3772c7d..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/BaseExtension.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.a;
-
-import org.eclipse.core.boot.*;
-
-public class BaseExtension implements IPlatformRunnable {
-
-	public int runCount = 0;
-public BaseExtension() {
-	super();
-}
-
-public Object run(Object o) {	
-	runCount++;
-	return null;
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ConfigurableExtension.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ConfigurableExtension.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ConfigurableExtension.java
deleted file mode 100644
index 3d62138..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ConfigurableExtension.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.a;
-
-import org.eclipse.core.runtime.*;
-
-public abstract class ConfigurableExtension extends BaseExtension implements IExecutableExtension {
-
-	public IConfigurationElement config = null;
-	public String propertyName = null;
-	public Object data = null;
-	
-public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
-
-	this.config = config;
-	this.propertyName = propertyName;
-	this.data = data;
-	
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/Dummy.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/Dummy.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/Dummy.java
deleted file mode 100644
index d3ae39a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/Dummy.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.a;
-/**
- */
-public class Dummy {
-/**
- */
-public Dummy() {
-	super();
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionDirectCompilerReferenceToOtherClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionDirectCompilerReferenceToOtherClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionDirectCompilerReferenceToOtherClass.java
deleted file mode 100644
index 43cdbb1..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionDirectCompilerReferenceToOtherClass.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.a;
-
-import org.eclipse.core.runtime.*;
-
-public class ExtensionDirectCompilerReferenceToOtherClass extends ConfigurableExtension {
-public Object run(Object o) {	
-	super.run(o);
-	// make direct compiler reference to other class (not plugin class)
-	Class c = org.eclipse.core.tests.internal.plugin.c.api.ApiClass.class;
-	return c;
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionDirectCompilerReferenceToPluginClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionDirectCompilerReferenceToPluginClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionDirectCompilerReferenceToPluginClass.java
deleted file mode 100644
index a77d710..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionDirectCompilerReferenceToPluginClass.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.a;
-
-import org.eclipse.core.runtime.*;
-
-public class ExtensionDirectCompilerReferenceToPluginClass extends ConfigurableExtension {
-
-public Object run(Object o) {	
-	super.run(o);
-	// make direct compiler reference to other plugin class
-	Plugin p = org.eclipse.core.tests.internal.plugin.b.PluginClass.plugin;
-	return p;
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionIndirectReferenceToPlugin.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionIndirectReferenceToPlugin.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionIndirectReferenceToPlugin.java
deleted file mode 100644
index ff0111b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/ExtensionIndirectReferenceToPlugin.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.a;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.internal.plugins.*;
-
-public class ExtensionIndirectReferenceToPlugin extends ConfigurableExtension {
-
-public Object run(Object o) {	
-	super.run(o);
-	Plugin p = Platform.getPlugin("plugin.c");
-	return p;
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/PluginClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/PluginClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/PluginClass.java
deleted file mode 100644
index 733969b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/PluginClass.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.a;
-
-import org.eclipse.core.runtime.*;
-
-public class PluginClass extends Plugin {
-
-	public static Plugin plugin = null;
-	public int startupCount = 0;
-	
-
-public PluginClass(IPluginDescriptor descriptor) {
-	super(descriptor);
-	plugin = this;
-}
-
-public void startup() throws CoreException {
-	startupCount++;
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/api/ApiClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/api/ApiClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/api/ApiClass.java
deleted file mode 100644
index 904b929..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/a/api/ApiClass.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.a.api;
-public class ApiClass {
-
-public ApiClass() {
-	super();
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/b/PluginClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/b/PluginClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/b/PluginClass.java
deleted file mode 100644
index c78ce66..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/b/PluginClass.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.b;
-
-import org.eclipse.core.runtime.*;
-
-public class PluginClass extends Plugin {
-
-	public static Plugin plugin = null;
-	public int startupCount = 0;
-	
-
-public PluginClass(IPluginDescriptor descriptor) {
-	super(descriptor);
-	plugin = this;
-}
-
-public void startup() throws CoreException {
-	startupCount++;
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/b/api/ApiClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/b/api/ApiClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/b/api/ApiClass.java
deleted file mode 100644
index fc53eed..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/b/api/ApiClass.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.b.api;
-public class ApiClass {
-
-public ApiClass() {
-	super();
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/ExportedClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/ExportedClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/ExportedClass.java
deleted file mode 100644
index 2da3a46..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/ExportedClass.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.c;
-public class ExportedClass {
-
-public ExportedClass() {
-	super();
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/PluginClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/PluginClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/PluginClass.java
deleted file mode 100644
index 3830f9d..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/PluginClass.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.c;
-
-import org.eclipse.core.runtime.*;
-
-public class PluginClass extends Plugin {
-
-	public static Plugin plugin = null;
-	public int startupCount = 0;
-	
-
-public PluginClass(IPluginDescriptor descriptor) {
-	super(descriptor);
-	plugin = this;
-}
-
-public void startup() throws CoreException {
-	startupCount++;
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/api/ApiClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/api/ApiClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/api/ApiClass.java
deleted file mode 100644
index f822d8b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/c/api/ApiClass.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.c.api;
-public class ApiClass {
-
-public ApiClass() {
-	super();
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/d/PluginClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/d/PluginClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/d/PluginClass.java
deleted file mode 100644
index 3b05b3c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/d/PluginClass.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.d;
-
-import org.eclipse.core.runtime.*;
-
-public class PluginClass extends Plugin {
-
-	public static Plugin plugin = null;
-	public int startupCount = 0;
-	
-
-public PluginClass(IPluginDescriptor descriptor) {
-	super(descriptor);
-	plugin = this;
-}
-
-public void startup() throws CoreException {
-	startupCount++;
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/d/api/ApiClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/d/api/ApiClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/d/api/ApiClass.java
deleted file mode 100644
index 20ed574..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugin/d/api/ApiClass.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugin.d.api;
-public class ApiClass {
-
-public ApiClass() {
-	super();
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_Base.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_Base.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_Base.java
deleted file mode 100644
index ccb4293..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_Base.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-/**
- */
-public class ActivationTest_Base extends WorkspaceSessionTest {
-public ActivationTest_Base() {
-	super(null);
-}
-public ActivationTest_Base(String name) {
-	super(name);
-}
-public void testBase() {
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pdA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pdB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pdC = registry.getPluginDescriptor("plugin.c");
-	assertNotNull("0.0", pdA);
-	assertNotNull("0.1", pdB);
-	assertNotNull("0.2", pdC);
-
-	// check initial activation state
-	assertTrue("1.0", !pdA.isPluginActivated());
-	assertTrue("1.1", !pdB.isPluginActivated());
-	assertTrue("1.2", !pdC.isPluginActivated());
-
-	Plugin p = null;
-	// get plugin class for plugin A
-	try {
-		p = pdA.getPlugin();
-	} catch (CoreException e) {
-		fail("2.0.0");
-	}
-	assertTrue("2.0.1", pdA.isPluginActivated());
-	assertTrue("2.1", !pdB.isPluginActivated());
-	assertTrue("2.2", !pdC.isPluginActivated());
-	assertTrue("2.3", p.getClass().getName().equals("org.eclipse.core.tests.internal.plugin.a.PluginClass"));
-
-	// get plugin class for plugin B
-	try {
-		p = pdB.getPlugin();
-	} catch (CoreException e) {
-		fail("3.0.0");
-	}
-	assertTrue("3.0.1", pdA.isPluginActivated());
-	assertTrue("3.1", pdB.isPluginActivated());
-	assertTrue("3.2", !pdC.isPluginActivated());
-	assertTrue("3.3", p.getClass().getName().equals("org.eclipse.core.tests.internal.plugin.b.PluginClass"));
-
-	// get plugin class for plugin C
-	try {
-		p = pdC.getPlugin();
-	} catch (CoreException e) {
-		fail("4.0.0");
-	}
-	assertTrue("4.0.1", pdA.isPluginActivated());
-	assertTrue("4.1", pdB.isPluginActivated());
-	assertTrue("4.2", pdC.isPluginActivated());
-	assertTrue("4.3", p.getClass().getName().equals("org.eclipse.core.tests.internal.plugin.c.PluginClass"));
-
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_DirectOtherRef.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_DirectOtherRef.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_DirectOtherRef.java
deleted file mode 100644
index cbd1efc..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_DirectOtherRef.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-
-import org.eclipse.core.boot.IPlatformRunnable;
-import org.eclipse.core.internal.plugins.PluginClassLoader;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-/**
- */
-public class ActivationTest_DirectOtherRef extends WorkspaceSessionTest {
-public ActivationTest_DirectOtherRef() {
-	super(null);
-}
-public ActivationTest_DirectOtherRef(String name) {
-	super(name);
-}
-public void testExtensionDirectReferenceToOtherClassTest() {
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pluginA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pluginB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pluginC = registry.getPluginDescriptor("plugin.c");
-	assertNotNull("0.0", pluginA);
-	assertNotNull("0.1", pluginB);
-	assertNotNull("0.2", pluginC);
-
-	// check initial activation state
-	assertTrue("1.0", !pluginA.isPluginActivated());
-	assertTrue("1.1", !pluginB.isPluginActivated());
-	assertTrue("1.2", !pluginC.isPluginActivated());
-
-	// get base extension
-	IConfigurationElement[] cfig = registry.getConfigurationElementsFor("plugin.a", "case", "plugin.a" + ".referenceOther");
-	assertTrue("2.0", cfig.length == 1);
-	IPlatformRunnable o = null;
-	try {
-		o = (IPlatformRunnable) cfig[0].createExecutableExtension("run");
-	} catch (CoreException e) {
-		fail("2.1 " + e.getMessage());
-	}
-
-	// check activation state
-	assertTrue("3.0", pluginA.isPluginActivated());
-	assertTrue("3.1", !pluginB.isPluginActivated());
-	assertTrue("3.2", !pluginC.isPluginActivated());
-
-	// run the extension
-	Object result = null;
-	try {
-		result = o.run(null);
-	} catch (Exception e) {
-		fail("4.0 " + e.getMessage());
-	}
-	if (result instanceof Exception) {
-		fail("4.1 " + ((Exception) result).getMessage());
-	}
-
-	// check activation state
-	assertTrue("5.0", pluginA.isPluginActivated());
-	assertTrue("5.1", !pluginB.isPluginActivated());
-	assertTrue("5.2", pluginC.isPluginActivated()); // by direct reference to class in C from A.run()
-
-	// check result
-	if (result instanceof Class) {
-		ClassLoader loader = ((Class) result).getClassLoader();
-		if (loader instanceof PluginClassLoader) {
-			assertTrue("6.0", pluginC == ((PluginClassLoader) loader).getPluginDescriptor());
-		} else
-			fail("6.1");
-	} else
-		fail("6.2");
-
-	// check activation state (no change)
-	assertTrue("7.0", pluginA.isPluginActivated());
-	assertTrue("7.1", !pluginB.isPluginActivated());
-	assertTrue("7.2", pluginC.isPluginActivated());
-
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_DirectPluginRef.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_DirectPluginRef.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_DirectPluginRef.java
deleted file mode 100644
index 2425a76..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_DirectPluginRef.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import org.eclipse.core.boot.IPlatformRunnable;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-/**
- */
-public class ActivationTest_DirectPluginRef extends WorkspaceSessionTest {
-public ActivationTest_DirectPluginRef() {
-	super(null);
-}
-public ActivationTest_DirectPluginRef(String name) {
-	super(name);
-}
-public void testExtensionDirectReferenceToPluginClassTest() {
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pluginA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pluginB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pluginC = registry.getPluginDescriptor("plugin.c");
-	assertNotNull("0.0", pluginA);
-	assertNotNull("0.1", pluginB);
-	assertNotNull("0.2", pluginC);
-
-	// check initial activation state
-	assertTrue("1.0", !pluginA.isPluginActivated());
-	assertTrue("1.1", !pluginB.isPluginActivated());
-	assertTrue("1.2", !pluginC.isPluginActivated());
-
-	// get base extension
-	IConfigurationElement[] cfig = registry.getConfigurationElementsFor("plugin.a", "case", "plugin.a" + ".referencePlugin");
-	assertTrue("2.0", cfig.length == 1);
-	IPlatformRunnable o = null;
-	try {
-		o = (IPlatformRunnable) cfig[0].createExecutableExtension("run");
-	} catch (CoreException e) {
-		fail("2.1 " + e.getMessage());
-	}
-
-	// check activation state
-	assertTrue("3.0", pluginA.isPluginActivated());
-	assertTrue("3.1", !pluginB.isPluginActivated());
-	assertTrue("3.2", !pluginC.isPluginActivated());
-
-	// run the extension
-	Object result = null;
-	try {
-		result = o.run(null);
-	} catch (Exception e) {
-		fail("4.0 " + e.getMessage());
-	}
-	if (result instanceof Exception) {
-		fail("4.1 " + ((Exception) result).getMessage());
-	}
-
-	// check activation state
-	assertTrue("5.0", pluginA.isPluginActivated());
-	assertTrue("5.1", pluginB.isPluginActivated()); // by direct reference to B plugin class from A.run()
-	assertTrue("5.2", !pluginC.isPluginActivated());
-
-	// check result
-	if (result instanceof Plugin) {
-			Plugin p = null;
-			try {
-				p = pluginB.getPlugin();
-			} catch (CoreException e) {
-				fail("6.0 " + e.getMessage());
-			}
-			assertTrue("6.1", ((Plugin) result) == p);
-		} else
-			fail("6.2");
-
-	// check activation state (no change)
-	assertTrue("7.0", pluginA.isPluginActivated());
-	// assert("7.1", pluginB.isPluginActivated());
-	assertTrue("7.2", !pluginC.isPluginActivated());
-
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_IndirectRef.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_IndirectRef.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_IndirectRef.java
deleted file mode 100644
index c295451..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_IndirectRef.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import org.eclipse.core.boot.IPlatformRunnable;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-/**
- */
-public class ActivationTest_IndirectRef extends WorkspaceSessionTest {
-public ActivationTest_IndirectRef() {
-	super(null);
-}
-public ActivationTest_IndirectRef(String name) {
-	super(name);
-}
-public void testExtensionIndirectReferenceToPluginTest() {
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pluginA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pluginB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pluginC = registry.getPluginDescriptor("plugin.c");
-	assertNotNull("0.0", pluginA);
-	assertNotNull("0.1", pluginB);
-	assertNotNull("0.2", pluginC);
-
-	// check initial activation state
-	assertTrue("1.0", !pluginA.isPluginActivated());
-	assertTrue("1.1", !pluginB.isPluginActivated());
-	assertTrue("1.2", !pluginC.isPluginActivated());
-
-	// get base extension
-	IConfigurationElement[] cfig = registry.getConfigurationElementsFor("plugin.a", "case", "plugin.a" + ".lookupPlugin");
-	assertTrue("2.0", cfig.length == 1);
-	IPlatformRunnable o = null;
-	try {
-		o = (IPlatformRunnable) cfig[0].createExecutableExtension("run");
-	} catch (CoreException e) {
-		fail("2.1 " + e.getMessage());
-	}
-
-	// check activation state
-	assertTrue("3.0", pluginA.isPluginActivated());
-	assertTrue("3.1", !pluginB.isPluginActivated());
-	assertTrue("3.2", !pluginC.isPluginActivated());
-
-	// run the extension
-	Object result = null;
-	try {
-		result = o.run(null);
-	} catch (Exception e) {
-		fail("4.0 " + e.getMessage());
-	}
-	if (result instanceof Exception) {
-		fail("4.1 " + ((Exception) result).getMessage());
-	}
-
-	// check activation state
-	assertTrue("5.0", pluginA.isPluginActivated());
-	assertTrue("5.1", !pluginB.isPluginActivated());
-	assertTrue("5.2", pluginC.isPluginActivated()); // by indirect reference to C plugin class from A.run()
-
-	// check result
-	 if (result instanceof Plugin) {
-		Plugin p = null;
-		try {
-			p = pluginC.getPlugin();
-		} catch (CoreException e) {
-			fail("6.0 " + e.getMessage());
-		}
-		assertTrue("6.1", ((Plugin) result) == p);
-	} else
-		fail("6.2");
-
-	// check activation state (no change)
-	assertTrue("7.0", pluginA.isPluginActivated());
-	assertTrue("7.1", !pluginB.isPluginActivated());
-	assertTrue("7.2", pluginC.isPluginActivated());
-
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_NoRef.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_NoRef.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_NoRef.java
deleted file mode 100644
index a2a537e..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ActivationTest_NoRef.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import org.eclipse.core.boot.IPlatformRunnable;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-/**
- */
-public class ActivationTest_NoRef extends WorkspaceSessionTest {
-public ActivationTest_NoRef() {
-	super(null);
-}
-public ActivationTest_NoRef(String name) {
-	super(name);
-}
-public void testExtensionNoReferenceTest() {
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pluginA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pluginB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pluginC = registry.getPluginDescriptor("plugin.c");
-	assertNotNull("0.0", pluginA);
-	assertNotNull("0.1", pluginB);
-	assertNotNull("0.2", pluginC);
-
-	// check initial activation state
-	assertTrue("1.0", !pluginA.isPluginActivated());
-	assertTrue("1.1", !pluginB.isPluginActivated());
-	assertTrue("1.2", !pluginC.isPluginActivated());
-
-	// get base extension
-	IConfigurationElement[] cfig = registry.getConfigurationElementsFor("plugin.a", "case", "plugin.a" + ".base");
-	assertTrue("2.0", cfig.length == 1);
-	IPlatformRunnable o = null;
-	try {
-		o = (IPlatformRunnable) cfig[0].createExecutableExtension("run");
-	} catch (CoreException e) {
-		fail("2.1");
-	}
-
-	// check activation state
-	assertTrue("3.0", pluginA.isPluginActivated());
-	assertTrue("3.1", !pluginB.isPluginActivated());
-	assertTrue("3.2", !pluginC.isPluginActivated());
-
-	// run the extension
-	try {
-		Object result = o.run(null);
-	} catch (Exception e) {
-		fail("4.0");
-	}
-
-	// check activation state
-	assertTrue("5.0", pluginA.isPluginActivated());
-	assertTrue("5.1", !pluginB.isPluginActivated());
-	assertTrue("5.2", !pluginC.isPluginActivated());
-
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/AllTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/AllTests.java
deleted file mode 100644
index 42dbb48..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/AllTests.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import junit.framework.*;
-
-public class AllTests extends TestCase {
-
-public AllTests() {
-	super(null);
-}
-
-public AllTests(String name) {
-	super(name);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(PluginResolveTest_1.suite());
-	suite.addTest(PluginResolveTest_2.suite());
-	suite.addTest(PluginResolveTest_3.suite());
-	suite.addTest(PluginResolveTest_4.suite());
-	suite.addTest(PluginResolveTest_5.suite());
-	suite.addTest(PluginResolveTest_6.suite());
-	suite.addTest(PluginResolveTest_7.suite());
-	suite.addTest(PluginResolveTest_8.suite());
-	suite.addTest(PluginResolveTest_9.suite());
-	suite.addTest(PluginResolveTest_10.suite());
-	suite.addTest(PluginResolveTest_11.suite());
-	suite.addTest(PluginResolveTest_12.suite());
-	suite.addTest(PluginResolveTest_13.suite());
-	suite.addTest(PluginResolveTest_14.suite());
-	suite.addTest(PluginResolveTest_15.suite());
-	suite.addTest(PluginResolveTest_16.suite());
-	suite.addTest(PluginResolveTest_17.suite());
-	suite.addTest(PluginResolveTest_18.suite());
-	suite.addTest(PluginResolveTest_19.suite());
-	suite.addTest(PluginResolveTest_20.suite());
-	suite.addTest(PluginResolveTest_21.suite());
-	suite.addTest(PluginResolveTest_22.suite());
-	suite.addTest(PluginResolveTest_23.suite());
-	suite.addTest(PluginResolveTest_24.suite());
-	suite.addTest(PluginResolveTest_25.suite());
-	suite.addTest(PluginResolveTest_26.suite());
-	suite.addTest(PluginResolveTest_27.suite());
-	suite.addTest(PluginResolveTest_28.suite());
-	suite.addTest(PluginResolveTest_29.suite());
-	suite.addTest(PluginResolveTest_30.suite());
-	suite.addTest(PluginResolveTest_31.suite());
-	suite.addTest(PluginResolveTest_32.suite());
-	suite.addTest(PluginResolveTest_33.suite());
-	suite.addTest(PluginVersionTest.suite());
-	suite.addTest(PluginVersionTest_2.suite());
-	suite.addTest(PluginXmlTest.suite());
-	suite.addTest(BasicXMLTest.suite());
-	suite.addTest(NumberOfElementsTest.suite());
-	suite.addTest(ExtensiveLibraryTest.suite());
-	suite.addTest(ExtensiveRequiresTest.suite());
-	suite.addTest(BadPluginsTest.suite());
-	suite.addTest(ExtensiveFragmentTest.suite());
-	suite.addTest(BasicFragmentTest.suite());
-	suite.addTest(SoftPrereqTest_1.suite());
-	suite.addTest(SoftPrereqTest_2.suite());
-	suite.addTest(SoftPrereqTest_3.suite());
-	suite.addTest(SoftPrereqTest_4.suite());
-	suite.addTest(SoftPrereqTest_5.suite());
-	suite.addTest(SoftPrereqTest_6.suite());
-	suite.addTest(SoftPrereqTest_7.suite());
-	suite.addTest(SoftPrereqTest_8.suite());
-	suite.addTest(SoftPrereqTest_9.suite());
-	suite.addTest(SoftPrereqTest_10.suite());
-	suite.addTest(SoftPrereqTest_11.suite());
-	suite.addTest(SoftPrereqTest_12.suite());
-	suite.addTest(SoftPrereqTest_13.suite());
-	suite.addTest(SoftPrereqTest_14.suite());
-	suite.addTest(SoftPrereqTest_15.suite());
-	suite.addTest(SoftPrereqTest_16.suite());
-	suite.addTest(SoftPrereqTest_17.suite());
-	suite.addTest(SoftPrereqTest_18.suite());
-	suite.addTest(SoftPrereqTest_19.suite());
-	suite.addTest(SoftPrereqTest_20.suite());
-	suite.addTest(SoftPrereqTest_21.suite());
-	suite.addTest(SoftPrereqTest_22.suite());
-	suite.addTest(ConflictResolveTest_1.suite());
-	suite.addTest(ConflictResolveTest_2.suite());
-	suite.addTest(ConflictResolveTest_3.suite());
-	suite.addTest(ConflictResolveTest_4.suite());
-	suite.addTest(ConflictResolveTest_5.suite());
-	suite.addTest(ConflictResolveTest_6.suite());
-	suite.addTest(ConflictResolveTest_7.suite());
-	suite.addTest(CircularTest.suite());
-	suite.addTest(RegressionResolveTest_1.suite());
-	suite.addTest(RegressionResolveTest_2.suite());
-	suite.addTest(RegressionResolveTest_3.suite());
-	suite.addTest(RegressionResolveTest_4.suite());
-	suite.addTest(RegressionResolveTest_5.suite());
-	suite.addTest(RegressionResolveTest_6.suite());
-	suite.addTest(RegressionResolveTest_7.suite());
-	suite.addTest(RegressionResolveTest_8.suite());
-	suite.addTest(RegressionResolveTest_9.suite());
-	suite.addTest(RegressionResolveTest_10.suite());
-	suite.addTest(FragmentResolveTest_1.suite());
-	suite.addTest(FragmentResolveTest_2.suite());
-	suite.addTest(FragmentResolveTest_3.suite());
-	suite.addTest(FragmentResolveTest_4.suite());
-	suite.addTest(FragmentResolveTest_5.suite());
-	suite.addTest(FragmentResolveTest_6.suite());
-	suite.addTest(FragmentResolveTest_7.suite());
-	suite.addTest(FragmentResolveTest_8.suite());
-	suite.addTest(FragmentResolveTest_9.suite());
-	suite.addTest(FragmentResolveTest_10.suite());
-	suite.addTest(FragmentResolveTest_11.suite());
-	suite.addTest(FragmentResolveTest_12.suite());
-	suite.addTest(FragmentResolveTest_13.suite());
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BadPluginsTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BadPluginsTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BadPluginsTest.java
deleted file mode 100644
index d5391de..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BadPluginsTest.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.runtime.*;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.tests.harness.*;
-import java.io.*;
-import java.net.URL;
-import junit.framework.*;
-import org.xml.sax.*;
-
-public class BadPluginsTest extends EclipseWorkspaceTest {
-
-public BadPluginsTest() {
-	super(null);
-}
-
-public BadPluginsTest(String name) {
-	super(name);
-}
-
-public static Test suite() {
-
-	return new TestSuite(BadPluginsTest.class);
-
-//	TestSuite suite = new TestSuite();
-//	suite.addTest(new BadPluginsTest("badElements"));
-//	suite.addTest(new BadPluginsTest("badAttributes"));
-//	suite.addTest(new BadPluginsTest("badPlugins"));
-//	suite.addTest(new BadPluginsTest("badFragment"));
-//	suite.addTest(new BadPluginsTest("failedFragment"));
-//	suite.addTest(new BadPluginsTest("duplicatePlugin"));
-//	return suite;
-}
-
-public void testBadElements() {
-	String[] badElements = {
-		"badTopLevelElementsTest", 
-		"badPluginElementsTest", 
-		"badExtensionPointElementsTest", 
-		"badLibrary1ElementsTest",
-		"badLibrary2ElementsTest",
-		"badRequiresImportElementsTest",
-		"badRequiresElementsTest",
-		"badRuntimeElementsTest",
-	};
-	String[] errorMessages = {
-		"badTopLevelElementsTest.xml: Unknown element notAPlugin, found at the top level, ignored.",
-		"badPluginElementsTest.xml: Unknown element somethingBad, found within a plugin / fragment, ignored.",
-		"badExtensionPointElementsTest.xml: Unknown element nameless, found within a extension-point, ignored.",
-		"badLibrary1ElementsTest.xml: Unknown element notAnExport, found within a library, ignored.",
-		"badLibrary2ElementsTest.xml: Unknown element badElement, found within a export, ignored.",
-		"badRequiresImportElementsTest.xml: Unknown element unrecognizedElement, found within a requires, ignored.",
-		"badRequiresElementsTest.xml: Unknown element notAnImport, found within a requires, ignored.",
-		"badRuntimeElementsTest.xml: Unknown element notALibrary, found within a runtime, ignored.",
-	};
-
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		for (int i = 0; i < badElements.length; i++) {
-			MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "badPluginsTestProblems", null);
-			InternalFactory factory = new InternalFactory(problems);
-			String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/badPluginsTest/" + badElements[i] + ".xml");
-			URL pluginURLs[] = new URL[1];
-			URL pURL = null;
-			try {
-				pURL = new URL (pluginPath);
-			} catch (java.net.MalformedURLException e) {
-				assertTrue("Bad URL for " + pluginPath, true);
-			}
-			pluginURLs[0] = pURL;
-			IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-			if (badElements[i].equals("badTopLevelElementsTest")) {
-				IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-				assertTrue(i + ".0 Only one plugin", pluginDescriptors.length == 0);
-				if (errorMessages[i].equals("")) {
-					System.out.println ("id = <no plugin>");
-					System.out.println (problems.toString());
-				} else
-					assertTrue(i + ".1 Got the right errors", problems.toString().indexOf(errorMessages[i]) != -1);
-			} else {
-				IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-				assertTrue(i + ".0 Only one plugin", pluginDescriptors.length == 1);
-				PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-				assertTrue(i + ".1 Got the right plugin", plugin.getId().equals(badElements[i]));
-				if (errorMessages[i].equals("")) {
-					System.out.println ("id = " + plugin.getId());
-					System.out.println (problems.toString());
-				} else
-					assertTrue(i + ".2 Got the right errors", problems.toString().indexOf(errorMessages[i]) != -1);
-			}
-		}
-	} catch (Exception e) {}
-}
-
-public void testBadAttributes() {
-	String[] badAttrs = {
-		"badPluginAttributesTest", 
-		"badFragment1AttributesTest", 
-		"badExtensionPointAttributesTest", 
-		"badExtensionAttributesTest",
-		"badRequiresImport1AttributesTest",
-		"badRequiresImport2AttributesTest",
-		"badRequiresImport3AttributesTest",
-		"badLibrary1AttributesTest",
-		"badLibrary2AttributesTest",
-		"badLibrary3AttributesTest",
-		"badFragment2AttributesTest", 
-	};
-	String[] errorMessages = {
-		"badPluginAttributesTest.xml: Unknown attribute a-bad-attribute for element plugin ignored.",
-		"badFragment1AttributesTest.xml: Unknown attribute vendor-name for element fragment ignored.",
-		"badExtensionPointAttributesTest.xml: Unknown attribute bogusAttribute for element extension-point ignored.",
-		"badExtensionAttributesTest.xml: Unknown attribute hello for element extension ignored.",
-		"badRequiresImport1AttributesTest.xml: Unknown attribute badImportAttr for element import ignored.",
-		"badRequiresImport2AttributesTest.xml: notTrue is not a valid value for the attribute \"export\".   Use \"true\" or \"false\".",
-		"badRequiresImport3AttributesTest.xml: incompatible is not a valid value for the attribute \"match\".   Use \"perfect\", \"equivalent\", \"compatible\" or \"greaterOrEqual\".",
-		"badLibrary1AttributesTest.xml: Unknown attribute badAttribute for element library ignored.",
-		"badLibrary2AttributesTest.xml: Unknown attribute badExportAttribute for element library ignored.",
-		"badLibrary3AttributesTest.xml: Unknown library type source for library lib1.jar.",
-		"badFragment2AttributesTest.xml: nothing is not a valid value for the attribute \"match\".   Use \"perfect\", \"equivalent\", \"compatible\" or \"greaterOrEqual\".",
-	};
-	
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		for (int i = 0; i < badAttrs.length; i++) {
-			MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "badPluginsTestProblems", null);
-			InternalFactory factory = new InternalFactory(problems);
-			String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/badPluginsTest/" + badAttrs[i] + ".xml");
-			URL pluginURLs[] = new URL[1];
-			URL pURL = null;
-			try {
-				pURL = new URL (pluginPath);
-			} catch (java.net.MalformedURLException e) {
-				assertTrue("Bad URL for " + pluginPath, true);
-			}
-			pluginURLs[0] = pURL;
-			IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-			String id = null;
-			if ((badAttrs[i].equals("badFragment1AttributesTest")) ||
-			    (badAttrs[i].equals("badFragment2AttributesTest"))) {
-				PluginFragmentModel[] fragmentDescriptors = ((PluginRegistryModel)registry).getFragments();
-				assertTrue(i + ".0 Only one fragment", fragmentDescriptors.length == 1);
-				PluginFragmentModel fragment = (PluginFragmentModel)fragmentDescriptors[0];
-				id = fragment.getId();
-				assertTrue(i + ".1 Got the right fragment", id.equals(badAttrs[i]));
-			} else {
-				IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-				assertTrue(i + ".0 Only one plugin", pluginDescriptors.length == 1);
-				PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-				id = plugin.getId();
-				assertTrue(i + ".1 Got the right plugin", id.equals(badAttrs[i]));
-			}
-			if (errorMessages[i].equals("")) {
-				System.out.println("id = " + id);
-				System.out.println(problems.toString());
-			} else {
-				assertTrue(i + ".2 Got the right errors", problems.toString().indexOf(errorMessages[i]) != -1);
-			}
-		}
-	} catch (Exception e) {}
-}
-
-public void testBadPlugins() {
-	String[] badTests = {
-		"noPluginIdTest", 
-		"blankPluginIdTest",
-		"noPluginNameTest",
-		"blankPluginNameTest", 
-		"noPluginVersionTest", 
-		"blankPluginVersionTest",
-		"badPluginVersionTest", 
-		"badPluginVersion2Test", 
-		"badPluginVersion3Test", 
-		"badPluginVersion4Test", 
-		"badPluginVersion5Test", 
-	};
-	String[] errorMessages = {
-		"Id attribute missing from plugin or fragment at file:",
-		"Id attribute missing from plugin or fragment at file:",
-		"Name attribute missing from plugin or fragment at file:",
-		"Name attribute missing from plugin or fragment at file:",
-		"Version attribute missing from plugin or fragment at file:",
-		"A plugin version identifier must be non-empty.",
-		"The service (3rd) component of plugin version identifier, 1.2.bad, must be numeric.",
-		"The minor (2nd) component of plugin version identifier, 1.bad.0, must be numeric.",
-		"Plugin version identifier, ..., must not start with a separator character.",
-		"The major (1st) component of plugin version identifier, one, must be numeric.",
-		"Plugin version identifier, 1.2.3.4.5, can contain a maximum of four components.",
-		"",
-	};
-	
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		for (int i = 0; i < badTests.length; i++) {
-			MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "badPluginsTestProblems", null);
-			InternalFactory factory = new InternalFactory(problems);
-			String[] pluginPath = new String[1];
-			pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/badPluginsTest/" + badTests[i] + ".xml");
-			URL pluginURLs[] = new URL[1];
-			for (int j = 0; j < pluginURLs.length; j++) {
-				URL pURL = null;
-				try {
-					pURL = new URL (pluginPath[j]);
-				} catch (java.net.MalformedURLException e) {
-					assertTrue("Bad URL for " + pluginPath[j], true);
-				}
-				pluginURLs[j] = pURL;
-			}
-			IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-			PluginDescriptorModel[] plugins = ((PluginRegistryModel)registry).getPlugins();
-			assertTrue(i + ".0 No plugins found", plugins.length == 0);
-			if (errorMessages[i].equals("")) {
-				System.out.println("id = " + badTests[i]);
-				System.out.println(problems.toString());
-			} else {
-				assertTrue(i + ".1 Got the right errors", problems.toString().indexOf(errorMessages[i]) != -1);
-			}
-		}
-	} catch (Exception e) {
-		fail("0.2 Unexpected exception - " + e.getMessage());
-	}
-}
-
-public void testBadFragment() {
-	String[] badAttrs = {
-		"badFragmentsTest",
-		"fragment10799",
-	};
-	String[] errorMessages = {
-		"Plugin descriptor org.eclipse.not.there not found for fragment badFragmentsTest.  Fragment ignored.",
-		"Fragment Fragment 10799 requires non-existant plugin org.apache.something.which.does.not.exist.  Fragment ignored.",
-	};
-	
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		for (int i = 0; i < badAttrs.length; i++) {
-			MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "badPluginsTestProblems", null);
-			InternalFactory factory = new InternalFactory(problems);
-			String[] pluginPath = new String[2];
-			pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/badPluginsTest/badFragmentsPluginTest.xml");
-			pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/badPluginsTest/" + badAttrs[i] + ".xml");
-			URL pluginURLs[] = new URL[2];
-			for (int j = 0; j < pluginURLs.length; j++) {
-				URL pURL = null;
-				try {
-					pURL = new URL (pluginPath[j]);
-				} catch (java.net.MalformedURLException e) {
-					assertTrue("Bad URL for " + pluginPath[j], true);
-				}
-				pluginURLs[j] = pURL;
-			}
-			IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-			String id = null;
-			PluginFragmentModel[] fragmentDescriptors = ((PluginRegistryModel)registry).getFragments();
-			assertTrue(i + ".0 Only one fragment", fragmentDescriptors.length == 1);
-			PluginFragmentModel fragment = (PluginFragmentModel)fragmentDescriptors[0];
-			id = fragment.getId();
-			assertTrue(i + ".1 Got the right fragment", id.equals(badAttrs[i]));
-			IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-			assertTrue(i + ".2 Only one plugin", pluginDescriptors.length == 1);
-			PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-			id = plugin.getId();
-			assertTrue(i + ".3 Got the right plugin", id.equals("badFragmentsPluginTest"));
-			if (errorMessages[i].equals("")) {
-				System.out.println("id = " + id);
-				System.out.println(problems.toString());
-			} else {
-				assertTrue(i + ".4 Got the right errors", problems.toString().indexOf(errorMessages[i]) != -1);
-			}
-		}
-	} catch (Exception e) {
-		fail("0.5 Unexpected exception - " + e.getMessage());
-	}
-}
-
-public void testFailedFragment() {
-	String[] badAttrs = {
-		"noFragmentIdTest", 
-		"blankFragmentIdTest",
-		"noFragmentNameTest",
-		"blankFragmentNameTest", 
-		"noFragmentVersionTest", 
-		"blankFragmentVersionTest",
-		"badFragmentVersionTest", 
-		"noFragmentPluginIdTest",
-		"blankFragmentPluginIdTest",
-		"noFragmentPluginVersionTest",
-		"blankFragmentPluginVersionTest",
-	};
-	String[] errorMessages = {
-		"Id attribute missing from plugin or fragment at file:",
-		"Id attribute missing from plugin or fragment at file:",
-		"Name attribute missing from plugin or fragment at file:",
-		"Name attribute missing from plugin or fragment at file:",
-		"Version attribute missing from plugin or fragment at file:",
-		"A plugin version identifier must be non-empty.",
-		"The service (3rd) component of plugin version identifier, 1.2.bad, must be numeric.",
-		"Plugin name attribute missing from fragment at file:",
-		"Plugin name attribute missing from fragment at file:",
-		"Plugin version attribute missing from fragment at file:",
-		"A plugin version identifier must be non-empty.",
-	};
-	
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		for (int i = 0; i < badAttrs.length; i++) {
-			MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "badPluginsTestProblems", null);
-			InternalFactory factory = new InternalFactory(problems);
-			String[] pluginPath = new String[2];
-			pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/badPluginsTest/badFragmentsPluginTest.xml");
-			pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/badPluginsTest/" + badAttrs[i] + ".xml");
-			URL pluginURLs[] = new URL[2];
-			for (int j = 0; j < pluginURLs.length; j++) {
-				URL pURL = null;
-				try {
-					pURL = new URL (pluginPath[j]);
-				} catch (java.net.MalformedURLException e) {
-					assertTrue("Bad URL for " + pluginPath[j], true);
-				}
-				pluginURLs[j] = pURL;
-			}
-			IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-			PluginFragmentModel[] fragmentDescriptors = ((PluginRegistryModel)registry).getFragments();
-			assertTrue(i + ".0 No fragments found", fragmentDescriptors.length == 0);
-			if (errorMessages[i].equals("")) {
-				System.out.println("id = " + badAttrs[i]);
-				System.out.println(problems.toString());
-			} else {
-				assertTrue(i + ".1 Got the right errors", problems.toString().indexOf(errorMessages[i]) != -1);
-			}
-		}
-	} catch (Exception e) {
-		fail("0.2 Unexpected exception - " + e.getMessage());
-	}
-}
-public void testDuplicatePlugin() {
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String errorMessage = "Two plugins found with the same id: duplicatePluginTest. Ignoring duplicate at file:";
-	try {
-		MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "badPluginsTestProblems", null);
-		InternalFactory factory = new InternalFactory(problems);
-		String[] pluginPath = new String[2];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/badPluginsTest/duplicatePlugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/badPluginsTest/duplicatePlugin2.xml");
-		URL pluginURLs[] = new URL[2];
-		for (int j = 0; j < pluginURLs.length; j++) {
-			URL pURL = null;
-			try {
-				pURL = new URL (pluginPath[j]);
-			} catch (java.net.MalformedURLException e) {
-				assertTrue("Bad URL for " + pluginPath[j], true);
-			}
-			pluginURLs[j] = pURL;
-		}
-		IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-		PluginDescriptorModel[] pluginDescriptors = ((PluginRegistryModel)registry).getPlugins();
-		assertTrue("1.0 One plugin found", pluginDescriptors.length == 1);
-		if (errorMessage.equals("")) {
-			System.out.println(problems.toString());
-		} else {
-			assertTrue("1.1 Got the right errors", problems.toString().indexOf(errorMessage) != -1);
-		}
-	} catch (Exception e) {
-		fail("0.2 Unexpected exception - " + e.getMessage());
-	}
-}
-}
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BasicFragmentTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BasicFragmentTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BasicFragmentTest.java
deleted file mode 100644
index 7eaf797..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BasicFragmentTest.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.runtime.*;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.tests.harness.*;
-import java.io.*;
-import java.net.URL;
-import junit.framework.*;
-import org.xml.sax.*;
-
-public class BasicFragmentTest extends EclipseWorkspaceTest {
-
-public BasicFragmentTest() {
-	super(null);
-}
-
-public BasicFragmentTest(String name) {
-	super(name);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	// These 4 tests are designed primarily to address
-	// PR1GHFPFY which noted that runtime libraries in a
-	// fragment were being added to the relevant plugin
-	// twice.
-	suite.addTest(new BasicFragmentTest("extensionPointTest"));
-	suite.addTest(new BasicFragmentTest("extensionTest"));
-	suite.addTest(new BasicFragmentTest("libraryTest"));
-	suite.addTest(new BasicFragmentTest("requiresTest"));
-	// The following test was added for PR1GHH81D.  In this
-	// PR we found that we didn't always pick up the latest
-	// version of a fragment to augment the plugin
-	suite.addTest(new BasicFragmentTest("fragmentVersionTest"));
-	return suite;
-}
-public void extensionPointTest() {
-	// Ensure fragment extension point information is not being added twice to the plugin
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "basicFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[1];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/PR1GHFPFYTest/extensionPointTest/");
-	URL pluginURLs[] = new URL[1];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("PR1GHFPFYPluginTest");
-	assertTrue("1.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("1.1 Got the right plugin", plugin.getId().equals("PR1GHFPFYPluginTest"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("1.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("1.3 Got the right fragment", fragment.getId().equals("PR1GHFPFYFragmentTest"));
-	
-	// Check extension points
-	ExtensionPointModel[] extensionPoints = plugin.getDeclaredExtensionPoints();
-	assertTrue("1.4 Got 4 extension points", extensionPoints.length == 4);
-	assertNotNull("1.5 Got xpt1 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt1"));
-	assertNotNull("1.6 Got xpt2 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt2"));
-	assertNotNull("1.7 Got xpt3 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt3"));
-	assertNotNull("1.8 Got xpt4 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt4"));
-}
-
-public void extensionTest() {
-	// Ensure fragment extension information is not being added twice to the plugin
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "basicFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[1];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/PR1GHFPFYTest/extensionTest/");
-	URL pluginURLs[] = new URL[1];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("PR1GHFPFYPluginTest");
-	assertTrue("2.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("2.1 Got the right plugin", plugin.getId().equals("PR1GHFPFYPluginTest"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("2.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("2.3 Got the right fragment", fragment.getId().equals("PR1GHFPFYFragmentTest"));
-		
-	// Check extensions
-	ExtensionModel[] extensions = plugin.getDeclaredExtensions();
-	assertTrue("2.4 Got 4 extensions", extensions.length == 4);
-	assertNotNull("2.5 Got x1 extension", ((IPluginDescriptor)plugin).getExtension("x1"));
-	assertNotNull("2.6 Got x2 extension", ((IPluginDescriptor)plugin).getExtension("x2"));
-	assertNotNull("2.7 Got x3 extension", ((IPluginDescriptor)plugin).getExtension("x3"));
-	assertNotNull("2.8 Got x4 extension", ((IPluginDescriptor)plugin).getExtension("x4"));
-}
-
-public void libraryTest() {
-	// Ensure fragment library information is not being added twice to the plugin
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "basicFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[1];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/PR1GHFPFYTest/libraryTest/");
-	URL pluginURLs[] = new URL[1];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("PR1GHFPFYPluginTest");
-	assertTrue("3.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("3.1 Got the right plugin", plugin.getId().equals("PR1GHFPFYPluginTest"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("3.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("3.3 Got the right fragment", fragment.getId().equals("PR1GHFPFYFragmentTest"));
-	
-	// Check libraries
-	LibraryModel[] libraries = plugin.getRuntime();
-	assertTrue ("3.4 Got 4 libraries", libraries.length == 4);
-	int idx1 = -1;
-	int idx2 = -1;
-	int idx3 = -1;
-	int idx4 = -1;
-	for (int i = 0; i < libraries.length; i++) {
-		if (libraries[i].getName().equals("lib1.jar")) {
-			idx1 = i;
-		} else if (libraries[i].getName().equals("lib2.jar")) {
-			idx2 = i;
-		} else if (libraries[i].getName().equals("lib3.jar")) {
-			idx3 = i;
-		} else if (libraries[i].getName().equals("lib4.jar")) {
-			idx4 = i;
-		}
-	}
-	assertTrue("3.5 Have lib1.jar library", idx1 != -1);
-	assertTrue("3.6 Have lib2.jar library", idx2 != -1);
-	assertTrue("3.7 Have lib3.jar library", idx3 != -1);
-	assertTrue("3.8 Have lib4.jar library", idx4 != -1);
-	
-}
-
-
-public void requiresTest() {
-	// Ensure fragment prerequisite information is not being added twice to the plugin
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "basicFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[1];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/PR1GHFPFYTest/requiresTest/");
-	URL pluginURLs[] = new URL[1];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("PR1GHFPFYPluginTest");
-	assertTrue("4.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("4.1 Got the right plugin", plugin.getId().equals("PR1GHFPFYPluginTest"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("4.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("4.3 Got the right fragment", fragment.getId().equals("PR1GHFPFYFragmentTest"));
-	
-	// Check requires
-	PluginPrerequisiteModel[] requires = plugin.getRequires();
-	assertTrue ("4.4 Got 4 prerequisites", requires.length == 4);
-	int idx1 = -1;
-	int idx2 = -1;
-	int idx3 = -1;
-	int idx4 = -1;
-	for (int i = 0; i < requires.length; i++) {
-		if (requires[i].getPlugin().equals("testa")) {
-			idx1 = i;
-		} else if (requires[i].getPlugin().equals("testb")) {
-			idx2 = i;
-		} else if (requires[i].getPlugin().equals("testc")) {
-			idx3 = i;
-		} else if (requires[i].getPlugin().equals("testd")) {
-			idx4 = i;
-		}
-	}
-	assertTrue("4.5 Have testa prerequisite", idx1 != -1);
-	assertTrue("4.6 Have testb prerequisite", idx2 != -1);
-	assertTrue("4.7 Have testc prerequisite", idx3 != -1);
-	assertTrue("4.8 Have testd prerequisite", idx4 != -1);
-}
-
-public void fragmentVersionTest() {
-	// Ensure that we pick up the latest version of a fragment to augment a plugin
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "basicFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[4];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/PR1GHH81DTest/plugin.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/PR1GHH81DTest/fragment1.xml");
-	pluginPaths[2] = tempPlugin.getLocation().concat("Plugin_Testing/PR1GHH81DTest/fragment2.xml");
-	pluginPaths[3] = tempPlugin.getLocation().concat("Plugin_Testing/PR1GHH81DTest/fragment3.xml");
-	URL pluginURLs[] = new URL[4];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("PR1GHH81DPluginTest");
-	assertTrue("5.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("5.1 Got the right plugin", plugin.getId().equals("PR1GHH81DPluginTest"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("5.2 Three fragments", fragmentList.length == 3);
-	
-	// Now make sure that the resulting plugin descriptor picked up only the latest
-	// version of the fragment. This means there should be a total of 5 library entries:
-	// lib1, lib2, lib5, lib6, and lib7.
-	LibraryModel[] libraries = plugin.getRuntime();
-	assertTrue ("5.3 Got 5 libraries", libraries.length == 5);
-	int idx1 = -1;
-	int idx2 = -1;
-	int idx5 = -1;
-	int idx6 = -1;
-	int idx7 = -1;
-	for (int i = 0; i < libraries.length; i++) {
-		if (libraries[i].getName().equals("lib1.jar")) {
-			idx1 = i;
-		} else if (libraries[i].getName().equals("lib2.jar")) {
-			idx2 = i;
-		} else if (libraries[i].getName().equals("lib5.jar")) {
-			idx5 = i;
-		} else if (libraries[i].getName().equals("lib6.jar")) {
-			idx6 = i;
-		} else if (libraries[i].getName().equals("lib7.jar")) {
-			idx7 = i;
-		}
-	}
-	assertTrue("5.4 Have lib1.jar library", idx1 != -1);
-	assertTrue("5.5 Have lib2.jar library", idx2 != -1);
-	assertTrue("5.6 Have lib5.jar library", idx5 != -1);
-	assertTrue("5.7 Have lib6.jar library", idx6 != -1);
-	assertTrue("5.8 Have lib7.jar library", idx7 != -1);
-}
-
-}
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BasicXMLTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BasicXMLTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BasicXMLTest.java
deleted file mode 100644
index 1348496..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/BasicXMLTest.java
+++ /dev/null
@@ -1,2106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.runtime.*;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.tests.harness.*;
-import java.io.*;
-import junit.framework.*;
-import org.xml.sax.*;
-
-public class BasicXMLTest extends EclipseWorkspaceTest {
-	PluginDescriptor plugin = null;
-	PluginRegistry registry = null;
-	InternalFactory factory = null;
-public BasicXMLTest() {
-	super(null);
-}
-public BasicXMLTest(String name) {
-	super(name);
-}
-/* doParsing
- * This method will parse a series of XML files.  The input array should be
- * an array of string buffers where each string buffer is considered a complete 
- * XML file.  The returning array will have a corresponding plugin descriptor
- * for each of the XML files in the input array
- */
-public PluginRegistry doParsing(InternalFactory factory, String[] localXMLFiles) {
-
-	registry = new PluginRegistry();
-	if (localXMLFiles == null || localXMLFiles.length == 0)
-		return null;
-
-	for (int i = 0; i < localXMLFiles.length; i++) {
-		String thisXMLString = localXMLFiles[i];
-		PluginModel localPlugin = null;
-		try {
-			ByteArrayInputStream is = new ByteArrayInputStream(thisXMLString.toString().getBytes());
-			PluginParser p = new PluginParser(factory);
-			localPlugin = p.parsePlugin(new InputSource(is));
-		} catch (SAXParseException se) {
-			/* exception details logged by parser */
-			fail("1.2 SAX Parser exception encountered.", se);
-		} catch (Exception e) {
-			fail("1.3 ", e);
-		}
-		if (localPlugin instanceof PluginDescriptorModel) {
-			registry.addPlugin((PluginDescriptorModel)localPlugin);
-		} else {
-			registry.addFragment((PluginFragmentModel)localPlugin);
-		}
-		localPlugin.setRegistry(registry);
-	}
-	return registry;
-}
-public String[] extensionPointSetup() {
-	plugin = new PluginDescriptor();
-	plugin.setName("First test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	ExtensionPoint[] pluginExtensionPoints = new ExtensionPoint[2];
-	for (int i = 0; i < pluginExtensionPoints.length; i++) {
-		pluginExtensionPoints[i] = new ExtensionPoint();
-	}
-	pluginExtensionPoints[0].setName("First Extension Point");
-	pluginExtensionPoints[0].setId("first");
-	pluginExtensionPoints[0].setSchema("some schema name");
-	pluginExtensionPoints[1].setName("Second Extension Point");
-	plugin.setDeclaredExtensionPoints(pluginExtensionPoints);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  extensionPointTest
- *  Tests to ensure we create extension point entries and populate them correctly.
- *  Note that this test will NOT ensure that we correctly link related extensions
- *  and extension points.  This will be done in a different test
- */
-public void extensionPointTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = extensionPointSetup();
-	registry = doParsing(factory, localXMLFiles);
-
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-	IPluginDescriptor[] ROPluginList = registry.getPluginDescriptors();
-	// Check both the read-only accessors and the read-write accessors
-
-	// First check to make sure we got something back
-	assertNotNull("1.1 Sane return value", pluginList);
-	assertNotNull("1.2 Sane plugin descriptor", pluginList[0]);
-	assertNotNull("1.3 Sane return value", ROPluginList);
-	assertNotNull("1.4 Sane plugin descriptor", ROPluginList[0]);
-
-	// Now check that the plugin we got really reflects what's in the xml stream
-	assertEquals("2.1 Plugin Name", plugin.getName(), pluginList[0].getName());
-	assertEquals("2.2 Plugin Id", plugin.getId(), pluginList[0].getId());
-	assertEquals("2.3 Plugin Vendor Name", plugin.getProviderName(), pluginList[0].getProviderName());
-	assertEquals("2.4 Plugin Version", plugin.getVersion(), pluginList[0].getVersion());
-	assertNull("2.5 Plugin Class", pluginList[0].getPluginClass());
-	assertNull("2.6 Runtime List", pluginList[0].getRuntime());
-	assertNull("2.7 Requires List", pluginList[0].getRequires());
-	assertNull("2.8 Extensions List", pluginList[0].getDeclaredExtensions());
-	assertEquals("2.9 Registry", pluginList[0].getRegistry(), registry);
-	assertNull("2.10 Plugin Location", pluginList[0].getLocation());
-	// Now check the same things but with the read-only accessors
-	assertEquals("2.11 Plugin Name", plugin.getName(), ROPluginList[0].getLabel());
-	assertEquals("2.12 Plugin Id", plugin.getId(), ROPluginList[0].getUniqueIdentifier());
-	assertEquals("2.13 Plugin Vendor Name", plugin.getProviderName(), ROPluginList[0].getProviderName());
-	assertEquals("2.14 Plugin Version", plugin.getVersionIdentifier(), ROPluginList[0].getVersionIdentifier());
-//	assertNotNull("2.15 Plugin Class Loader", ROPluginList[0].getPluginClassLoader());
-	assertEquals("2.16 Runtime List", ROPluginList[0].getRuntimeLibraries().length, 0);
-	assertEquals("2.17 Requires List", ROPluginList[0].getPluginPrerequisites().length, 0);
-	assertEquals("2.18 Extensions List", ROPluginList[0].getExtensions().length, 0);
-	assertNotNull("2.19 Plugin Location", ROPluginList[0].getInstallURL());
-
-	// Now check the extension points
-	ExtensionPointModel[] extPtList = pluginList[0].getDeclaredExtensionPoints();
-	assertNotNull("3.1 Extension Point list null", extPtList);
-	assertEquals("3.2 Number of extension points", extPtList.length, 2);
-	IExtensionPoint[] ROExtPtList = ROPluginList[0].getExtensionPoints();
-	assertNotNull("3.1 Extension Point list null", ROExtPtList);
-	assertEquals("3.2 Number of extension points", ROExtPtList.length, 2);
-
-	ExtensionPoint[] originalExtPts = (ExtensionPoint[]) plugin.getDeclaredExtensionPoints();
-
-	// Make sure the values in this extension points are correct
-	assertEquals("4.1 Extension Point name", extPtList[0].getName(), originalExtPts[0].getName());
-	assertEquals("4.2 Extension Point id", extPtList[0].getId(), originalExtPts[0].getId());
-	assertEquals("4.3 Extension Point schema", extPtList[0].getSchema(), originalExtPts[0].getSchema());
-	assertEquals("4.4 Extension Point name", ROExtPtList[0].getLabel(), originalExtPts[0].getName());
-	assertEquals("4.5 Extension Point id", ROExtPtList[0].getSimpleIdentifier(), originalExtPts[0].getId());
-	assertEquals("4.6 Extension Point schema", ROExtPtList[0].getSchemaReference(), originalExtPts[0].getSchemaReference());
-
-	// And check the 2nd requires element too
-	assertEquals("5.1 Extension Point name", extPtList[1].getName(), originalExtPts[1].getName());
-	assertEquals("5.2 Extension Point id", extPtList[1].getId(), originalExtPts[1].getId());
-	assertEquals("5.3 Extension Point schema", extPtList[1].getSchema(), originalExtPts[1].getSchema());
-	assertEquals("5.4 Extension Point name", ROExtPtList[1].getLabel(), originalExtPts[1].getName());
-	assertEquals("5.5 Extension Point id", ROExtPtList[1].getSimpleIdentifier(), originalExtPts[1].getId());
-	assertEquals("5.6 Extension Point schema", ROExtPtList[1].getSchemaReference(), originalExtPts[1].getSchemaReference());
-
-	factory = null;
-}
-public String[] extensionSetup() {
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	Extension[] pluginExtensions = new Extension[3];
-	for (int i = 0; i < pluginExtensions.length; i++) {
-		pluginExtensions[i] = new Extension();
-		pluginExtensions[i].setParentPluginDescriptor(plugin);
-	}
-	pluginExtensions[0].setName("First Extension");
-	pluginExtensions[0].setId("first");
-	pluginExtensions[0].setExtensionPoint("First Extension Point");
-
-	pluginExtensions[1].setExtensionPoint("Second Extension Point");
-
-	pluginExtensions[2].setExtensionPoint("Third Extension Point");
-
-	// First group of properties
-	ConfigurationProperty[] propertyGroup1 = new ConfigurationProperty[2];
-	for (int i = 0; i < propertyGroup1.length; i++) {
-		propertyGroup1[i] = new ConfigurationProperty();
-	}
-	propertyGroup1[0].setName("id");
-	propertyGroup1[0].setValue("category_id");
-	propertyGroup1[1].setName("name");
-	propertyGroup1[1].setValue("category_name");
-	// Second group of properties
-	ConfigurationProperty[] propertyGroup2 = new ConfigurationProperty[3];
-	for (int i = 0; i < propertyGroup2.length; i++) {
-		propertyGroup2[i] = new ConfigurationProperty();
-	}
-	propertyGroup2[0].setName("id");
-	propertyGroup2[0].setValue("wizard_id");
-	propertyGroup2[1].setName("name");
-	propertyGroup2[1].setValue("wizard_name");
-	propertyGroup2[2].setName("class");
-	propertyGroup2[2].setValue("wizard_class");
-	// Third group of properties
-	ConfigurationProperty[] propertyGroup3 = new ConfigurationProperty[1];
-	for (int i = 0; i < propertyGroup3.length; i++) {
-		propertyGroup3[i] = new ConfigurationProperty();
-	}
-	propertyGroup3[0].setName("class");
-	propertyGroup3[0].setValue("a selection class");
-
-	// First subelement group
-	ConfigurationElement[] subElementGroup1 = new ConfigurationElement[2];
-	for (int i = 0; i < subElementGroup1.length; i++) {
-		subElementGroup1[i] = new ConfigurationElement();
-		subElementGroup1[i].setParent(pluginExtensions[2]);
-	}
-	subElementGroup1[0].setName("category");
-	subElementGroup1[0].setProperties(propertyGroup1);
-
-	subElementGroup1[1].setName("wizard");
-	subElementGroup1[1].setProperties(propertyGroup2);
-
-	// Second subelement group
-	ConfigurationElement[] subElementGroup2 = new ConfigurationElement[2];
-	for (int i = 0; i < subElementGroup2.length; i++) {
-		subElementGroup2[i] = new ConfigurationElement();
-		subElementGroup2[i].setParent(subElementGroup1[1]);
-	}
-	subElementGroup2[0].setName("description");
-	subElementGroup2[0].setValue("This is just a description");
-	subElementGroup2[1].setName("selection");
-	subElementGroup2[1].setProperties(propertyGroup3);
-
-	// Now link them together
-	subElementGroup1[1].setSubElements(subElementGroup2);
-	pluginExtensions[2].setSubElements(subElementGroup1);
-	plugin.setDeclaredExtensions(pluginExtensions);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  extensionTest
- *  Tests to ensure we create extension entries and populate them correctly.
- *  Note that this test will NOT ensure that we correctly link related extensions
- *  and extension points.  This will be done in a different test
- */
-public void extensionTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = extensionSetup();
-	registry = doParsing(factory, localXMLFiles);
-
-	// Check both the read-only accessors and the read-write accessors
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-	IPluginDescriptor[] ROPluginList = registry.getPluginDescriptors();
-
-	// First check to make sure we got something back
-	assertNotNull("1.1 Sane return value", pluginList);
-	assertNotNull("1.2 Sane plugin descriptor", pluginList[0]);
-	assertNotNull("1.3 Sane return value", ROPluginList);
-	assertNotNull("1.4 Sane plugin descriptor", ROPluginList[0]);
-
-	// Now check that the plugin we got really reflects what's in the xml stream
-	assertEquals("2.1 Plugin Name", plugin.getName(), pluginList[0].getName());
-	assertEquals("2.2 Plugin Id", plugin.getId(), pluginList[0].getId());
-	assertEquals("2.3 Plugin Vendor Name", plugin.getProviderName(), pluginList[0].getProviderName());
-	assertEquals("2.4 Plugin Version", plugin.getVersion(), pluginList[0].getVersion());
-	assertNull("2.5 Plugin Class", pluginList[0].getPluginClass());
-	assertNull("2.6 Runtime List", pluginList[0].getRuntime());
-	assertNull("2.7 Requires List", pluginList[0].getRequires());
-	assertNull("2.8 Extension Point List", pluginList[0].getDeclaredExtensionPoints());
-	assertEquals("2.9 Registry", pluginList[0].getRegistry(), registry);
-	assertNull("2.10 Plugin Location", pluginList[0].getLocation());
-
-	// Repeat for read-only accessors
-	assertEquals("3.1 Plugin Name", plugin.getName(), ROPluginList[0].getLabel());
-	assertEquals("3.2 Plugin Id", plugin.getId(), ROPluginList[0].getUniqueIdentifier());
-	assertEquals("3.3 Plugin Vendor Name", plugin.getProviderName(), ROPluginList[0].getProviderName());
-	assertEquals("3.4 Plugin Version", plugin.getVersionIdentifier(), ROPluginList[0].getVersionIdentifier());
-//	assertNotNull("3.5 Plugin Class", ROPluginList[0].getPluginClassLoader());
-	assertEquals("3.6 Runtime List", ROPluginList[0].getRuntimeLibraries().length, 0);
-	assertEquals("3.7 Requires List", ROPluginList[0].getPluginPrerequisites().length, 0);
-	assertEquals("3.8 Extension Point List", ROPluginList[0].getExtensionPoints().length, 0);
-	assertNotNull("3.9 Plugin Install URL", ROPluginList[0].getInstallURL());
-
-	// Now check the extension points
-	ExtensionModel[] extensionList = pluginList[0].getDeclaredExtensions();
-	IExtension[] ROExtensionList = ROPluginList[0].getExtensions();
-	assertNotNull("4.1 Extension list null", extensionList);
-	assertEquals("4.2 Number of extensions", extensionList.length, 3);
-	assertNotNull("4.3 Extension list null", ROExtensionList);
-	assertEquals("4.4 Number of extensions", ROExtensionList.length, 3);
-
-	ExtensionModel[] originalExtensions = plugin.getDeclaredExtensions();
-
-	// Make sure the values in this extension are correct
-	assertEquals("5.1 Extension name", extensionList[0].getName(), originalExtensions[0].getName());
-	assertEquals("5.2 Extension id", extensionList[0].getId(), originalExtensions[0].getId());
-	assertEquals("5.3 Extension extension point", extensionList[0].getExtensionPoint(), plugin.getId() + "." + originalExtensions[0].getExtensionPoint());
-	assertEquals("5.4 Extension name", ROExtensionList[0].getLabel(), originalExtensions[0].getName());
-	assertEquals("5.5 Extension id", ROExtensionList[0].getSimpleIdentifier(), originalExtensions[0].getId());
-	assertEquals("5.6 Extension extension point", ROExtensionList[0].getExtensionPointUniqueIdentifier(), plugin.getId() + "." + originalExtensions[0].getExtensionPoint());
-
-	// And check the 2nd extension too
-	assertEquals("6.1 Extension name", extensionList[1].getName(), originalExtensions[1].getName());
-	assertEquals("6.2 Extension id", extensionList[1].getId(), originalExtensions[1].getId());
-	assertEquals("6.3 Extension extension point", extensionList[1].getExtensionPoint(), plugin.getId() + "." + originalExtensions[1].getExtensionPoint());
-	assertEquals("6.4 Extension name", ROExtensionList[1].getLabel(), "");
-	assertEquals("6.5 Extension id", ROExtensionList[1].getSimpleIdentifier(), originalExtensions[1].getId());
-	assertEquals("6.6 Extension extension point", ROExtensionList[1].getExtensionPointUniqueIdentifier(), plugin.getId() + "." + originalExtensions[1].getExtensionPoint());
-
-	// Finally check the 3rd extension (which is the most complex)
-	assertEquals("7.1 Extension name", extensionList[2].getName(), originalExtensions[2].getName());
-	assertEquals("7.2 Extension id", extensionList[2].getId(), originalExtensions[2].getId());
-	assertEquals("7.3 Extension extension point", extensionList[2].getExtensionPoint(), plugin.getId() + "." + originalExtensions[2].getExtensionPoint());
-	assertEquals("7.4 Extension name", ROExtensionList[2].getLabel(), "");
-	assertEquals("7.5 Extension id", ROExtensionList[2].getSimpleIdentifier(), originalExtensions[2].getId());
-	assertEquals("7.6 Extension extension point", ROExtensionList[2].getExtensionPointUniqueIdentifier(), plugin.getId() + "." + originalExtensions[2].getExtensionPoint());
-
-	// Now comes the fun part.  Check the structure that hangs off this extension
-	ConfigurationElementModel[] subElements = extensionList[2].getSubElements();
-	IConfigurationElement ROSubElements[] = ROExtensionList[2].getConfigurationElements();
-	ConfigurationElement[] originalSubElements = (ConfigurationElement[]) originalExtensions[2].getSubElements();
-	assertNotNull("8.1 First level subelements null", subElements);
-	assertEquals("8.2 Number of subelements", subElements.length, 2);
-	assertNotNull("8.3 First level subelements null", ROSubElements);
-	assertEquals("8.4 Number of subelements", ROSubElements.length, 2);
-
-	// First, there should be 2 subelements:  category and wizard
-	assertEquals("9.1 First level subelements name", subElements[0].getName(), originalSubElements[0].getName());
-	assertEquals("9.2 First level subelements name", subElements[1].getName(), originalSubElements[1].getName());
-	assertEquals("9.3 First level subelements name", ROSubElements[0].getName(), originalSubElements[0].getName());
-	assertEquals("9.4 First level subelements name", ROSubElements[1].getName(), originalSubElements[1].getName());
-
-	// Now check the first property group (off the 'category' subelement)
-	// Note there is no read-only version of a configuration property
-	ConfigurationPropertyModel[] properties = subElements[0].getProperties();
-	ConfigurationProperty[] originalProperties = (ConfigurationProperty[]) originalSubElements[0].getProperties();
-
-	// There should be 2 properties:  id and name
-	assertNotNull("10.1 Property Group 1 null", properties);
-	assertEquals("10.2 Number of properties", properties.length, 2);
-	assertEquals("10.3 Property Group 1 - name", properties[0].getName(), originalProperties[0].getName());
-	assertEquals("10.4 Property Group 1 - value", properties[0].getValue(), originalProperties[0].getValue());
-	assertEquals("10.5 Property Group 1 - name", properties[1].getName(), originalProperties[1].getName());
-	assertEquals("10.6 Property Group 1 - value", properties[1].getValue(), originalProperties[1].getValue());
-
-	// Check the second property group (off the 'wizard' subelement)
-	properties = subElements[1].getProperties();
-	originalProperties = (ConfigurationProperty[]) originalSubElements[1].getProperties();
-	assertNotNull("11.1 Property Group 2 null", properties);
-	assertEquals("11.2 Number of properties", properties.length, 3);
-	assertEquals("11.3 Property Group 2 - name", properties[0].getName(), originalProperties[0].getName());
-	assertEquals("11.4 Property Group 2 - value", properties[0].getValue(), originalProperties[0].getValue());
-	assertEquals("11.5 Property Group 2 - name", properties[1].getName(), originalProperties[1].getName());
-	assertEquals("11.6 Property Group 2 - value", properties[1].getValue(), originalProperties[1].getValue());
-	assertEquals("11.7 Property Group 2 - name", properties[2].getName(), originalProperties[2].getName());
-	assertEquals("11.8 Property Group 2 - value", properties[2].getValue(), originalProperties[2].getValue());
-
-	// The 'wizard' subelement has 2 subelements that hang off it:  description and selection
-	ConfigurationElementModel[] subElements2 = subElements[1].getSubElements();
-	ConfigurationElement[] originalSubElements2 = (ConfigurationElement[]) originalSubElements[1].getSubElements();
-	IConfigurationElement ROSubElements2[] = ROSubElements[1].getChildren();
-	assertNotNull("12.1 Second level subelements null", subElements2);
-	assertEquals("12.2 Number of subelements", subElements2.length, 2);
-	assertNotNull("12.3 Second level subelements null", ROSubElements2);
-	assertEquals("12.4 Number of subelements", ROSubElements2.length, 2);
-
-	// Check for 'description' and 'selection'
-	assertEquals("13.1 Second level subelements name", subElements2[0].getName(), originalSubElements2[0].getName());
-	assertEquals("13.2 Second level subelements value", subElements2[0].getValue(), originalSubElements2[0].getValue());
-	assertEquals("13.3 Second level subelements name", subElements2[1].getName(), originalSubElements2[1].getName());
-	assertEquals("13.4 Second level subelements name", ROSubElements2[0].getName(), originalSubElements2[0].getName());
-	assertEquals("13.5 Second level subelements value", ROSubElements2[0].getValue(), originalSubElements2[0].getValue());
-	assertEquals("13.6 Second level subelements name", ROSubElements2[1].getName(), originalSubElements2[1].getName());
-
-	// The last of the second level subelements (selection) has a single property
-	properties = subElements2[1].getProperties();
-	originalProperties = (ConfigurationProperty[]) originalSubElements2[1].getProperties();
-	assertNotNull("14.1 Property Group 3 null", properties);
-	assertEquals("14.2 Number of properties", properties.length, 1);
-	assertEquals("14.3 Property Group 3 - name", properties[0].getName(), originalProperties[0].getName());
-	assertEquals("14.4 Property Group 3 - value", properties[0].getValue(), originalProperties[0].getValue());
-
-	factory = null;
-}
-public String[] extExtPtLinkSetup() {
-	PluginDescriptor[] pluginList = new PluginDescriptor[2];
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("abc1");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	Extension[] pluginExtensions = new Extension[4];
-	for (int i = 0; i < pluginExtensions.length; i++) {
-		pluginExtensions[i] = new Extension();
-		pluginExtensions[i].setParentPluginDescriptor(plugin);
-	}
-	pluginExtensions[0].setName("First Extension");
-	pluginExtensions[0].setId("first");
-	pluginExtensions[0].setExtensionPoint("abc1.firstExtPt");
-	pluginExtensions[1].setName("Second Extension");
-	pluginExtensions[1].setId("second");
-	pluginExtensions[1].setExtensionPoint("abc1.secondExtPt");
-	pluginExtensions[2].setName("Third Extension");
-	pluginExtensions[2].setId("third");
-	pluginExtensions[2].setExtensionPoint("abc1.thirdExtPt");
-	pluginExtensions[3].setName("Fourth Extension");
-	pluginExtensions[3].setId("fourth");
-	pluginExtensions[3].setExtensionPoint("abc2.anotherExtPt");
-	plugin.setDeclaredExtensions(pluginExtensions);
-
-	ExtensionPoint[] pluginExtensionPoints = new ExtensionPoint[3];
-	for (int i = 0; i < pluginExtensionPoints.length; i++) {
-		pluginExtensionPoints[i] = new ExtensionPoint();
-	}
-	pluginExtensionPoints[0].setName("First Extension Point");
-	pluginExtensionPoints[0].setId("firstExtPt");
-	pluginExtensionPoints[1].setName("Second Extension Point");
-	pluginExtensionPoints[1].setId("secondExtPt");
-	pluginExtensionPoints[2].setName("Third Extension Point");
-	pluginExtensionPoints[2].setId("thirdExtPt");
-	plugin.setDeclaredExtensionPoints(pluginExtensionPoints);
-
-	pluginList[0] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test2");
-	plugin.setId("abc2");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginExtensionPoints = new ExtensionPoint[1];
-	for (int i = 0; i < pluginExtensionPoints.length; i++) {
-		pluginExtensionPoints[i] = new ExtensionPoint();
-	}
-	pluginExtensionPoints[0].setName("Another Extension Point");
-	pluginExtensionPoints[0].setId("anotherExtPt");
-	plugin.setDeclaredExtensionPoints(pluginExtensionPoints);
-
-	pluginList[1] = plugin;
-
-	ByteArrayOutputStream fs;
-	String[] localXMLFiles = new String[2];
-	for (int i = 0; i < pluginList.length; i++) {
-		fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginDescriptor(pluginList[i], w, 0);
-		w.flush();
-		w.close();
-
-		localXMLFiles[i] = fs.toString();
-	}
-	return localXMLFiles;
-}
-/*  extExtPtLinkTest
- *  Tests to ensure that extensions and extension points are linked correctly
- *  at registry resolve time.
- */
-public void extExtPtLinkTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = extExtPtLinkSetup();
-	registry = doParsing(factory, localXMLFiles);
-	registry.resolve(true, true);
-
-	// Check both the read-only accessors and the read-write accessors
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-	IPluginDescriptor[] ROPluginList = registry.getPluginDescriptors();
-
-	// First check to make sure we got something back
-	assertNotNull("1.1 Sane return value", pluginList);
-	assertNotNull("1.2 Sane plugin descriptor", pluginList[0]);
-	assertNotNull("1.3 Sane return value", ROPluginList);
-	assertNotNull("1.4 Sane plugin descriptor", ROPluginList[0]);
-	PluginDescriptorModel plugin1 = registry.getPlugin("abc1");
-	IPluginDescriptor ROplugin1 = registry.getPluginDescriptor("abc1");
-	PluginDescriptorModel plugin2 = registry.getPlugin("abc2");
-	IPluginDescriptor ROplugin2 = registry.getPluginDescriptor("abc2");
-	assertNotNull("1.5 Can't find plugin", plugin1);
-	assertNotNull("1.6 Can't find read only plugin", ROplugin1);
-	assertNotNull("1.7 Can't find plugin", plugin2);
-	assertNotNull("1.8 Can't find read only plugin", ROplugin2);
-
-	// All of the extensions are in the abc1 plugin.  The abc2 plugin just
-	// contained one of the extension points.
-	ExtensionPointModel[] extensionPtList = plugin1.getDeclaredExtensionPoints();
-	IExtensionPoint[] ROExtensionPtList = ROplugin1.getExtensionPoints();
-	assertNotNull("2.1 Extension point list null", extensionPtList);
-	assertNotNull("2.2 Extension point list null", ROExtensionPtList);
-	assertEquals("2.3 Extension point list length", extensionPtList.length, 3);
-	assertEquals("2.4 Extension point list length", ROExtensionPtList.length, 3);
-
-	String pluginId = plugin1.getId();
-	// Just check that the 'point' of the extension, matches the pluginId.extensionPointId
-	// pair for this particular extension point
-	for (int i = 0; i < extensionPtList.length; i++) {
-		ExtensionModel[] extension = extensionPtList[i].getDeclaredExtensions();
-		IExtension[] ROExtension = ROExtensionPtList[i].getExtensions();
-		assertEquals("3.1." + i + " Extension length", extension.length, 1);
-		assertEquals("3.2." + i + " Extension length", ROExtension.length, 1);
-		assertEquals("3.3." + i + " Ids match", pluginId + "." + extensionPtList[i].getId(), extension[0].getExtensionPoint());
-		assertEquals("3.4." + i + " Ids match", pluginId + "." + ROExtensionPtList[i].getSimpleIdentifier(), ROExtension[0].getExtensionPointUniqueIdentifier());
-	}
-	
-	// Now repeat for the second plugin
-	extensionPtList = plugin2.getDeclaredExtensionPoints();
-	ROExtensionPtList = ROplugin2.getExtensionPoints();
-	assertNotNull("4.1 Extension point list null", extensionPtList);
-	assertNotNull("4.2 Extension point list null", ROExtensionPtList);
-	assertEquals("4.3 Extension point list length", extensionPtList.length, 1);
-	assertEquals("4.4 Extension point list length", ROExtensionPtList.length, 1);
-	
-	pluginId = plugin2.getId();
-	for (int i = 0; i < extensionPtList.length; i++) {
-		ExtensionModel[] extension = extensionPtList[i].getDeclaredExtensions();
-		IExtension[] ROExtension = ROExtensionPtList[i].getExtensions();
-		assertEquals("5.1." + i + " Extension length", extension.length, 1);
-		assertEquals("5.2." + i + " Extension length", ROExtension.length, 1);
-		assertEquals("5.3." + i + " Ids match", pluginId + "." + extensionPtList[i].getId(), extension[0].getExtensionPoint());
-		assertEquals("5.4." + i + " Ids match", pluginId + "." + ROExtensionPtList[i].getSimpleIdentifier(), ROExtension[0].getExtensionPointUniqueIdentifier());
-	}
-
-	factory = null;
-}
-public String[] librarySetup() {
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	Library[] pluginRuntime = new Library[2];
-	for (int i = 0; i < pluginRuntime.length; i++) {
-		pluginRuntime[i] = new Library();
-	}
-	pluginRuntime[0].setName("runtime.jar");
-	String[] exportString = { "*" };
-	pluginRuntime[0].setExports(exportString);
-	pluginRuntime[1].setName("xerces.jar");
-	plugin.setRuntime(pluginRuntime);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  libraryTest
- *  Tests to ensure we create library entries and populate them correctly.
- */
-public void libraryTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = librarySetup();
-	registry = doParsing(factory, localXMLFiles);
-
-	// Check both the read-only accessors and the read-write accessors
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-	IPluginDescriptor[] ROPluginList = registry.getPluginDescriptors();
-
-	// First check to make sure we got something back
-	assertNotNull("1.1 Sane return value", pluginList);
-	assertNotNull("1.2 Sane plugin descriptor", pluginList[0]);
-	assertNotNull("1.3 Sane return value", ROPluginList);
-	assertNotNull("1.4 Sane plugin descriptor", ROPluginList[0]);
-
-	// Now check that the plugin we got really reflects what's in the xml stream
-	assertEquals("2.1 Plugin Name", plugin.getName(), pluginList[0].getName());
-	assertEquals("2.2 Plugin Id", plugin.getId(), pluginList[0].getId());
-	assertEquals("2.3 Plugin Vendor Name", plugin.getProviderName(), pluginList[0].getProviderName());
-	assertEquals("2.4 Plugin Version", plugin.getVersion(), pluginList[0].getVersion());
-	assertNull("2.5 Plugin Class", pluginList[0].getPluginClass());
-	assertNull("2.6 Requires List", pluginList[0].getRequires());
-	assertNull("2.7 Extension Points List", pluginList[0].getDeclaredExtensionPoints());
-	assertNull("2.8 Extensions List", pluginList[0].getDeclaredExtensions());
-	assertEquals("2.9 Registry", pluginList[0].getRegistry(), registry);
-	assertNull("2.10 Plugin Location", pluginList[0].getLocation());
-
-	// Do the same checks but for the read-only accessors
-	assertEquals("3.1 Plugin Name", plugin.getName(), ROPluginList[0].getLabel());
-	assertEquals("3.2 Plugin Id", plugin.getId(), ROPluginList[0].getUniqueIdentifier());
-	assertEquals("3.3 Plugin Vendor Name", plugin.getProviderName(), ROPluginList[0].getProviderName());
-	assertEquals("3.4 Plugin Version", plugin.getVersionIdentifier(), ROPluginList[0].getVersionIdentifier());
-//	assertNotNull("3.5 Plugin Class Loader", ROPluginList[0].getPluginClassLoader());
-	assertEquals("3.6 Requires List", ROPluginList[0].getPluginPrerequisites().length, 0);
-	assertEquals("3.7 Extension Points List", ROPluginList[0].getExtensionPoints().length, 0);
-	assertEquals("3.8 Extensions List", ROPluginList[0].getExtensions().length, 0);
-	assertNotNull("3.9 Plugin Intall URL", ROPluginList[0].getInstallURL());
-
-	// Now check the library elements
-	LibraryModel[] libList = pluginList[0].getRuntime();
-	ILibrary[] ROLibList = ROPluginList[0].getRuntimeLibraries();
-	assertNotNull("4.1 Library list null", libList);
-	assertEquals("4.2 Number of library elements", libList.length, 2);
-	assertNotNull("4.3 Library list null", ROLibList);
-	assertEquals("4.4 Number of library elements", ROLibList.length, 2);
-
-	LibraryModel[] originalLibList = plugin.getRuntime();
-	String[] exportList = null;
-
-	// Make sure the values in this library element are correct
-	assertEquals("5.1 Library name", libList[0].getName(), originalLibList[0].getName());
-	assertTrue("5.2 Export list", libList[0].isExported());
-	assertTrue("5.3 Fully exported list", libList[0].isFullyExported());
-	assertNotNull("5.4 Export mask", exportList = libList[0].getExports());
-	assertEquals("5.5 Number of export elements", exportList.length, 1);
-	assertEquals("5.6 Export list value", exportList[0], originalLibList[0].getExports()[0]);
-
-	// And check the 2nd library element too
-	assertEquals("6.1 Library name", libList[1].getName(), originalLibList[1].getName());
-	assertTrue("6.2 Export list", !libList[1].isExported());
-	assertTrue("6.3 Fully exported list", !libList[1].isFullyExported());
-	assertNull("6.4 Export mask", libList[1].getExports());
-
-	// Repeat the above tests for the read-only accessors
-	// Make sure the values in this library element are correct
-	assertEquals("7.1 Library name", ROLibList[0].getPath().toString(), originalLibList[0].getName());
-	assertTrue("7.2 Export list", ROLibList[0].isExported());
-	assertTrue("7.3 Fully exported list", ROLibList[0].isFullyExported());
-	// You will get null here because this is a fully exported library
-	assertNull("7.4 Export mask", exportList = ROLibList[0].getContentFilters());
-
-	// And check the 2nd library element too
-	assertEquals("8.1 Library name", ROLibList[1].getPath().toString(), originalLibList[1].getName());
-	assertTrue("8.2 Export list", !ROLibList[1].isExported());
-	assertTrue("8.3 Fully exported list", !ROLibList[1].isFullyExported());
-	assertNull("8.4 Export mask", ROLibList[1].getContentFilters());
-
-	factory = null;
-}
-public String[] pluginSetup() {
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  pluginTest
- *  This is a very basic test to make sure we are parsing a very
- *  simple XML file and populating a plugin descriptor correctly
- */
-public void pluginTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = pluginSetup();
-	registry = doParsing(factory, localXMLFiles);
-
-	// Check both the read-only accessors and the read-write accessors
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-	IPluginDescriptor[] ROPluginList = registry.getPluginDescriptors();
-
-	// First check to make sure we got something back
-	assertNotNull("1.1 Sane return value", pluginList);
-	assertNotNull("1.2 Sane plugin descriptor", pluginList[0]);
-
-	// Now check that the plugin we got really reflects what's in the xml stream
-	assertEquals("2.1 Plugin Name", plugin.getName(), pluginList[0].getName());
-	assertEquals("2.2 Plugin Id", plugin.getId(), pluginList[0].getId());
-	assertEquals("2.3 Plugin Vendor Name", plugin.getProviderName(), pluginList[0].getProviderName());
-	assertEquals("2.4 Plugin Version", plugin.getVersion(), pluginList[0].getVersion());
-	assertEquals("2.5 Plugin Class", plugin.getPluginClass(), pluginList[0].getPluginClass());
-	assertNull("2.6 Requires List", pluginList[0].getRequires());
-	assertNull("2.7 Runtime List", pluginList[0].getRuntime());
-	assertNull("2.8 Extension Points List", pluginList[0].getDeclaredExtensionPoints());
-	assertNull("2.9 Extensions List", pluginList[0].getDeclaredExtensions());
-	assertEquals("2.10 Registry", pluginList[0].getRegistry(), registry);
-	assertNull("2.11 Plugin Location", pluginList[0].getLocation());
-
-	// Repeat these tests with the read-only accessors
-	assertEquals("3.1 Plugin Name", plugin.getName(), ROPluginList[0].getLabel());
-	assertEquals("3.2 Plugin Id", plugin.getId(), ROPluginList[0].getUniqueIdentifier());
-	assertEquals("3.3 Plugin Vendor Name", plugin.getProviderName(), ROPluginList[0].getProviderName());
-	assertEquals("3.4 Plugin Version", plugin.getVersionIdentifier(), ROPluginList[0].getVersionIdentifier());
-	//	assertNotNull("3.5 Plugin Class", ROPluginList[0].getPluginClassLoader());
-	assertEquals("3.6 Requires List", ROPluginList[0].getPluginPrerequisites().length, 0);
-	assertEquals("3.7 Runtime List", ROPluginList[0].getRuntimeLibraries().length, 0);
-	assertEquals("3.8 Extension Points List", ROPluginList[0].getExtensionPoints().length, 0);
-	assertEquals("3.9 Extensions List", ROPluginList[0].getExtensions().length, 0);
-	assertNotNull("3.10 Plugin Install URL", ROPluginList[0].getInstallURL());
-
-	factory = null;
-}
-public String[] PR1GBZ0AWSetup1() {
-	PluginDescriptor[] pluginList = new PluginDescriptor[3];
-	for (int i = 0; i < pluginList.length; i++) {
-		pluginList[i] = new PluginDescriptor();
-	}
-	pluginList[0].setName("Top level plugin");
-	pluginList[0].setId("one.two.three");
-	pluginList[0].setVersion("1.0.0");
-	PluginPrerequisite[] pluginRequires = new PluginPrerequisite[1];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("com.ibm.dav4j");
-	pluginList[0].setRequires(pluginRequires);
-
-	pluginList[1].setName("First Circular plugin");
-	pluginList[1].setId("com.ibm.dav4j");
-	pluginList[1].setVersion("1.0.0");
-
-	pluginRequires = new PluginPrerequisite[1];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("a.b.c");
-	pluginList[1].setRequires(pluginRequires);
-
-	pluginList[2].setName("A final test2");
-	pluginList[2].setId("a.b.c");
-
-	pluginRequires = new PluginPrerequisite[1];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("com.ibm.dav4j");
-	pluginList[2].setRequires(pluginRequires);
-	pluginList[2].setVersion("1.0.0");
-
-	ByteArrayOutputStream fs;
-	String[] localXMLFiles = new String[3];
-
-	for (int i = 0; i < pluginList.length; i++) {
-		fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginDescriptor(pluginList[i], w, 0);
-		w.flush();
-		w.close();
-
-		localXMLFiles[i] = fs.toString();
-	}
-	return localXMLFiles;
-}
-public String[] PR1GBZ0AWSetup2() {
-	PluginDescriptor[] pluginList = new PluginDescriptor[2];
-	for (int i = 0; i < pluginList.length; i++) {
-		pluginList[i] = new PluginDescriptor();
-	}
-	pluginList[0].setName("First Circular plugin");
-	pluginList[0].setId("com.ibm.dav4j");
-	pluginList[0].setVersion("1.0.0");
-
-	PluginPrerequisite[] pluginRequires = new PluginPrerequisite[1];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("a.b.c");
-	pluginList[0].setRequires(pluginRequires);
-
-	pluginList[1].setName("A final test2");
-	pluginList[1].setId("a.b.c");
-	pluginList[1].setVersion("1.0.0");
-
-	pluginRequires = new PluginPrerequisite[1];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("com.ibm.dav4j");
-	pluginList[1].setRequires(pluginRequires);
-
-	ByteArrayOutputStream fs;
-	String[] localXMLFiles = new String[2];
-
-	for (int i = 0; i < pluginList.length; i++) {
-		fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginDescriptor(pluginList[i], w, 0);
-		w.flush();
-		w.close();
-
-		localXMLFiles[i] = fs.toString();
-	}
-	return localXMLFiles;
-}
-/*  PR1GBZ0AWTest1
- *  Tests to ensure we have solved this PR.  This PR indicates a stack overflow will occur
- *  if two plugins depend on each other.
- */
-public void PR1GBZ0AWTest1() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = PR1GBZ0AWSetup1();
-	registry = doParsing(factory, localXMLFiles);
-
-	// Check both the read-only accessors and the read-write accessors
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-
-	// First check to make sure we got something back
-	assertNotNull("1.1 Sane return value", pluginList);
-	assertNotNull("1.2 Sane plugin descriptor", pluginList[0]);
-
-	// Now do the resolve.  This is where the stack overflow would occur
-	registry.resolve(true, true);
-
-	// There should be no plugins in the registry
-	pluginList = registry.getPlugins();
-	assertEquals("2.1 Resolve completed", pluginList.length, 0);
-
-	factory = null;
-}
-/*  PR1GBZ0AWTest2
- *  Tests to ensure we have solved this PR.  This PR indicates a stack overflow will occur
- *  if two plugins depend on each other.
- */
-public void PR1GBZ0AWTest2() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = PR1GBZ0AWSetup2();
-	registry = doParsing(factory, localXMLFiles);
-
-	// Check both the read-only accessors and the read-write accessors
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-
-	// First check to make sure we got something back
-	assertNotNull("1.1 Sane return value", pluginList);
-	assertNotNull("1.2 Sane plugin descriptor", pluginList[0]);
-
-	// Now do the resolve.  This is where the stack overflow would occur
-	registry.resolve(true, true);
-
-	// There should be no plugins in the registry
-	pluginList = registry.getPlugins();
-	// DDW **NOTE** This test currently fails
-	// assertEquals("2.1 Resolve completed", pluginList.length, 0);
-
-	factory = null;
-}
-/*  readOnlyConfigurationElement
- *  This method ensures that once the registry is marked as read-only, configuration
- *  elements in the registry cannot be written to.  This method is called as part of
- *  the test readOnlyTest.
- */
-public void readOnlyConfigurationElement(ConfigurationElement subElement) {
-	// Check to ensure we cannot write to the configuration elements
-	assertTrue("7.1 Configuration Element marked", subElement.isReadOnly());
-	// Now check all methods that can write to a ConfigurationElement
-	try {
-		subElement.setName("name");
-		assertTrue("7.2 ConfigurationElement - setName", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		subElement.setParent(new PluginDescriptor());
-		assertTrue("7.3 ConfigurationElement - setParent", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		subElement.setProperties(new ConfigurationPropertyModel[1]);
-		assertTrue("7.4 ConfigurationElement - setProperties", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		subElement.setSubElements(new ConfigurationElementModel[1]);
-		assertTrue("7.5 ConfigurationElement - setSubElements", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		subElement.setValue("value");
-		assertTrue("7.6 ConfigurationElement - setValue", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-}
-/*  readOnlyConfigurationProperty
- *  This method ensures that once the registry is marked as read-only, configuration
- *  property elements in the registry cannot be written to.  This method is called
- *  as part of the test readOnlyTest.
- */
-public void readOnlyConfigurationProperty(ConfigurationProperty property) {
-
-	// Check to ensure we cannot write to the configuration property elements
-	assertTrue("8.1 Configuration Property marked", property.isReadOnly());
-	// Now check all methods that can write to a ConfigurationProperty
-	try {
-		property.setName("name");
-		assertTrue("8.4 ConfigurationProperty - setName", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		property.setValue("value");
-		assertTrue("8.3 ConfigurationProperty - setValue", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-}
-/*  readOnlyExtension
- *  This method ensures that once the registry is marked as read-only, extensions
- *  in the registry cannot be written to.  This method is called as part of the test
- *  readOnlyTest.
- */
-public void readOnlyExtension(Extension extension) {
-	// Check to ensure we cannot write to the extension elements
-	assertTrue("6.1 Extension marked", extension.isReadOnly());
-	// Now check all methods that can write to an Extension
-	try {
-		extension.setName("name");
-		assertTrue("6.2 Plugin - setName", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		extension.setExtensionPoint("extensionPoint");
-		assertTrue("6.3 Extension - setExtensionPoint", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		extension.setId("id");
-		assertTrue("6.4 Extension - setId", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		extension.setParentPluginDescriptor(new PluginDescriptor());
-		assertTrue("6.5 Extension - setParentPluginDescriptor", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		extension.setSubElements(new ConfigurationElementModel[1]);
-		assertTrue("6.6 Extension - setSubElements", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-}
-/*  readOnlyExtensionPoints
- *  This method ensures that once the registry is marked as read-only, extension
- *  points in the registry cannot be written to.  This method is called as part
- *  of the test readOnlyTest.
- */
-public void readOnlyExtensionPoint(ExtensionPoint extensionPoint) {
-	// Check to ensure we cannot write to the extension point elements
-	assertTrue("5.1 Extension Point marked", extensionPoint.isReadOnly());
-	// Now check all methods that can write to an ExtensionPoint
-	try {
-		extensionPoint.setName("name");
-		assertTrue("5.2 Plugin - setName", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		extensionPoint.setDeclaredExtensions(new ExtensionModel[1]);
-		assertTrue("5.3 Extension Point - setDeclaredExtensions", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		extensionPoint.setId("id");
-		assertTrue("5.4 Extension Point - setId", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		extensionPoint.setParentPluginDescriptor(new PluginDescriptor());
-		assertTrue("5.5 Extension Point - setParentPluginDescriptor", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		extensionPoint.setSchema("schema");
-		assertTrue("5.6 Extension Point - setSchema", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-}
-/*  readOnlyLibrary
- *  This method ensures that once the registry is marked as read-only, library
- *  elements in the registry cannot be written to.  This method is called as
- *  part of the test readOnlyTest.
- */
-public void readOnlyLibrary(Library library) {
-
-	// Now check all methods that can write to a Library
-	assertTrue("4.1 Library marked", library.isReadOnly());
-	try {
-		library.setName("name");
-		assertTrue("4.2 Plugin - setName", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		library.setExports(new String[1]);
-		assertTrue("4.3 Library - setExports", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-
-}
-/*  readOnlyPlugin
- *  This method ensures that once the registry is marked as read-only, plugin 
- *  descriptor elements in the registry cannot be written to.  This method is
- *  called in the test readOnlyTest.
- */
-public void readOnlyPlugin(PluginDescriptor plugin) {
-	// Check to ensure we cannot write to this plugin
-	assertTrue("3.1 Plugin marked", plugin.isReadOnly());
-	// Now check all methods that can write to a PluginDescriptor
-	try {
-		plugin.setName("name");
-		assertTrue("3.2 Plugin - setName", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		plugin.setDeclaredExtensionPoints(new ExtensionPointModel[1]);
-		assertTrue("3.3 Plugin - setDeclaredExtensionPoints", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		plugin.setDeclaredExtensions(new ExtensionModel[1]);
-		assertTrue("3.4 Plugin - setDeclaredExtensions", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		plugin.setId("id");
-		assertTrue("3.5 Plugin - setId", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		plugin.setLocation("location");
-		assertTrue("3.6 Plugin - setLocation", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		plugin.setPluginClass("pluginClass");
-		assertTrue("3.7 Plugin - setPluginClass", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		plugin.setRegistry(new PluginRegistry());
-		assertTrue("3.8 Plugin - setRegistry", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		plugin.setRequires(new PluginPrerequisiteModel[1]);
-		assertTrue("3.9 Plugin - setRequires", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		plugin.setRuntime(new LibraryModel[1]);
-		assertTrue("3.10 Plugin - setRuntime", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		plugin.setProviderName("providerName");
-		assertTrue("3.11 Plugin - setVendorName", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		plugin.setVersion("version");
-		assertTrue("3.12 Plugin - setVersion", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-}
-/*  readOnlyRegistry
- *  This method ensures that once the registry is marked as read-only, registry
- *  elements cannot be written to.  This method is called from the test readOnlyTest
- */
-public void readOnlyRegistry(PluginRegistry registry) {
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-	// Check to ensure we cannot write to the registry
-	assertTrue("2.1 Registry marked", registry.isReadOnly());
-	// Now check all methods that can write to a PluginRegistry
-	try {
-		registry.addPlugin(pluginList[0]);
-		assertTrue("2.2 PluginRegistry - addPlugin", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		registry.removePlugin(pluginList[0].getId(), pluginList[0].getVersion());
-		assertTrue("2.3 PluginRegistry - removePlugin", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-	try {
-		registry.removePlugins(pluginList[0].getId());
-		assertTrue("2.4 PluginRegistry - removePlugins", false);
-	} catch (RuntimeException runExcept) {
-		// catch intentionally left blank.  We do get here
-		// but want to continue execution
-	}
-}
-public String[] readOnlySetup() {
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	PluginPrerequisite[] pluginRequires = new PluginPrerequisite[1];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("com.ibm.eclipse.core.runtime");
-	plugin.setRequires(pluginRequires);
-
-	Library[] pluginRuntime = new Library[1];
-	for (int i = 0; i < pluginRuntime.length; i++) {
-		pluginRuntime[i] = new Library();
-	}
-	pluginRuntime[0].setName("runtime.jar");
-	plugin.setRuntime(pluginRuntime);
-
-	Extension[] pluginExtensions = new Extension[1];
-	for (int i = 0; i < pluginExtensions.length; i++) {
-		pluginExtensions[i] = new Extension();
-		pluginExtensions[i].setParentPluginDescriptor(plugin);
-	}
-	pluginExtensions[0].setName("First Extension");
-	plugin.setDeclaredExtensions(pluginExtensions);
-	ConfigurationElement[] subElements = new ConfigurationElement[1];
-	for (int i = 0; i < subElements.length; i++) {
-		subElements[i] = new ConfigurationElement();
-		subElements[i].setParent(pluginExtensions[0]);
-	}
-	subElements[0].setName("FirstSubelement");
-	ConfigurationProperty[] properties = new ConfigurationProperty[1];
-	for (int i = 0; i < properties.length; i++) {
-		properties[i] = new ConfigurationProperty();
-	}
-	properties[0].setName("FirstProperty");
-	properties[0].setValue("FirstValue");
-	subElements[0].setProperties(properties);
-	pluginExtensions[0].setSubElements(subElements);
-
-	ExtensionPoint[] pluginExtensionPoints = new ExtensionPoint[1];
-	for (int i = 0; i < pluginExtensionPoints.length; i++) {
-		pluginExtensionPoints[i] = new ExtensionPoint();
-	}
-	pluginExtensionPoints[0].setName("First Extension Point");
-	plugin.setDeclaredExtensionPoints(pluginExtensionPoints);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  readOnlyTest
- *  This test ensures that once the registry is marked as read-only, elements
- *  in the registry cannot be written to
- */
-public void readOnlyTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = readOnlySetup();
-	registry = doParsing(factory, localXMLFiles);
-
-	// Mark the registry as readonly.  This should filter down to all elements
-	// in the registry too.
-	registry.markReadOnly();
-
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-
-	// First check to make sure we got something back
-	assertNotNull("1.1 Sane return value", pluginList);
-	assertNotNull("1.2 Sane plugin descriptor", pluginList[0]);
-
-	// Check to ensure we cannot write to the registry
-	readOnlyRegistry(registry);
-
-	// Check to ensure we cannot write to this plugin
-	readOnlyPlugin((PluginDescriptor) pluginList[0]);
-
-	// Check to ensure we cannot write to the runtime elements
-	LibraryModel[] libraries = pluginList[0].getRuntime();
-	readOnlyLibrary((Library) libraries[0]);
-
-	// Check to ensure we cannot write to the extension point elements
-	ExtensionPointModel[] extensionPoints = pluginList[0].getDeclaredExtensionPoints();
-	readOnlyExtensionPoint((ExtensionPoint) extensionPoints[0]);
-
-	// Check to ensure we cannot write to the extension elements
-	ExtensionModel[] extensions = pluginList[0].getDeclaredExtensions();
-	readOnlyExtension((Extension) extensions[0]);
-
-	// Check to ensure we cannot write to the configuration elements
-	ConfigurationElementModel[] subElements = extensions[0].getSubElements();
-	readOnlyConfigurationElement((ConfigurationElement) subElements[0]);
-
-	// Check to ensure we cannot write to the configuration property elements
-	ConfigurationPropertyModel[] properties = subElements[0].getProperties();
-	readOnlyConfigurationProperty((ConfigurationProperty) properties[0]);
-
-	factory = null;
-}
-public String[] registrySetup() {
-	PluginDescriptor[] pluginList = new PluginDescriptor[5];
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginList[0] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("3.0");
-	pluginList[1] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("2.0");
-	pluginList[2] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A Different Name");
-	plugin.setId("newId");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginList[3] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A third name");
-	plugin.setId("thirdId");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginList[4] = plugin;
-
-	String[] localXMLFiles = new String[pluginList.length];
-	for (int i = 0; i < pluginList.length; i++) {
-		ByteArrayOutputStream fs;
-		fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginDescriptor(pluginList[i], w, 0);
-		w.flush();
-		w.close();
-
-		localXMLFiles[i] = fs.toString();
-	}
-
-	return localXMLFiles;
-}
-/*  registryTest
- *  Tests to ensure we create plugin registries and populate them correctly.
- */
-public void registryTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = registrySetup();
-	registry = doParsing(factory, localXMLFiles);
-
-	// Check both the read-only accessors and the read-write accessors
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-	IPluginDescriptor[] ROPluginList = registry.getPluginDescriptors();
-
-	// First check to make sure we got something back
-	assertNotNull("1.1 Sane return value", pluginList);
-	assertNotNull("1.2 Sane plugin descriptor", pluginList[0]);
-	assertEquals("1.3 Right number of plugin descriptors", pluginList.length, localXMLFiles.length);
-	assertNotNull("1.4 Sane return value", ROPluginList);
-	assertNotNull("1.5 Sane plugin descriptor", ROPluginList[0]);
-	assertEquals("1.6 Right number of plugin descriptors", ROPluginList.length, localXMLFiles.length);
-
-	factory = null;
-}
-public String[] requiresSetup() {
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	PluginPrerequisite[] pluginRequires = new PluginPrerequisite[5];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("com.ibm.eclipse.core.runtime");
-	pluginRequires[0].setVersion("4");
-	pluginRequires[0].setExport(true);
-	pluginRequires[0].setMatchByte(PluginPrerequisiteModel.PREREQ_MATCH_GREATER_OR_EQUAL);
-	pluginRequires[1].setPlugin("org.apache.xerces");
-	pluginRequires[2].setPlugin("com.ibm.eclipse.core.resources");
-	pluginRequires[2].setVersion("3");
-	pluginRequires[2].setMatchByte(PluginPrerequisiteModel.PREREQ_MATCH_COMPATIBLE);
-	pluginRequires[3].setPlugin("anotherPlugin");
-	pluginRequires[3].setVersion("1.0.0");
-	pluginRequires[3].setMatchByte(PluginPrerequisiteModel.PREREQ_MATCH_EQUIVALENT);
-	pluginRequires[4].setPlugin("fifthPlugin");
-	pluginRequires[4].setVersion("2.0.1");
-	pluginRequires[4].setMatchByte(PluginPrerequisiteModel.PREREQ_MATCH_PERFECT);
-	plugin.setRequires(pluginRequires);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  requiresTest
- *  Tests to ensure we create plugin prerequisite entries and populate them correctly.
- */
-public void requiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = requiresSetup();
-	registry = doParsing(factory, localXMLFiles);
-
-	// Check both the read-only accessors and the read-write accessors
-	PluginDescriptorModel[] pluginList = registry.getPlugins();
-	IPluginDescriptor[] ROPluginList = registry.getPluginDescriptors();
-
-	// First check to make sure we got something back
-	assertNotNull("1.1 Sane return value", pluginList);
-	assertNotNull("1.2 Sane plugin descriptor", pluginList[0]);
-	assertNotNull("1.3 Sane return value", ROPluginList);
-	assertNotNull("1.4 Sane plugin descriptor", ROPluginList[0]);
-
-	// Now check that the plugin we got really reflects what's in the xml stream
-	assertEquals("2.1 Plugin Name", plugin.getName(), pluginList[0].getName());
-	assertEquals("2.2 Plugin Id", plugin.getId(), pluginList[0].getId());
-	assertEquals("2.3 Plugin Vendor Name", plugin.getProviderName(), pluginList[0].getProviderName());
-	assertEquals("2.4 Plugin Version", plugin.getVersion(), pluginList[0].getVersion());
-	assertNull("2.5 Plugin Class", pluginList[0].getPluginClass());
-	assertNull("2.6 Runtime List", pluginList[0].getRuntime());
-	assertNull("2.7 Extension Points List", pluginList[0].getDeclaredExtensionPoints());
-	assertNull("2.8 Extensions List", pluginList[0].getDeclaredExtensions());
-	assertEquals("2.9 Registry", pluginList[0].getRegistry(), registry);
-	assertNull("2.10 Plugin Location", pluginList[0].getLocation());
-
-	// Repeat for read-only accessors
-	assertEquals("3.1 Plugin Name", plugin.getName(), ROPluginList[0].getLabel());
-	assertEquals("3.2 Plugin Id", plugin.getId(), ROPluginList[0].getUniqueIdentifier());
-	assertEquals("3.3 Plugin Vendor Name", plugin.getProviderName(), ROPluginList[0].getProviderName());
-	assertEquals("3.4 Plugin Version", plugin.getVersionIdentifier(), ROPluginList[0].getVersionIdentifier());
-//	assertNotNull("3.5 Plugin Class", ROPluginList[0].getPluginClassLoader());
-	assertEquals("3.6 Runtime List", ROPluginList[0].getRuntimeLibraries().length, 0);
-	assertEquals("3.7 Extension Points List", ROPluginList[0].getExtensionPoints().length, 0);
-	assertEquals("3.8 Extensions List", ROPluginList[0].getExtensions().length, 0);
-	assertNotNull("3.9 Plugin Install URL", ROPluginList[0].getInstallURL());
-
-	// Now check the plugin prerequisite elements
-	PluginPrerequisiteModel[] reqList = pluginList[0].getRequires();
-	IPluginPrerequisite[] ROReqList = ROPluginList[0].getPluginPrerequisites();
-	assertNotNull("4.1 Requires list null", reqList);
-	assertEquals("4.2 Number of requires elements", reqList.length, 5);
-	assertNotNull("4.3 Requires list null", ROReqList);
-	assertEquals("4.4 Number of requires elements", ROReqList.length, 5);
-
-	PluginPrerequisiteModel[] originalRequires = plugin.getRequires();
-
-	// Make sure the values in this requires element are correct
-	assertEquals("5.1 Requires plugin", reqList[0].getPlugin(), originalRequires[0].getPlugin());
-	assertEquals("5.2 Requires version", reqList[0].getVersion(), originalRequires[0].getVersion());
-	assertEquals("5.3 Requires exact match", reqList[0].getMatchByte(), originalRequires[0].getMatchByte());
-	assertTrue("5.4 Requires export", reqList[0].getExport());
-	assertEquals("5.5 Requires plugin", ROReqList[0].getUniqueIdentifier(), originalRequires[0].getPlugin());
-	assertEquals("5.6 Requires version", ROReqList[0].getVersionIdentifier(), ((PluginPrerequisite) originalRequires[0]).getVersionIdentifier());
-	assertTrue("5.7 Requires greater or equal match", ROReqList[0].isMatchedAsGreaterOrEqual());
-	assertTrue("5.8 Requires greater or equal match (compatible)", !ROReqList[0].isMatchedAsCompatible());
-	assertTrue("5.9 Requires greater or equal match (equivalent)", !ROReqList[0].isMatchedAsEquivalent());
-	assertTrue("5.10 Requires greater or equal match (prefect)", !ROReqList[0].isMatchedAsPerfect());
-	assertTrue("5.11 Requires export", ROReqList[0].isExported());
-
-	// And check the 2nd requires element too
-	assertEquals("6.1 Requires plugin", reqList[1].getPlugin(), originalRequires[1].getPlugin());
-	assertEquals("6.2 Requires plugin", ROReqList[1].getUniqueIdentifier(), originalRequires[1].getPlugin());
-	assertEquals("6.3 Requires exact match", reqList[1].getMatchByte(), originalRequires[1].getMatchByte());
-	assertTrue("6.4 Requires unspecified match (greater or equal)", !ROReqList[1].isMatchedAsGreaterOrEqual());
-	assertTrue("6.5 Requires unspecified match (compatible)", !ROReqList[1].isMatchedAsCompatible());
-	assertTrue("6.6 Requires unspecified match (equivalent)", !ROReqList[1].isMatchedAsEquivalent());
-	assertTrue("6.7 Requires unspecified match (prefect)", !ROReqList[1].isMatchedAsPerfect());
-
-	// And the 3rd requires element
-	assertEquals("7.1 Requires plugin", reqList[2].getPlugin(), originalRequires[2].getPlugin());
-	assertEquals("7.2 Requires version", reqList[2].getVersion(), originalRequires[2].getVersion());
-	assertEquals("7.3 Requires compatible match", reqList[2].getMatchByte(), PluginPrerequisiteModel.PREREQ_MATCH_COMPATIBLE);
-	assertTrue("7.4 Requires export", !reqList[2].getExport());
-	assertEquals("7.5 Requires plugin", ROReqList[2].getUniqueIdentifier(), originalRequires[2].getPlugin());
-	assertEquals("7.6 Requires version", ROReqList[2].getVersionIdentifier(), ((PluginPrerequisite) originalRequires[2]).getVersionIdentifier());
-	assertTrue("7.7 Requires compatible match", ROReqList[2].isMatchedAsCompatible());
-	assertTrue("7.8 Requires compatible match (greater or equal)", !ROReqList[2].isMatchedAsGreaterOrEqual());
-	assertTrue("7.9 Requires compatible match (equivalent)", !ROReqList[2].isMatchedAsEquivalent());
-	assertTrue("7.10 Requires compatible match (prefect)", !ROReqList[2].isMatchedAsPerfect());
-	assertTrue("7.11 Requires export", !ROReqList[2].isExported());
-
-	// And the 4th requires element
-	assertEquals("8.1 Requires plugin", reqList[3].getPlugin(), originalRequires[3].getPlugin());
-	assertEquals("8.2 Requires version", reqList[3].getVersion(), originalRequires[3].getVersion());
-	assertEquals("8.3 Requires equivalent match", reqList[3].getMatchByte(), PluginPrerequisiteModel.PREREQ_MATCH_EQUIVALENT);
-	assertTrue("8.4 Requires export", !reqList[3].getExport());
-	assertEquals("8.5 Requires plugin", ROReqList[3].getUniqueIdentifier(), originalRequires[3].getPlugin());
-	assertEquals("8.6 Requires version", ROReqList[3].getVersionIdentifier(), ((PluginPrerequisite) originalRequires[3]).getVersionIdentifier());
-	assertTrue("8.7 Requires equivalent match", ROReqList[3].isMatchedAsEquivalent());
-	assertTrue("8.8 Requires equivalent match (greater or equal)", !ROReqList[3].isMatchedAsGreaterOrEqual());
-	assertTrue("8.9 Requires equivalent match (compatible)", !ROReqList[3].isMatchedAsCompatible());
-	assertTrue("8.10 Requires equivalent match (prefect)", !ROReqList[3].isMatchedAsPerfect());
-	assertTrue("8.11 Requires export", !ROReqList[3].isExported());
-
-	// And the 5th and final requires element
-	assertEquals("7.1 Requires plugin", reqList[4].getPlugin(), originalRequires[4].getPlugin());
-	assertEquals("7.2 Requires version", reqList[4].getVersion(), originalRequires[4].getVersion());
-	assertEquals("7.3 Requires perfect match", reqList[4].getMatchByte(), PluginPrerequisiteModel.PREREQ_MATCH_PERFECT);
-	assertTrue("7.4 Requires export", !reqList[4].getExport());
-	assertEquals("7.5 Requires plugin", ROReqList[4].getUniqueIdentifier(), originalRequires[4].getPlugin());
-	assertEquals("7.6 Requires version", ROReqList[4].getVersionIdentifier(), ((PluginPrerequisite) originalRequires[4]).getVersionIdentifier());
-	assertTrue("7.7 Requires perfect match", ROReqList[4].isMatchedAsPerfect());
-	assertTrue("7.8 Requires perfect match (greater or equal)", !ROReqList[4].isMatchedAsGreaterOrEqual());
-	assertTrue("7.9 Requires perfect match (compatible)", !ROReqList[4].isMatchedAsCompatible());
-	assertTrue("7.10 Requires perfect match (equivalent)", !ROReqList[4].isMatchedAsEquivalent());
-	assertTrue("7.11 Requires export", !ROReqList[4].isExported());
-
-	factory = null;
-}
-public String[][] pluginRequiresSetup() {
-	ByteArrayOutputStream fs;
-	PrintWriter w;
-	RegistryWriter regWriter;
-	String[][] localXMLFiles = new String[3][1];
-	
-	// Create a plugin with no name
-	plugin = new PluginDescriptor();
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	plugin.setPluginClass("someclass");
-
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0][0] = fs.toString();
-	
-	// Create a plugin with no id
-	plugin = new PluginDescriptor();
-	plugin.setName("someName");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	plugin.setPluginClass("someclass");
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[1][0] = fs.toString();
-	
-	// Create a plugin with no version
-	plugin = new PluginDescriptor();
-	plugin.setName("someName");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setPluginClass("someclass");
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[2][0] = fs.toString();
-	
-	return localXMLFiles;
-}
-public void allRequiresHelper(InternalFactory factory, String[][] localXMLFiles, String errorPrefix, boolean fragmentTest) {
-	if (localXMLFiles == null)
-		return;
-	String[] currentParseString;
-	for (int i = 0; i < localXMLFiles.length; i++) {
-		// We have made no attempt to create a hierarchy of
-		// plugins for this test.  We have just created a
-		// bunch of plugins, each with a missing 'required'
-		// field.  If we try to create and resolve one registry
-		// with all of these plugins, the resolver will be 
-		// unable to determine a root plugin and will fail.
-		// Therefore, create a separate registry for each plugin
-		// and resolve it separate from the other plugins.
-		currentParseString = localXMLFiles[i];
-		registry = doParsing(factory, currentParseString);
-		// Don't trim the disabled plugins
-		IStatus resolveStatus = registry.resolve(false, true);
-		assertTrue(errorPrefix + ".0." + i + " Resolve - " + resolveStatus.getMessage(), !resolveStatus.isOK());
-	
-		// The plugin should be disabled
-		PluginDescriptorModel[] pluginList = registry.getPlugins();
-		assertNotNull (errorPrefix + ".1." + i + " No plugins", pluginList);
-		assertEquals (errorPrefix + ".2." + i + " Not 1 plugin only", pluginList.length, 1);
-		if (fragmentTest) {
-			// The plugin won't be disabled but it should not have
-			// a fragment.
-			assertNull(errorPrefix + ".3." + i + " Fragment exists", pluginList[0].getFragments());
-		} else {
-			assertTrue(errorPrefix + ".4." + i + " Plugin enabled", !pluginList[0].getEnabled());
-		}
-	}
-}
-/*  allRequiresTest
- *  Test to ensure that plugins, etc. missing any of the required
- *  components are disabled.
- */
-public void allRequiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	String[][] localXMLFiles = pluginRequiresSetup();
-	allRequiresHelper(factory, localXMLFiles, "1", false);
-	localXMLFiles = fragmentRequiresSetup();
-	allRequiresHelper(factory, localXMLFiles, "2", true);
-	localXMLFiles = requiresRequiresSetup();
-	allRequiresHelper(factory, localXMLFiles, "3", false);
-	localXMLFiles = libraryRequiresSetup();
-	allRequiresHelper(factory, localXMLFiles, "4", false);
-	localXMLFiles = extensionRequiresSetup();
-	allRequiresHelper(factory, localXMLFiles, "5", false);
-	localXMLFiles = extensionPointRequiresSetup();
-	allRequiresHelper(factory, localXMLFiles, "6", false);
-}
-public String[][] fragmentRequiresSetup() {
-	FragmentDescriptor fragment;
-	ByteArrayOutputStream fs;
-	PrintWriter w;
-	RegistryWriter regWriter;
-	String[][] localXMLFiles = new String[5][2];
-
-	// Create a fragment with no name
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	fragment = new FragmentDescriptor();
-	fragment.setId("fragmentId");
-	fragment.setVersion("2.2");
-	fragment.setPlugin("com.ibm.dav4j");
-	fragment.setPluginVersion("1.0");
-	fragment.setProviderName("someoneElse");
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0][0] = fs.toString();
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginFragment(fragment, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0][1] = fs.toString();
-	
-	// Create a fragment with no id
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	fragment = new FragmentDescriptor();
-	fragment.setName("fragmentName");
-	fragment.setVersion("2.2");
-	fragment.setPlugin("com.ibm.dav4j");
-	fragment.setPluginVersion("1.0");
-	fragment.setProviderName("someoneElse");
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[1][0] = fs.toString();
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginFragment(fragment, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[1][1] = fs.toString();
-	
-	// Create a fragment with no version
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	fragment = new FragmentDescriptor();
-	fragment.setName("fragmentName");
-	fragment.setId("fragmentId");
-	fragment.setPlugin("com.ibm.dav4j");
-	fragment.setPluginVersion("1.0");
-	fragment.setProviderName("someoneElse");
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[2][0] = fs.toString();
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginFragment(fragment, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[2][1] = fs.toString();
-	
-	// Create a fragment with no plugin
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	fragment = new FragmentDescriptor();
-	fragment.setName("fragmentName");
-	fragment.setId("fragmentId");
-	fragment.setVersion("2.2");
-	fragment.setPluginVersion("1.0");
-	fragment.setProviderName("someoneElse");
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[3][0] = fs.toString();
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginFragment(fragment, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[3][1] = fs.toString();
-	
-	// Create a fragment with no plugin version
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	fragment = new FragmentDescriptor();
-	fragment.setName("fragmentName");
-	fragment.setId("fragmentId");
-	fragment.setVersion("2.2");
-	fragment.setPlugin("com.ibm.dav4j");
-	fragment.setProviderName("someoneElse");
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[4][0] = fs.toString();
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginFragment(fragment, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[4][1] = fs.toString();
-
-	return localXMLFiles;
-}
-public String[][] requiresRequiresSetup() {
-	PluginPrerequisite requires;
-	ByteArrayOutputStream fs;
-	PrintWriter w;
-	RegistryWriter regWriter;
-	String[][] localXMLFiles = new String[1][1];
-	PluginPrerequisite[] requiresList = new PluginPrerequisite[1];
-
-	// Create a prerequisite with no plugin
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	requires = new PluginPrerequisite();
-	requires.setVersion("2.2");
-	requires.setOptional(true);
-	requires.setMatchByte(PluginPrerequisiteModel.PREREQ_MATCH_EQUIVALENT);
-	requires.setExport(true);
-	requiresList[0] = requires;
-	plugin.setRequires(requiresList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0][0] = fs.toString();
-
-	return localXMLFiles;
-}
-public String[][] extensionRequiresSetup() {
-	Extension extension;
-	ByteArrayOutputStream fs;
-	PrintWriter w;
-	RegistryWriter regWriter;
-	String[][] localXMLFiles = new String[1][1];
-	Extension[] extensionList = new Extension[1];
-
-	// Create an extension with no point
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	extension = new Extension();
-	extension.setName("extensionName");
-	extension.setId("extensionId");
-	extensionList[0] = extension;
-	plugin.setDeclaredExtensions(extensionList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0][0] = fs.toString();
-
-	return localXMLFiles;
-}
-public String[][] extensionPointRequiresSetup() {
-	ExtensionPoint extensionPoint;
-	ByteArrayOutputStream fs;
-	PrintWriter w;
-	RegistryWriter regWriter;
-	String[][] localXMLFiles = new String[2][1];
-	ExtensionPoint[] extensionPointList = new ExtensionPoint[1];
-
-	// Create an extension point with no name
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	extensionPoint = new ExtensionPoint();
-	extensionPoint.setId("extensionPointId");
-	extensionPoint.setSchema("schema");
-	extensionPointList[0] = extensionPoint;
-	plugin.setDeclaredExtensionPoints(extensionPointList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0][0] = fs.toString();
-
-	// Create an extension point with no id
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	extensionPoint = new ExtensionPoint();
-	extensionPoint.setName("extensionPointName");
-	extensionPoint.setSchema("schema");
-	extensionPointList = new ExtensionPoint[1];
-	extensionPointList[0] = extensionPoint;
-	plugin.setDeclaredExtensionPoints(extensionPointList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[1][0] = fs.toString();
-
-	return localXMLFiles;
-}
-public String[][] libraryRequiresSetup() {
-	Library library;
-	ByteArrayOutputStream fs;
-	PrintWriter w;
-	RegistryWriter regWriter;
-	String[][] localXMLFiles = new String[1][1];
-	Library[] libraryList = new Library[1];
-
-	// Create a library with no name
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("com.ibm.dav4j");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	library = new Library();
-	String[] exportList = new String[1];
-	String exportString = new String("*");
-	exportList[0] = exportString;
-	library.setExports(exportList);
-	libraryList[0] = library;
-	plugin.setRuntime(libraryList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0][0] = fs.toString();
-
-	return localXMLFiles;
-}
-public String[] softPrerequisite1Setup() {
-	// Create a plugin with one prerequisite which
-	// does not exist.  This should NOT resolve.
-	PluginPrerequisiteModel prerequisite;
-	ByteArrayOutputStream fs;
-	PrintWriter w;
-	RegistryWriter regWriter;
-	String[] localXMLFiles = new String[1];
-	PluginPrerequisiteModel[] prerequisiteList = new PluginPrerequisiteModel[1];
-
-	plugin = new PluginDescriptor();
-	plugin.setName("softPrereq1");
-	plugin.setId("softPrereqId1");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	prerequisite = new PluginPrerequisiteModel();
-	prerequisite.setPlugin("nonExistant");
-	prerequisiteList[0] = prerequisite;
-	plugin.setRequires(prerequisiteList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0] = fs.toString();
-
-	return localXMLFiles;
-}
-public String[] softPrerequisite2Setup() {
-	// Create a plugin with one prerequisite which
-	// has a prerequisite which does not exist.
-	// This should NOT resolve.
-	PluginPrerequisiteModel prerequisite;
-	ByteArrayOutputStream fs;
-	PrintWriter w;
-	RegistryWriter regWriter;
-	String[] localXMLFiles = new String[2];
-	PluginPrerequisiteModel[] prerequisiteList = new PluginPrerequisiteModel[1];
-
-	plugin = new PluginDescriptor();
-	plugin.setName("softPrereq2");
-	plugin.setId("softPrereqId2");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	prerequisite = new PluginPrerequisiteModel();
-	prerequisite.setPlugin("softPrereqExists");
-	prerequisiteList[0] = prerequisite;
-	plugin.setRequires(prerequisiteList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0] = fs.toString();
-
-	plugin = new PluginDescriptor();
-	plugin.setName("firstPrereq");
-	plugin.setId("softPrereqExists");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	prerequisite = new PluginPrerequisiteModel();
-	prerequisite.setPlugin("nonExistant");
-	prerequisiteList[0] = prerequisite;
-	plugin.setRequires(prerequisiteList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[1] = fs.toString();
-
-	return localXMLFiles;
-}
-public String[] softPrerequisite3Setup() {
-	// Create a plugin with one prerequisite which
-	// does not exist but which is optional.
-	// This SHOULD resolve.
-	PluginPrerequisiteModel prerequisite;
-	ByteArrayOutputStream fs;
-	PrintWriter w;
-	RegistryWriter regWriter;
-	String[] localXMLFiles = new String[1];
-	PluginPrerequisiteModel[] prerequisiteList = new PluginPrerequisiteModel[1];
-
-	plugin = new PluginDescriptor();
-	plugin.setName("softPrereq3");
-	plugin.setId("softPrereqId3");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	prerequisite = new PluginPrerequisiteModel();
-	prerequisite.setPlugin("nonExistant");
-	prerequisite.setOptional(true);
-	prerequisiteList[0] = prerequisite;
-	plugin.setRequires(prerequisiteList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0] = fs.toString();
-
-	return localXMLFiles;
-}
-public String[] softPrerequisite4Setup() {
-	// Create a plugin with one prerequisite which
-	// has a prerequisite which does not exist but which is
-	// optional.  This SHOULD resolve.
-	PluginPrerequisiteModel prerequisite;
-	ByteArrayOutputStream fs;
-	PrintWriter w;
-	RegistryWriter regWriter;
-	String[] localXMLFiles = new String[2];
-	PluginPrerequisiteModel[] prerequisiteList = new PluginPrerequisiteModel[1];
-
-	plugin = new PluginDescriptor();
-	plugin.setName("softPrereq4");
-	plugin.setId("softPrereqId4");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	prerequisite = new PluginPrerequisiteModel();
-	prerequisite.setPlugin("softPrereqExists");
-	prerequisite.setOptional(true);
-	prerequisiteList[0] = prerequisite;
-	plugin.setRequires(prerequisiteList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[0] = fs.toString();
-
-	plugin = new PluginDescriptor();
-	plugin.setName("firstPrereq");
-	plugin.setId("softPrereqExists");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	prerequisite = new PluginPrerequisiteModel();
-	prerequisite.setPlugin("nonExistant");
-	prerequisite.setOptional(true);
-	prerequisiteList[0] = prerequisite;
-	plugin.setRequires(prerequisiteList);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[1] = fs.toString();
-
-	return localXMLFiles;
-}
-public void allPrerequisiteHelper(InternalFactory factory, String[] localXMLFiles, String errorPrefix, boolean shouldResolve) {
-	if (localXMLFiles == null)
-		return;
-	registry = doParsing(factory, localXMLFiles);
-	IStatus resolveStatus = registry.resolve(true, true);
-	if (shouldResolve) {
-		// This registry should resolve fine.
-		assertTrue(errorPrefix + " Resolve - " + resolveStatus.getMessage(), resolveStatus.isOK());
-	} else {
-		// This registry should NOT resolve
-		assertTrue(errorPrefix + " Resolve worked", !resolveStatus.isOK());
-	}
-	
-}
-public void allPrerequisiteTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	factory = new InternalFactory(problems);
-
-	// One plugin with non-existant prerequisite - not optional
-	String[] localXMLFiles = softPrerequisite1Setup();
-	allPrerequisiteHelper(factory, localXMLFiles, "1", false);
-	// 2 nested plugins with non-existant prereq on one - not optional
-	localXMLFiles = softPrerequisite2Setup();
-	allPrerequisiteHelper(factory, localXMLFiles, "2", false);
-	// 1 plugin with non-existant prereq - optional
-	localXMLFiles = softPrerequisite3Setup();
-	allPrerequisiteHelper(factory, localXMLFiles, "3", true);
-	// 2 nested plugins with non-existant prereq on one - optional
-	localXMLFiles = softPrerequisite4Setup();
-	allPrerequisiteHelper(factory, localXMLFiles, "4", true);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new BasicXMLTest("registryTest"));
-	suite.addTest(new BasicXMLTest("pluginTest"));
-	suite.addTest(new BasicXMLTest("libraryTest"));
-	suite.addTest(new BasicXMLTest("requiresTest"));
-	suite.addTest(new BasicXMLTest("extensionPointTest"));
-	suite.addTest(new BasicXMLTest("extensionTest"));
-	suite.addTest(new BasicXMLTest("readOnlyTest"));
-	suite.addTest(new BasicXMLTest("extExtPtLinkTest"));
-	suite.addTest(new BasicXMLTest("PR1GBZ0AWTest1"));
-	suite.addTest(new BasicXMLTest("PR1GBZ0AWTest2"));
-	suite.addTest(new BasicXMLTest("allRequiresTest"));
-	// suite.addTest(new BasicXMLTest("allPrerequisiteTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/CircularTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/CircularTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/CircularTest.java
deleted file mode 100644
index fad1d45..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/CircularTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-/**
- */
-public class CircularTest extends EclipseWorkspaceTest {
-
-public CircularTest() {
-	super(null);
-}
-public CircularTest(String name) {
-	super(name);
-}
-public void fullCircle() {
-	
-	// Test a situation where there is a circular dependency that
-	// includes the root plugin
-
-	String errorMessage = "Unable to resolve plug-in registry.";
-		
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "circularTestProblems", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPath = new String[2];
-	pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/circular/tests.a.xml");
-	pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/circular/tests.b.xml");
-	URL pluginURLs[] = new URL[2];
-	URL pURL = null;
-	for (int i = 0; i < pluginPath.length; i++) {
-		try {
-			pURL = new URL (pluginPath[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPath[i], true);
-		}
-		pluginURLs[i] = pURL;
-		pURL = null;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("1.0", pluginDescriptors.length, 0);
-	// Now make sure we got some error reporting here
-	assertTrue("1.1 Got the right errors", problems.toString().indexOf(errorMessage) != -1);
-}
-
-public void partCircle() {
-	
-	// Test a situation where there is a circular dependency
-	// just below the root plugin (so the root is not part
-	// of the circle).
-	
-	String errorMessage = "Detected prerequisite loop from tests.a to tests.b.";
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "circularTestProblems", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPath = new String[3];
-	pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/circular/tests.a.xml");
-	pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/circular/tests.b.xml");
-	pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/circular/tests.top.xml");
-	URL pluginURLs[] = new URL[3];
-	URL pURL = null;
-	for (int i = 0; i < pluginPath.length; i++) {
-		try {
-			pURL = new URL (pluginPath[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPath[i], true);
-		}
-		pluginURLs[i] = pURL;
-		pURL = null;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("2.0", pluginDescriptors.length, 0);
-	assertTrue("2.1 Got the right errors", problems.toString().indexOf(errorMessage) != -1);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new CircularTest("fullCircle"));
-	suite.addTest(new CircularTest("partCircle"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_1.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_1.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_1.java
deleted file mode 100644
index 0f116a8..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_1.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class ConflictResolveTest_1 extends PluginResolveTest {
-public ConflictResolveTest_1() {
-	super(null);
-}
-public ConflictResolveTest_1(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("conflictResolveTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/conflictResolve.1/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// look for tests.a - should not exist as it caused the conflict
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 0);
-	
-	// look for tests.b - there should be 0
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 0);
-	
-	// look for tests.c - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-
-	// look for tests.d - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.d");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.d");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.0.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ConflictResolveTest_1("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_2.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_2.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_2.java
deleted file mode 100644
index 1d8cf99..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_2.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class ConflictResolveTest_2 extends PluginResolveTest {
-public ConflictResolveTest_2() {
-	super(null);
-}
-public ConflictResolveTest_2(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("conflictResolveTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/conflictResolve.2/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// look for tests.a - should not exist as it caused the conflict
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 0);
-	
-	// look for tests.b - there should be 0
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 0);
-	
-	// look for tests.c - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-
-	// look for tests.d - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.d");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.d");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.0.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ConflictResolveTest_2("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_3.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_3.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_3.java
deleted file mode 100644
index 9faae4b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_3.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class ConflictResolveTest_3 extends PluginResolveTest {
-public ConflictResolveTest_3() {
-	super(null);
-}
-public ConflictResolveTest_3(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("conflictResolveTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/conflictResolve.3/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 4);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-	
-	// look for tests.c
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-
-	// look for tests.d
-	pluginDescriptors = registry.getPluginDescriptors("tests.d");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.d");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ConflictResolveTest_3("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_4.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_4.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_4.java
deleted file mode 100644
index ac8e79a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_4.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class ConflictResolveTest_4 extends PluginResolveTest {
-public ConflictResolveTest_4() {
-	super(null);
-}
-public ConflictResolveTest_4(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("conflictResolveTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/conflictResolve.4/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 4);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-	
-	// look for tests.c
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-
-	// look for tests.d
-	pluginDescriptors = registry.getPluginDescriptors("tests.d");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.d");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ConflictResolveTest_4("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_5.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_5.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_5.java
deleted file mode 100644
index bedccb8..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_5.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class ConflictResolveTest_5 extends PluginResolveTest {
-public ConflictResolveTest_5() {
-	super(null);
-}
-public ConflictResolveTest_5(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("conflictResolveTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/conflictResolve.5/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 4);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-	
-	// look for tests.c
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-
-	// look for tests.d
-	pluginDescriptors = registry.getPluginDescriptors("tests.d");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.d");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ConflictResolveTest_5("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_6.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_6.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_6.java
deleted file mode 100644
index 7a7849b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_6.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class ConflictResolveTest_6 extends PluginResolveTest {
-public ConflictResolveTest_6() {
-	super(null);
-}
-public ConflictResolveTest_6(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("conflictResolveTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/conflictResolve.6/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 4);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-	
-	// look for tests.c
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-
-	// look for tests.d
-	pluginDescriptors = registry.getPluginDescriptors("tests.d");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.d");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ConflictResolveTest_6("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_7.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_7.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_7.java
deleted file mode 100644
index 076af5b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ConflictResolveTest_7.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class ConflictResolveTest_7 extends PluginResolveTest {
-public ConflictResolveTest_7() {
-	super(null);
-}
-public ConflictResolveTest_7(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("conflictResolveTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/conflictResolve.7/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 6);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-	
-	// look for tests.c
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-
-	// look for tests.d
-	pluginDescriptors = registry.getPluginDescriptors("tests.d");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.d");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	// look for tests.e
-	pluginDescriptors = registry.getPluginDescriptors("tests.e");
-	assertEquals("5.0", pluginDescriptors.length, 1);
-	assertEquals("5.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.e");
-	assertEquals("5.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	// look for tests.f
-	pluginDescriptors = registry.getPluginDescriptors("tests.f");
-	assertEquals("6.0", pluginDescriptors.length, 1);
-	assertEquals("6.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.f");
-	assertEquals("6.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ConflictResolveTest_7("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveFragmentTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveFragmentTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveFragmentTest.java
deleted file mode 100644
index 7ff29d0..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveFragmentTest.java
+++ /dev/null
@@ -1,898 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.runtime.*;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.tests.harness.*;
-import java.io.*;
-import java.net.URL;
-import junit.framework.*;
-import org.xml.sax.*;
-
-public class ExtensiveFragmentTest extends EclipseWorkspaceTest {
-
-public ExtensiveFragmentTest() {
-	super(null);
-}
-
-public ExtensiveFragmentTest(String name) {
-	super(name);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	// test extension points
-	suite.addTest(new ExtensiveFragmentTest("extensionPoint1Test"));
-	suite.addTest(new ExtensiveFragmentTest("extensionPoint2Test"));
-	suite.addTest(new ExtensiveFragmentTest("extensionPoint3Test"));
-	suite.addTest(new ExtensiveFragmentTest("extensionPoint4Test"));
-	suite.addTest(new ExtensiveFragmentTest("extensionPoint5Test"));
-	// test extensions
-	suite.addTest(new ExtensiveFragmentTest("extension1Test"));
-	suite.addTest(new ExtensiveFragmentTest("extension2Test"));
-	suite.addTest(new ExtensiveFragmentTest("extension3Test"));
-	suite.addTest(new ExtensiveFragmentTest("extension4Test"));
-	suite.addTest(new ExtensiveFragmentTest("extension5Test"));
-	// test libraries
-	suite.addTest(new ExtensiveFragmentTest("library1Test"));
-	suite.addTest(new ExtensiveFragmentTest("library2Test"));
-	suite.addTest(new ExtensiveFragmentTest("library3Test"));
-	suite.addTest(new ExtensiveFragmentTest("library4Test"));
-	suite.addTest(new ExtensiveFragmentTest("library5Test"));
-	// test prerequisites
-	suite.addTest(new ExtensiveFragmentTest("requires1Test"));
-	suite.addTest(new ExtensiveFragmentTest("requires2Test"));
-	suite.addTest(new ExtensiveFragmentTest("requires3Test"));
-	suite.addTest(new ExtensiveFragmentTest("requires4Test"));
-	suite.addTest(new ExtensiveFragmentTest("requires5Test"));
-	return suite;
-}
-
-public void extensionPoint1Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/extensionPoint1Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint1Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("1.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("1.1 Got the right plugin", plugin.getId().equals("extensionPoint1Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("1.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("1.3 Got the right fragment", fragment.getId().equals("fragmentExtensionPoint1Test"));
-	
-	// Now make sure we got all 3 extension points
-	ExtensionPointModel[] extPts = plugin.getDeclaredExtensionPoints();
-	assertTrue("1.4 Got 3 extension points", extPts.length == 3);
-	assertNotNull("1.5 Got xpt1 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt1"));
-	assertNotNull("1.6 Got xpt2 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt2"));
-	assertNotNull("1.7 Got xpt3 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt3"));
-}
-
-public void extensionPoint2Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/extensionPoint2Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint2Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("2.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("2.1 Got the right plugin", plugin.getId().equals("extensionPoint2Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("2.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("2.3 Got the right fragment", fragment.getId().equals("fragmentExtensionPoint2Test"));
-	
-	// Now make sure we got 1 extension point
-	ExtensionPointModel[] extPts = plugin.getDeclaredExtensionPoints();
-	assertTrue("2.4 Got 1 extension point", extPts.length == 1);
-	assertNotNull("2.5 Got xpt3 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt3"));
-}
-
-public void extensionPoint3Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/extensionPoint3Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint3Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("3.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("3.1 Got the right plugin", plugin.getId().equals("extensionPoint3Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("3.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("3.3 Got the right fragment", fragment.getId().equals("fragmentExtensionPoint3Test"));
-	
-	// Now make sure we got all 2 extension points
-	ExtensionPointModel[] extPts = plugin.getDeclaredExtensionPoints();
-	assertTrue("3.4 Got 2 extension points", extPts.length == 2);
-	assertNotNull("3.5 Got xpt1 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt1"));
-	assertNotNull("3.6 Got xpt2 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt2"));
-}
-
-public void extensionPoint4Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/extensionPoint4Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint4Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("4.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("4.1 Got the right plugin", plugin.getId().equals("extensionPoint4Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("4.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("4.3 Got the right fragment", fragment.getId().equals("fragmentExtensionPoint4Test"));
-	
-	// Now make sure we got all 2 extension points
-	ExtensionPointModel[] extPts = plugin.getDeclaredExtensionPoints();
-	assertTrue("4.4 Got 2 extension points", extPts.length == 2);
-	assertNotNull("4.5 Got xpt1 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt1"));
-	assertNotNull("4.6 Got xpt3 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt3"));
-}
-
-public void extensionPoint5Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/extensionPoint5Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentExtensionPoint5Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("5.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("5.1 Got the right plugin", plugin.getId().equals("extensionPoint5Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("5.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("5.3 Got the right fragment", fragment.getId().equals("fragmentExtensionPoint5Test"));
-	
-	// Now make sure we got all 8 extension points
-	ExtensionPointModel[] extPts = plugin.getDeclaredExtensionPoints();
-	assertTrue("5.4 Got 8 extension points", extPts.length == 8);
-	assertNotNull("5.5 Got xpt1 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt1"));
-	assertNotNull("5.6 Got xpt2 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt2"));
-	assertNotNull("5.7 Got xpt3 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt3"));
-	assertNotNull("5.8 Got xpt4 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt4"));
-	assertNotNull("5.9 Got xpt5 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt5"));
-	assertNotNull("5.10 Got xpt6 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt6"));
-	assertNotNull("5.11 Got xpt7 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt7"));
-	assertNotNull("5.12 Got xpt8 extension point", ((IPluginDescriptor)plugin).getExtensionPoint("xpt8"));
-}
-
-public void extension1Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/extension1Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentExtension1Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("6.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("6.1 Got the right plugin", plugin.getId().equals("extension1Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("6.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("6.3 Got the right fragment", fragment.getId().equals("fragmentExtension1Test"));
-	
-	// Now make sure we got all 3 extensions
-	ExtensionModel[] extensions = plugin.getDeclaredExtensions();
-	assertTrue("6.4 Got 3 extensions", extensions.length == 3);
-	assertNotNull("6.5 Got xpt1 extension", ((IPluginDescriptor)plugin).getExtension("xpt1"));
-	assertNotNull("6.6 Got xpt2 extension", ((IPluginDescriptor)plugin).getExtension("xpt2"));
-	assertNotNull("6.7 Got xpt3 extension", ((IPluginDescriptor)plugin).getExtension("xpt3"));
-}
-
-public void extension2Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/extension2Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentExtension2Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("7.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("7.1 Got the right plugin", plugin.getId().equals("extension2Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("7.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("7.3 Got the right fragment", fragment.getId().equals("fragmentExtension2Test"));
-	
-	// Now make sure we got 1 extension
-	ExtensionModel[] extensions = plugin.getDeclaredExtensions();
-	assertTrue("7.4 Got 1 extension", extensions.length == 1);
-	assertNotNull("7.5 Got xpt3 extension", ((IPluginDescriptor)plugin).getExtension("xpt3"));
-}
-
-public void extension3Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/extension3Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentExtension3Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("8.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("8.1 Got the right plugin", plugin.getId().equals("extension3Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("8.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("8.3 Got the right fragment", fragment.getId().equals("fragmentExtension3Test"));
-	
-	// Now make sure we got all 2 extensions
-	ExtensionModel[] extensions = plugin.getDeclaredExtensions();
-	assertTrue("8.4 Got 2 extensions", extensions.length == 2);
-	assertNotNull("8.5 Got xpt1 extension", ((IPluginDescriptor)plugin).getExtension("xpt1"));
-	assertNotNull("8.6 Got xpt2 extension", ((IPluginDescriptor)plugin).getExtension("xpt2"));
-}
-
-public void extension4Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/extension4Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentExtension4Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("9.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("9.1 Got the right plugin", plugin.getId().equals("extension4Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("9.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("9.3 Got the right fragment", fragment.getId().equals("fragmentExtension4Test"));
-	
-	// Now make sure we got all 2 extensions
-	ExtensionModel[] extensions = plugin.getDeclaredExtensions();
-	assertTrue("9.4 Got 2 extensions", extensions.length == 2);
-	assertNotNull("9.5 Got xpt1 extension", ((IPluginDescriptor)plugin).getExtension("xpt1"));
-	assertNotNull("9.6 Got xpt3 extension", ((IPluginDescriptor)plugin).getExtension("xpt3"));
-}
-
-public void extension5Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/extension5Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentExtension5Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("10.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("10.1 Got the right plugin", plugin.getId().equals("extension5Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("10.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("10.3 Got the right fragment", fragment.getId().equals("fragmentExtension5Test"));
-	
-	// Now make sure we got all 8 extensions
-	ExtensionModel[] extensions = plugin.getDeclaredExtensions();
-	assertTrue("10.4 Got 8 extensions", extensions.length == 8);
-	assertNotNull("10.5 Got xpt1 extension", ((IPluginDescriptor)plugin).getExtension("xpt1"));
-	assertNotNull("10.6 Got xpt2 extension", ((IPluginDescriptor)plugin).getExtension("xpt2"));
-	assertNotNull("10.7 Got xpt3 extension", ((IPluginDescriptor)plugin).getExtension("xpt3"));
-	assertNotNull("10.8 Got xpt4 extension", ((IPluginDescriptor)plugin).getExtension("xpt4"));
-	assertNotNull("10.9 Got xpt5 extension", ((IPluginDescriptor)plugin).getExtension("xpt5"));
-	assertNotNull("10.10 Got xpt6 extension", ((IPluginDescriptor)plugin).getExtension("xpt6"));
-	assertNotNull("10.11 Got xpt7 extension", ((IPluginDescriptor)plugin).getExtension("xpt7"));
-	assertNotNull("10.12 Got xpt8 extension", ((IPluginDescriptor)plugin).getExtension("xpt8"));
-}
-
-public void library1Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/library1Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentLibrary1Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("11.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("11.1 Got the right plugin", plugin.getId().equals("library1Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("11.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("11.3 Got the right fragment", fragment.getId().equals("fragmentLibrary1Test"));
-	
-	// Now make sure we got all 3 libraries
-	LibraryModel[] libraries = plugin.getRuntime();
-	assertTrue("11.4 Got 3 libraries", libraries.length == 3);
-	int lib1Idx = -1;
-	int lib2Idx = -1;
-	int lib3Idx = -1;
-	for (int i = 0; i < libraries.length; i++) {
-		if (libraries[i].getName().equals("lib1.jar")) {
-			lib1Idx = i;
-		} else if (libraries[i].getName().equals("lib2.jar")) {
-			lib2Idx = i;
-		} else if (libraries[i].getName().equals("lib3.jar")) {
-			lib3Idx = i;
-		}
-	}
-	assertTrue("11.5 Got lib1 library", lib1Idx != -1);
-	assertTrue("11.6 Got lib2 library", lib2Idx != -1);
-	assertTrue("11.7 Got lib3 library", lib3Idx != -1);
-}
-
-public void library2Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/library2Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentLibrary2Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("12.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("12.1 Got the right plugin", plugin.getId().equals("library2Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("12.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("12.3 Got the right fragment", fragment.getId().equals("fragmentLibrary2Test"));
-	
-	// Now make sure we got 1 library
-	LibraryModel[] libraries = plugin.getRuntime();
-	assertTrue("12.4 Got 1 library", libraries.length == 1);
-	assertTrue("12.5 Got lib3 library", libraries[0].getName().equals("lib3.jar"));
-}
-
-public void library3Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/library3Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentLibrary3Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("13.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("13.1 Got the right plugin", plugin.getId().equals("library3Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("13.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("13.3 Got the right fragment", fragment.getId().equals("fragmentLibrary3Test"));
-	
-	// Now make sure we got all 2 libraries
-	LibraryModel[] libraries = plugin.getRuntime();
-	assertTrue("13.4 Got 2 libraries", libraries.length == 2);
-	int lib1Idx = -1;
-	int lib2Idx = -1;
-	for (int i = 0; i < libraries.length; i ++) {
-		if (libraries[i].getName().equals("lib1.jar")) {
-			lib1Idx = i;
-		} else if (libraries[i].getName().equals("lib2.jar")) {
-			lib2Idx = i;
-		}
-	}
-	assertTrue("13.5 Got lib1 library", lib1Idx != -1);
-	assertTrue("13.6 Got lib2 library", lib2Idx != -1);
-}
-
-public void library4Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/library4Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentLibrary4Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("14.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("14.1 Got the right plugin", plugin.getId().equals("library4Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("14.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("14.3 Got the right fragment", fragment.getId().equals("fragmentLibrary4Test"));
-	
-	// Now make sure we got all 2 libraries
-	LibraryModel[] libraries = plugin.getRuntime();
-	assertTrue("14.4 Got 2 libraries", libraries.length == 2);
-	int lib1Idx = -1;
-	int lib3Idx = -1;
-	for (int i = 0; i < libraries.length; i++) {
-		if (libraries[i].getName().equals("lib1.jar")) {
-			lib1Idx = i;
-		} else if (libraries[i].getName().equals("lib3.jar")) {
-			lib3Idx = i;
-		}
-	}
-	assertTrue("14.5 Got lib1 library", lib1Idx != -1);
-	assertTrue("14.6 Got lib3 library", lib3Idx != -1);
-}
-
-public void library5Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[2];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/library5Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentLibrary5Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("15.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("15.1 Got the right plugin", plugin.getId().equals("library5Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("15.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("15.3 Got the right fragment", fragment.getId().equals("fragmentLibrary5Test"));
-	
-	// Now make sure we got all 8 libraries
-	LibraryModel[] libraries = plugin.getRuntime();
-	assertTrue("15.4 Got 8 libraries", libraries.length == 8);
-	int lib1Idx = -1;
-	int lib2Idx = -1;
-	int lib3Idx = -1;
-	int lib4Idx = -1;
-	int lib5Idx = -1;
-	int lib6Idx = -1;
-	int lib7Idx = -1;
-	int lib8Idx = -1;
-	for (int i = 0; i < libraries.length; i++) {
-		if (libraries[i].getName().equals("lib1.jar")) {
-			lib1Idx = i;
-		} else if (libraries[i].getName().equals("lib2.jar")) {
-			lib2Idx = i;
-		} else if (libraries[i].getName().equals("lib3.jar")) {
-			lib3Idx = i;
-		} else if (libraries[i].getName().equals("lib4.jar")) {
-			lib4Idx = i;
-		} else if (libraries[i].getName().equals("lib5.jar")) {
-			lib5Idx = i;
-		} else if (libraries[i].getName().equals("lib6.jar")) {
-			lib6Idx = i;
-		} else if (libraries[i].getName().equals("lib7.jar")) {
-			lib7Idx = i;
-		} else if (libraries[i].getName().equals("lib8.jar")) {
-			lib8Idx = i;
-		}
-	}
-	assertTrue("15.5 Got lib1 library", lib1Idx != -1);
-	assertTrue("15.6 Got lib2 library", lib2Idx != -1);
-	assertTrue("15.7 Got lib3 library", lib3Idx != -1);
-	assertTrue("15.8 Got lib4 library", lib4Idx != -1);
-	assertTrue("15.9 Got lib5 library", lib5Idx != -1);
-	assertTrue("15.10 Got lib6 library", lib6Idx != -1);
-	assertTrue("15.11 Got lib7 library", lib7Idx != -1);
-	assertTrue("15.12 Got lib8 library", lib8Idx != -1);
-}
-
-public void requires1Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[5];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/requires1Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentRequires1Test.xml");
-	pluginPaths[2] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin1.xml");
-	pluginPaths[3] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin2.xml");
-	pluginPaths[4] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin3.xml");
-	URL pluginURLs[] = new URL[5];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("requires1Test");
-	assertTrue("16.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("16.1 Got the right plugin", plugin.getId().equals("requires1Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("16.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("16.3 Got the right fragment", fragment.getId().equals("fragmentRequires1Test"));
-	
-	// Now make sure we got all 3 prerequisites
-	PluginPrerequisiteModel[] requires = plugin.getRequires();
-	assertTrue("16.4 Got 3 prerequisites", requires.length == 3);
-	int req1Idx = -1;
-	int req2Idx = -1;
-	int req3Idx = -1;
-	for (int i = 0; i < requires.length; i++) {
-		if (requires[i].getPlugin().equals("plugin1")) {
-			req1Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin2")) {
-			req2Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin3")) {
-			req3Idx = i;
-		}
-	}
-	assertTrue("16.5 Got plugin1 prerequisite", req1Idx != -1);
-	assertTrue("16.6 Got plugin2 prerequisite", req2Idx != -1);
-	assertTrue("16.7 Got plugin3 prerequisite", req3Idx != -1);
-}
-
-public void requires2Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[3];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/requires2Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentRequires2Test.xml");
-	pluginPaths[2] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin3.xml");
-	URL pluginURLs[] = new URL[3];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("requires2Test");
-	assertTrue("17.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("17.1 Got the right plugin", plugin.getId().equals("requires2Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("17.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("17.3 Got the right fragment", fragment.getId().equals("fragmentRequires2Test"));
-	
-	// Now make sure we got 1 prerequisite
-	PluginPrerequisiteModel[] requires = plugin.getRequires();
-	assertTrue("17.4 Got 1 prerequisite", requires.length == 1);
-	assertTrue("17.5 Got plugin3 prerequisite", requires[0].getPlugin().equals("plugin3"));
-}
-
-public void requires3Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[4];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/requires3Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentRequires3Test.xml");
-	pluginPaths[2] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin1.xml");
-	pluginPaths[3] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin2.xml");
-	URL pluginURLs[] = new URL[4];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("requires3Test");
-	assertTrue("18.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("18.1 Got the right plugin", plugin.getId().equals("requires3Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("18.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("18.3 Got the right fragment", fragment.getId().equals("fragmentRequires3Test"));
-	
-	// Now make sure we got all 2 prerequisites
-	PluginPrerequisiteModel[] requires = plugin.getRequires();
-	assertTrue("18.4 Got 2 prerequisites", requires.length == 2);
-	int req1Idx = -1;
-	int req2Idx = -1;
-	for (int i = 0; i < requires.length; i ++) {
-		if (requires[i].getPlugin().equals("plugin1")) {
-			req1Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin2")) {
-			req2Idx = i;
-		}
-	}
-	assertTrue("18.5 Got plugin1 prerequisite", req1Idx != -1);
-	assertTrue("18.6 Got plugin2 prerequisite", req2Idx != -1);
-}
-
-public void requires4Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[4];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/requires4Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentRequires4Test.xml");
-	pluginPaths[2] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin1.xml");
-	pluginPaths[3] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin3.xml");
-	URL pluginURLs[] = new URL[4];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("requires4Test");
-	assertTrue("19.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("19.1 Got the right plugin", plugin.getId().equals("requires4Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("19.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("19.3 Got the right fragment", fragment.getId().equals("fragmentRequires4Test"));
-	
-	// Now make sure we got all 2 prerequisites
-	PluginPrerequisiteModel[] requires = plugin.getRequires();
-	assertTrue("19.4 Got 2 prerequisites", requires.length == 2);
-	int req1Idx = -1;
-	int req3Idx = -1;
-	for (int i = 0; i < requires.length; i++) {
-		if (requires[i].getPlugin().equals("plugin1")) {
-			req1Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin3")) {
-			req3Idx = i;
-		}
-	}
-	assertTrue("19.5 Got plugin1 prerequisite", req1Idx != -1);
-	assertTrue("19.6 Got plugin3 prerequisite", req3Idx != -1);
-}
-
-public void requires5Test() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "extensiveFragmentTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String[] pluginPaths = new String[10];
-	pluginPaths[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/requires5Test.xml");
-	pluginPaths[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/fragmentRequires5Test.xml");
-	pluginPaths[2] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin1.xml");
-	pluginPaths[3] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin2.xml");
-	pluginPaths[4] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin3.xml");
-	pluginPaths[5] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin4.xml");
-	pluginPaths[6] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin5.xml");
-	pluginPaths[7] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin6.xml");
-	pluginPaths[8] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin7.xml");
-	pluginPaths[9] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveFragmentTest/plugin8.xml");
-	URL pluginURLs[] = new URL[10];
-	for (int i = 0; i < pluginURLs.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPaths[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPaths[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("requires5Test");
-	assertTrue("20.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("20.1 Got the right plugin", plugin.getId().equals("requires5Test"));
-	PluginFragmentModel[] fragmentList = ((PluginRegistryModel)registry).getFragments();
-	assertTrue("20.2 Only one fragment", fragmentList.length == 1);
-	PluginFragmentModel fragment = fragmentList[0];
-	assertTrue("20.3 Got the right fragment", fragment.getId().equals("fragmentRequires5Test"));
-	
-	// Now make sure we got all 8 prerequisites
-	PluginPrerequisiteModel[] requires = plugin.getRequires();
-	assertTrue("20.4 Got 8 prerequisites", requires.length == 8);
-	int req1Idx = -1;
-	int req2Idx = -1;
-	int req3Idx = -1;
-	int req4Idx = -1;
-	int req5Idx = -1;
-	int req6Idx = -1;
-	int req7Idx = -1;
-	int req8Idx = -1;
-	for (int i = 0; i < requires.length; i++) {
-		if (requires[i].getPlugin().equals("plugin1")) {
-			req1Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin2")) {
-			req2Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin3")) {
-			req3Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin4")) {
-			req4Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin5")) {
-			req5Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin6")) {
-			req6Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin7")) {
-			req7Idx = i;
-		} else if (requires[i].getPlugin().equals("plugin8")) {
-			req8Idx = i;
-		}
-	}
-	assertTrue("20.5 Got plugin1 prerequisite", req1Idx != -1);
-	assertTrue("20.6 Got plugin2 prerequisite", req2Idx != -1);
-	assertTrue("20.7 Got plugin3 prerequisite", req3Idx != -1);
-	assertTrue("20.8 Got plugin4 prerequisite", req4Idx != -1);
-	assertTrue("20.9 Got plugin5 prerequisite", req5Idx != -1);
-	assertTrue("20.10 Got plugin6 prerequisite", req6Idx != -1);
-	assertTrue("20.11 Got plugin7 prerequisite", req7Idx != -1);
-	assertTrue("20.12 Got plugin8 prerequisite", req8Idx != -1);
-}
-
-}
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveLibraryTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveLibraryTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveLibraryTest.java
deleted file mode 100644
index b283959..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveLibraryTest.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.runtime.*;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.tests.harness.*;
-import java.io.*;
-import java.net.URL;
-import junit.framework.*;
-import org.xml.sax.*;
-
-public class ExtensiveLibraryTest extends EclipseWorkspaceTest {
-
-public ExtensiveLibraryTest() {
-	super(null);
-}
-
-public ExtensiveLibraryTest(String name) {
-	super(name);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ExtensiveLibraryTest("noLibraryTest"));
-	suite.addTest(new ExtensiveLibraryTest("oneLibraryTest"));
-	suite.addTest(new ExtensiveLibraryTest("oneLibraryOneExportTest"));
-	suite.addTest(new ExtensiveLibraryTest("multiLibraryOneExportTest"));
-	suite.addTest(new ExtensiveLibraryTest("multiLibraryMultiExportTest"));
-	suite.addTest(new ExtensiveLibraryTest("emptyLibraryTest"));
-	return suite;
-}
-
-public void noLibraryTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveLibraryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/extensiveLibraryTest/noLibraryTest.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("1.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("1.1 Got the right plugin", plugin.getId().equals("noLibraryTest"));
-	assertNull("1.2 No library entries", plugin.getRuntime());
-}
-
-public void oneLibraryTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveLibraryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/extensiveLibraryTest/oneLibraryTest.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("2.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("2.1 Got the right plugin", plugin.getId().equals("oneLibraryTest"));
-	assertTrue("2.2 One library entry", plugin.getRuntime().length == 1);
-	LibraryModel library = (LibraryModel)plugin.getRuntime()[0];
-	assertTrue("2.3 Got the right library", library.getName().equals("lib1.jar"));
-	assertNull("2.4 No exports", library.getExports());
-}
-
-public void oneLibraryOneExportTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveLibraryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath[] = new String[2];
-	pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport1Test.xml");
-	pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveLibraryTest/oneLibraryOneExport2Test.xml");
-	URL pluginURLs[] = new URL[2];
-	for (int i = 0; i < pluginPath.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPath[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPath[i], true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("3.0 Two plugins", pluginDescriptors.length == 2);
-
-	// Check out the first library which should be fully exported ("*" as the export list)
-	IPluginDescriptor[] pluginArray = registry.getPluginDescriptors("oneLibraryOneExport1Test");
-	assertTrue("3.1 Got the right plugin", pluginArray.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginArray[0];
-	assertTrue("3.2 One library entry", plugin.getRuntime().length == 1);
-	LibraryModel library = (LibraryModel)plugin.getRuntime()[0];
-	assertTrue("3.3 Got the right library", library.getName().equals("lib2.jar"));
-	assertTrue("3.4 Exported", library.isExported());
-	assertTrue("3.5 Fully exported", library.isFullyExported());
-
-	// Check out the second library which should be not be fully exported
-	pluginArray = registry.getPluginDescriptors("oneLibraryOneExport2Test");
-	assertTrue("3.6 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	assertTrue("3.7 One library entry", plugin.getRuntime().length == 1);
-	library = (LibraryModel)plugin.getRuntime()[0];
-	assertTrue("3.8 Got the right library", library.getName().equals("lib2.jar"));
-	assertTrue("3.9 Exported", library.isExported());
-	assertTrue("3.10 Not fully exported", !library.isFullyExported());
-}
-
-public void multiLibraryOneExportTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveLibraryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/extensiveLibraryTest/multiLibraryOneExportTest.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("4.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("4.1 Got the right plugin", plugin.getId().equals("multiLibraryOneExportTest"));
-	LibraryModel libraryArray[] = plugin.getRuntime(); 
-	assertTrue("4.2 Got 3 library entries", libraryArray.length == 3);
-	
-	// Check out the libraries individually
-	// First library should be "lib1.jar" with no exports
-	LibraryModel library = libraryArray[0];
-	assertTrue("4.3 Got the right library", library.getName().equals("lib1.jar"));
-	assertNull("4.4 No exports", library.getExports());
-	assertTrue("4.5 Not exported", !library.isExported());
-	assertTrue("4.6 Not fully exported", !library.isFullyExported());
-	
-	// Second library should be "lib2.jar" and be fully exported
-	library = libraryArray[1];
-	assertTrue("4.7 Got the right library", library.getName().equals("lib2.jar"));
-	assertTrue("4.8 Exported", library.isExported());
-	assertTrue("4.9 Fully exported", library.isFullyExported());
-	// Check the export list too
-	String exportList[] = library.getExports();
-	assertTrue("4.10 Only one export", exportList.length == 1);
-	assertTrue("4.11 Fully exported mask", exportList[0].equals("*"));
-
-	// Third library should be "lib3.jar" and be exported with the export
-	// mask containing only "a.b.C"
-	library = libraryArray[2];
-	assertTrue("4.12 Got the right library", library.getName().equals("lib3.jar"));
-	assertTrue("4.13 Exported", library.isExported());
-	assertTrue("4.14 Not fully exported", !library.isFullyExported());
-	// Now check the export list
-	exportList = library.getExports();
-	assertTrue("4.15 Only one export", exportList.length == 1);
-	assertTrue("4.16 Exported mask", exportList[0].equals("a.b.C"));
-}
-
-public void multiLibraryMultiExportTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveLibraryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/extensiveLibraryTest/multiLibraryMultiExportTest.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("5.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("5.1 Got the right plugin", plugin.getId().equals("multiLibraryMultiExportTest"));
-	LibraryModel libraryArray[] = plugin.getRuntime(); 
-	assertTrue("5.2 Got 3 library entries", libraryArray.length == 3);
-	
-	// Check out the libraries individually
-	// First library should be "lib1.jar" with no exports
-	LibraryModel library = libraryArray[0];
-	assertTrue("5.3 Got the right library", library.getName().equals("lib1.jar"));
-	assertNull("5.4 No exports", library.getExports());
-	assertTrue("5.5 Not exported", !library.isExported());
-	assertTrue("5.6 Not fully exported", !library.isFullyExported());
-	
-	// Second library should be "lib2.jar" and be fully exported
-	library = libraryArray[1];
-	assertTrue("5.7 Got the right library", library.getName().equals("lib2.jar"));
-	assertTrue("5.8 Exported", library.isExported());
-	assertTrue("5.9 Fully exported", library.isFullyExported());
-	// Check the export list too
-	String exportList[] = library.getExports();
-	assertTrue("5.10 Three exports", exportList.length == 3);
-	assertTrue("5.11 Mask[0]", exportList[0].equals("a"));
-	assertTrue("5.12 Mask[1]", exportList[1].equals("*"));
-	assertTrue("5.13 Mask[2]", exportList[2].equals("b"));
-
-	// Third library should be "lib3.jar" and be exported with the export
-	// mask containing "a.b.C" and "a.b.D"
-	library = libraryArray[2];
-	assertTrue("5.14 Got the right library", library.getName().equals("lib3.jar"));
-	assertTrue("5.15 Exported", library.isExported());
-	assertTrue("5.16 Not fully exported", !library.isFullyExported());
-	// Now check the export list
-	exportList = library.getExports();
-	assertTrue("5.17 Only one export", exportList.length == 2);
-	assertTrue("5.18 Mask[0]", exportList[0].equals("a.b.C"));
-	assertTrue("5.16 Mask[1]", exportList[1].equals("a.b.D"));
-}
-
-public void emptyLibraryTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveLibraryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/extensiveLibraryTest/emptyLibraryTest.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	// Should not get any plugins as the one library entry does not
-	// have the only required field, name
-	assertTrue("6.0 No plugins", pluginDescriptors.length == 0);
-}
-
-}
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveRequiresTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveRequiresTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveRequiresTest.java
deleted file mode 100644
index ccf813a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ExtensiveRequiresTest.java
+++ /dev/null
@@ -1,430 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.runtime.*;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.tests.harness.*;
-import java.io.*;
-import java.net.URL;
-import junit.framework.*;
-import org.xml.sax.*;
-
-public class ExtensiveRequiresTest extends EclipseWorkspaceTest {
-
-public ExtensiveRequiresTest() {
-	super(null);
-}
-
-public ExtensiveRequiresTest(String name) {
-	super(name);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ExtensiveRequiresTest("noRequiresTest"));
-	suite.addTest(new ExtensiveRequiresTest("emptyRequiresTest"));
-	suite.addTest(new ExtensiveRequiresTest("oneRequiresTest"));
-	suite.addTest(new ExtensiveRequiresTest("multiRequiresTest"));
-	suite.addTest(new ExtensiveRequiresTest("matchRequiresTest"));
-	suite.addTest(new ExtensiveRequiresTest("exportRequiresTest"));
-	suite.addTest(new ExtensiveRequiresTest("optionalRequiresTest"));
-	return suite;
-}
-
-public void noRequiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveRequiresTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/noRequiresTest.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("1.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("1.1 Got the right plugin", plugin.getId().equals("noRequiresTest"));
-	assertNull("1.2 No prerequisites", plugin.getRequires());
-}
-
-public void emptyRequiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveRequiresTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/emptyRequiresTest.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("2.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("2.1 Got the right plugin", plugin.getId().equals("emptyRequiresTest"));
-	assertNull("2.2 No prerequisites", plugin.getRequires());
-}
-
-public void oneRequiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveRequiresTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/oneRequiresTest.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("3.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("3.1 Got the right plugin", plugin.getId().equals("oneRequiresTest"));
-	PluginPrerequisiteModel[] prereqArray = plugin.getRequires();
-	assertTrue("3.2 One prerequisite", prereqArray.length == 1);
-	assertTrue("3.3 Right prerequisite", prereqArray[0].getPlugin().equals("tests.b"));
-}
-
-public void multiRequiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveRequiresTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/multiRequiresTest.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("4.0 Only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	assertTrue("4.1 Got the right plugin", plugin.getId().equals("multiRequiresTest"));
-	PluginPrerequisiteModel[] prereqArray = plugin.getRequires();
-	assertTrue("4.2 Six prerequisites", prereqArray.length == 6);
-	
-	// Check each of the prerequisites
-    // <import plugin="firstPrerequisite"/>
-	PluginPrerequisiteModel prereq = prereqArray[0];
-    assertTrue("4.3 1st prerequisite name", prereq.getPlugin().equals("firstPrerequisite"));
-    assertEquals("4.4 1st prerequisite match", prereq.getMatchByte(), PluginPrerequisiteModel.PREREQ_MATCH_UNSPECIFIED);
-    assertTrue("4.5 1st prerequisite export", !prereq.getExport());
-    assertTrue("4.6 1st prerequisite optional", !prereq.getOptional());
-    assertNull("4.7 1st prerequisite version", prereq.getVersion());
-    
-    // <import plugin="secondPrerequisite" version="1.0.0"/>
-	prereq = prereqArray[1];
-    assertTrue("4.8 2nd prerequisite name", prereq.getPlugin().equals("secondPrerequisite"));
-    assertEquals("4.9 2nd prerequisite match", prereq.getMatchByte(), PluginPrerequisiteModel.PREREQ_MATCH_UNSPECIFIED);
-    assertTrue("4.10 2nd prerequisite export", !prereq.getExport());
-    assertTrue("4.11 2nd prerequisite optional", !prereq.getOptional());
-    assertTrue("4.12 2nd prerequisite version", prereq.getVersion().equals("1.0.0"));
-    
-    // <import plugin="thirdPrerequisite"/>
-	prereq = prereqArray[2];
-    assertTrue("4.13 3rd prerequisite name", prereq.getPlugin().equals("thirdPrerequisite"));
-    assertEquals("4.14 3rd prerequisite match", prereq.getMatchByte(), PluginPrerequisiteModel.PREREQ_MATCH_UNSPECIFIED);
-    assertTrue("4.15 3rd prerequisite export", !prereq.getExport());
-    assertTrue("4.16 3rd prerequisite optional", !prereq.getOptional());
-    assertNull("4.17 3rd prerequisite version", prereq.getVersion());
-    
-    // <import plugin="fourthPrerequisite"/>
-	prereq = prereqArray[3];
-    assertTrue("4.18 4th prerequisite name", prereq.getPlugin().equals("fourthPrerequisite"));
-    assertEquals("4.19 4th prerequisite match", prereq.getMatchByte(), PluginPrerequisiteModel.PREREQ_MATCH_UNSPECIFIED);
-    assertTrue("4.20 4th prerequisite export", !prereq.getExport());
-    assertTrue("4.21 4th prerequisite optional", !prereq.getOptional());
-    assertNull("4.22 4th prerequisite version", prereq.getVersion());
-    
-    // <import plugin="fifthPrerequisite"/>
-	prereq = prereqArray[4];
-    assertTrue("4.23 5th prerequisite name", prereq.getPlugin().equals("fifthPrerequisite"));
-    assertEquals("4.24 5th prerequisite match", prereq.getMatchByte(), PluginPrerequisiteModel.PREREQ_MATCH_UNSPECIFIED);
-    assertTrue("4.25 5th prerequisite export", !prereq.getExport());
-    assertTrue("4.26 5th prerequisite optional", !prereq.getOptional());
-    assertNull("4.27 5th prerequisite version", prereq.getVersion());
-    
-    // <import plugin="sixthPrerequisite" version="6.9.10"/>
-	prereq = prereqArray[5];
-    assertTrue("4.28 6th prerequisite name", prereq.getPlugin().equals("sixthPrerequisite"));
-    assertEquals("4.29 6th prerequisite match", prereq.getMatchByte(), PluginPrerequisiteModel.PREREQ_MATCH_UNSPECIFIED);
-    assertTrue("4.30 6th prerequisite export", !prereq.getExport());
-    assertTrue("4.31 6th prerequisite optional", !prereq.getOptional());
-    assertTrue("4.32 6th prerequisite version", prereq.getVersion().equals("6.9.10"));
-}
-
-public void matchRequiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveRequiresTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath[] = new String[6];
-	pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/match1RequiresTest.xml");
-	pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/match2RequiresTest.xml");
-	pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/match3RequiresTest.xml");
-	pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/match4RequiresTest.xml");
-	pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/match5RequiresTest.xml");
-	pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/match6RequiresTest.xml");
-	URL pluginURLs[] = new URL[6];
-	for (int i = 0; i < pluginPath.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPath[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPath, true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("5.0 Four plugins", pluginDescriptors.length == 6);
-	
-	// <import plugin="tests.b"/>
-	IPluginDescriptor pluginArray[] = registry.getPluginDescriptors("match1RequiresTest");
-	assertTrue("5.1 Got the right plugin", pluginArray.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginArray[0];
-	PluginPrerequisiteModel[] prereqArray = plugin.getRequires();
-	assertTrue("5.2 One prerequisite", prereqArray.length == 1);
-	PluginPrerequisiteModel prereq = prereqArray[0];
-	assertTrue("5.3 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("5.4 Unspecified match", prereq.getMatchByte() == PluginPrerequisiteModel.PREREQ_MATCH_UNSPECIFIED);
-	
-	// <import plugin="tests.b" match="compatible"/>
-	pluginArray = registry.getPluginDescriptors("match2RequiresTest");
-	assertTrue("5.5 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("5.6 One prerequisite", prereqArray.length == 1);
-	prereq = prereqArray[0];
-	assertTrue("5.7 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("5.8 Specified compatible match", prereq.getMatchByte() == PluginPrerequisiteModel.PREREQ_MATCH_COMPATIBLE);
-	
-	// <import plugin="tests.b" match="equivalent"/>
-	pluginArray = registry.getPluginDescriptors("match3RequiresTest");
-	assertTrue("5.9 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("5.10 One prerequisite", prereqArray.length == 1);
-	prereq = prereqArray[0];
-	assertTrue("5.11 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("5.12 Specified exact match", prereq.getMatchByte() == PluginPrerequisiteModel.PREREQ_MATCH_EQUIVALENT);
-	
-	// <import plugin="tests.c" match="perfect"/>
-	pluginArray = registry.getPluginDescriptors("match4RequiresTest");
-	assertTrue("5.13 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("5.14 One prerequisite", prereqArray.length == 1);
-	prereq = prereqArray[0];
-	assertTrue("5.15 Right prerequisite", prereq.getPlugin().equals("tests.c"));
-	assertTrue("5.16 Specified exact match", prereq.getMatchByte() == PluginPrerequisiteModel.PREREQ_MATCH_PERFECT);
-	
-	// <import plugin="tests.c" match="greaterOrEqual"/>
-	pluginArray = registry.getPluginDescriptors("match5RequiresTest");
-	assertTrue("5.17 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("5.18 One prerequisite", prereqArray.length == 1);
-	prereq = prereqArray[0];
-	assertTrue("5.19 Right prerequisite", prereq.getPlugin().equals("tests.c"));
-	assertTrue("5.20 Specified exact match", prereq.getMatchByte() == PluginPrerequisiteModel.PREREQ_MATCH_GREATER_OR_EQUAL);
-	
-	pluginArray = registry.getPluginDescriptors("match6RequiresTest");
-	assertTrue("5.21 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("5.22 Three prerequisites", prereqArray.length == 5);
-
-	// <import plugin="tests.a"/>
-	prereq = prereqArray[0];
-	assertTrue("5.23 Right prerequisite", prereq.getPlugin().equals("tests.a"));
-	assertTrue("5.24 Unspecified match", prereq.getMatchByte() == PluginPrerequisiteModel.PREREQ_MATCH_UNSPECIFIED);
-    // <import plugin="tests.b" match="greaterOrEqual"/>
-	prereq = prereqArray[1];
-	assertTrue("5.25 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("5.26 Specified exact match", prereq.getMatchByte() == PluginPrerequisiteModel.PREREQ_MATCH_GREATER_OR_EQUAL);
-    // <import plugin="tests.c" match="compatible"/>
-	prereq = prereqArray[2];
-	assertTrue("5.27 Right prerequisite", prereq.getPlugin().equals("tests.c"));
-	assertTrue("5.28 Specified compatible match", prereq.getMatchByte() == PluginPrerequisiteModel.PREREQ_MATCH_COMPATIBLE);
-    // <import plugin="tests.c" match="equivalent"/>
-	prereq = prereqArray[3];
-	assertTrue("5.29 Right prerequisite", prereq.getPlugin().equals("tests.c"));
-	assertTrue("5.30 Specified compatible match", prereq.getMatchByte() == PluginPrerequisiteModel.PREREQ_MATCH_EQUIVALENT);
-    // <import plugin="tests.c" match="perfect"/>
-	prereq = prereqArray[4];
-	assertTrue("5.31 Right prerequisite", prereq.getPlugin().equals("tests.c"));
-	assertTrue("5.32 Specified compatible match", prereq.getMatchByte() == PluginPrerequisiteModel.PREREQ_MATCH_PERFECT);
-}
-
-public void exportRequiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveRequiresTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath[] = new String[4];
-	pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/export1RequiresTest.xml");
-	pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/export2RequiresTest.xml");
-	pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/export3RequiresTest.xml");
-	pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/export4RequiresTest.xml");
-	URL pluginURLs[] = new URL[4];
-	for (int i = 0; i < pluginPath.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPath[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPath, true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("6.0 Four plugins", pluginDescriptors.length == 4);
-	
-	// <import plugin="tests.b"/>
-	IPluginDescriptor pluginArray[] = registry.getPluginDescriptors("export1RequiresTest");
-	assertTrue("6.1 Got the right plugin", pluginArray.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginArray[0];
-	PluginPrerequisiteModel[] prereqArray = plugin.getRequires();
-	assertTrue("6.2 One prerequisite", prereqArray.length == 1);
-	PluginPrerequisiteModel prereq = prereqArray[0];
-	assertTrue("6.3 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("6.4 Unspecified export", !prereq.getExport());
-	
-	// <import plugin="tests.b" export="true"/>
-	pluginArray = registry.getPluginDescriptors("export2RequiresTest");
-	assertTrue("6.5 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("6.6 One prerequisite", prereqArray.length == 1);
-	prereq = prereqArray[0];
-	assertTrue("6.7 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("6.8 Specified export", prereq.getExport());
-	
-	// <import plugin="tests.b" export="false"/>
-	pluginArray = registry.getPluginDescriptors("export3RequiresTest");
-	assertTrue("6.9 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("6.10 One prerequisite", prereqArray.length == 1);
-	prereq = prereqArray[0];
-	assertTrue("6.11 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("6.12 Specified false export", !prereq.getExport());
-	
-	pluginArray = registry.getPluginDescriptors("export4RequiresTest");
-	assertTrue("6.13 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("6.14 Three prerequisites", prereqArray.length == 3);
-	// <import plugin="tests.a" export="true"/>
-	prereq = prereqArray[0];
-	assertTrue("6.15 Right prerequisite", prereq.getPlugin().equals("tests.a"));
-	assertTrue("6.16 Specified export", prereq.getExport());
-    // <import plugin="tests.b"/>
-	prereq = prereqArray[1];
-	assertTrue("6.17 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("6.18 Unspecified export", !prereq.getExport());
-    // <import plugin="tests.c" export="false"/>
-	prereq = prereqArray[2];
-	assertTrue("6.19 Right prerequisite", prereq.getPlugin().equals("tests.c"));
-	assertTrue("6.20 Specified false export", !prereq.getExport());
-}
-
-public void optionalRequiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("extensiveRequiresTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath[] = new String[4];
-	pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/optional1RequiresTest.xml");
-	pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/optional2RequiresTest.xml");
-	pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/optional3RequiresTest.xml");
-	pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/extensiveRequiresTest/optional4RequiresTest.xml");
-	URL pluginURLs[] = new URL[4];
-	for (int i = 0; i < pluginPath.length; i++) {
-		URL pURL = null;
-		try {
-			pURL = new URL (pluginPath[i]);
-		} catch (java.net.MalformedURLException e) {
-			assertTrue("Bad URL for " + pluginPath, true);
-		}
-		pluginURLs[i] = pURL;
-	}
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, false);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue("7.0 Four plugins", pluginDescriptors.length == 4);
-	
-	// <import plugin="tests.b"/>
-	IPluginDescriptor pluginArray[] = registry.getPluginDescriptors("optional1RequiresTest");
-	assertTrue("7.1 Got the right plugin", pluginArray.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginArray[0];
-	PluginPrerequisiteModel[] prereqArray = plugin.getRequires();
-	assertTrue("7.2 One prerequisite", prereqArray.length == 1);
-	PluginPrerequisiteModel prereq = prereqArray[0];
-	assertTrue("7.3 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("7.4 Unspecified optional", !prereq.getOptional());
-	
-	// <import plugin="tests.b" optional="true"/>
-	pluginArray = registry.getPluginDescriptors("optional2RequiresTest");
-	assertTrue("7.5 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("7.6 One prerequisite", prereqArray.length == 1);
-	prereq = prereqArray[0];
-	assertTrue("7.7 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("7.8 Specified optional", prereq.getOptional());
-	
-	// <import plugin="tests.b" optional="false"/>
-	pluginArray = registry.getPluginDescriptors("optional3RequiresTest");
-	assertTrue("7.9 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("7.10 One prerequisite", prereqArray.length == 1);
-	prereq = prereqArray[0];
-	assertTrue("7.11 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("7.12 Specified false optional", !prereq.getOptional());
-	
-	pluginArray = registry.getPluginDescriptors("optional4RequiresTest");
-	assertTrue("7.13 Got the right plugin", pluginArray.length == 1);
-	plugin = (PluginDescriptorModel)pluginArray[0];
-	prereqArray = plugin.getRequires();
-	assertTrue("7.14 Three prerequisites", prereqArray.length == 3);
-	// <import plugin="tests.a" optional="true"/>
-	prereq = prereqArray[0];
-	assertTrue("7.15 Right prerequisite", prereq.getPlugin().equals("tests.a"));
-	assertTrue("7.16 Specified optional", prereq.getOptional());
-    // <import plugin="tests.b"/>
-	prereq = prereqArray[1];
-	assertTrue("7.17 Right prerequisite", prereq.getPlugin().equals("tests.b"));
-	assertTrue("7.18 Unspecified optional", !prereq.getOptional());
-    // <import plugin="tests.c" optional="false"/>
-	prereq = prereqArray[2];
-	assertTrue("7.19 Right prerequisite", prereq.getPlugin().equals("tests.c"));
-	assertTrue("7.20 Specified false optional", !prereq.getOptional());
-}
-
-}
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_1.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_1.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_1.java
deleted file mode 100644
index be2533f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_1.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_1 extends EclipseWorkspaceTest {
-public FragmentResolveTest_1() {
-	super(null);
-}
-public FragmentResolveTest_1(String name) {
-	super(name);
-}
-
-public void test1() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/fragment1.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("1.0", pd);
-	assertTrue("1.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.2", all.length == 1);
-	assertTrue("1.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("1.5", fragment.length == 1);
-	assertTrue("1.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.7", fragments.length == 1);
-	assertTrue("1.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.9", fragments[0].getPluginVersion().equals("1.2.0"));
-	
-	// Now make sure we hooked this fragment and this plugin
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNotNull("1.10", linkedFragments);
-	assertTrue("1.11", linkedFragments.length == 1);
-	assertTrue("1.12", linkedFragments[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("1.13", libraries.length == 1);
-	assertTrue("1.14", ((Library)libraries[0]).getName().equals("lib1.jar"));
-}
-
-public void test2() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/fragment2.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("2.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("2.0", pd);
-	assertTrue("2.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("2.2", all.length == 1);
-	assertTrue("2.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("2.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("2.5", fragment.length == 1);
-	assertTrue("2.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("2.7", fragments.length == 1);
-	assertTrue("2.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("2.9", fragments[0].getPluginVersion().equals("1.3.0"));
-	
-	// Now make sure we didn't hook this fragment and this plugin (they aren't compatible)
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNull("2.10", linkedFragments);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("2.11", libraries.length == 0);
-}
-
-public void test3() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/fragment3.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("3.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("3.0", pd);
-	assertTrue("3.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("3.2", all.length == 1);
-	assertTrue("3.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("3.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("3.5", fragment.length == 1);
-	assertTrue("3.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("3.7", fragments.length == 1);
-	assertTrue("3.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("3.9", fragments[0].getPluginVersion().equals("1.1.0"));
-	
-	// Now make sure we hooked this fragment and this plugin
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNotNull("3.10", linkedFragments);
-	assertTrue("3.11", linkedFragments.length == 1);
-	assertTrue("3.12", linkedFragments[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("3.13", libraries.length == 1);
-	assertTrue("3.14", ((Library)libraries[0]).getName().equals("lib1.jar"));
-}
-
-public void test4() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/fragment4.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("4.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("4.0", pd);
-	assertTrue("4.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("4.2", all.length == 1);
-	assertTrue("4.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("4.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("4.5", fragment.length == 1);
-	assertTrue("4.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("4.7", fragments.length == 1);
-	assertTrue("4.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("4.9", fragments[0].getPluginVersion().equals("2.0.0"));
-	
-	// Now make sure we didn't hook this fragment and this plugin (they aren't compatible)
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNull("4.10", linkedFragments);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("4.11", libraries.length == 0);
-}
-
-public void test5() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/fragment5.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("5.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("5.0", pd);
-	assertTrue("5.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("5.2", all.length == 1);
-	assertTrue("5.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("5.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("5.5", fragment.length == 1);
-	assertTrue("5.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("5.7", fragments.length == 1);
-	assertTrue("5.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("5.9", fragments[0].getPluginVersion().equals("1.2.1"));
-	
-	// Now make sure we didn't hook this fragment and this plugin.
-	// They are not compatible unless the service number is 0 in this case.
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNull("5.10", linkedFragments);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("5.11", libraries.length == 0);
-}
-
-public void test6() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/plugin2.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/fragment6.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("6.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("6.0", pd);
-	assertTrue("6.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("6.2", all.length == 1);
-	assertTrue("6.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("6.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.6")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("6.5", fragment.length == 1);
-	assertTrue("6.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("6.7", fragments.length == 1);
-	assertTrue("6.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("6.9", fragments[0].getPluginVersion().equals("1.2.4"));
-	
-	// Now make sure we hooked this fragment and this plugin
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNotNull("6.10", linkedFragments);
-	assertTrue("6.11", linkedFragments.length == 1);
-	assertTrue("6.12", linkedFragments[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("6.13", libraries.length == 1);
-	assertTrue("6.14", ((Library)libraries[0]).getName().equals("lib1.jar"));
-}
-
-public void test7() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/plugin2.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.1/fragment7.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("7.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("7.0", pd);
-	assertTrue("7.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("7.2", all.length == 1);
-	assertTrue("7.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("7.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.6")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("7.5", fragment.length == 1);
-	assertTrue("7.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("7.7", fragments.length == 1);
-	assertTrue("7.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("7.9", fragments[0].getPluginVersion().equals("1.2.8"));
-	
-	// Now make sure we didn't hook this fragment and this plugin
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNull("7.10", linkedFragments);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("7.11", libraries.length == 0);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_1("test1"));
-	suite.addTest(new FragmentResolveTest_1("test2"));
-	suite.addTest(new FragmentResolveTest_1("test3"));
-	suite.addTest(new FragmentResolveTest_1("test4"));
-	suite.addTest(new FragmentResolveTest_1("test5"));
-	suite.addTest(new FragmentResolveTest_1("test6"));
-	suite.addTest(new FragmentResolveTest_1("test7"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_10.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_10.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_10.java
deleted file mode 100644
index 1f4f0c0..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_10.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_10 extends EclipseWorkspaceTest {
-public FragmentResolveTest_10() {
-	super(null);
-}
-public FragmentResolveTest_10(String name) {
-	super(name);
-}
-
-static PluginRegistry doParsing(InternalFactory factory, URL[] pluginPath, boolean doResolve) {
-	PluginRegistry registry = (PluginRegistry) RegistryLoader.parseRegistry(pluginPath, factory, false);
-	if (doResolve)
-		// don't trim the disabled plugins for these tests
-		registry.resolve(false, true);
-	registry.markReadOnly();
-	registry.startup(null);
-	return registry;
-}
-
-public void fullTest() {
-	String[] fragmentIds = {"5.9.8", "1.2.3", "1.2.4", "2.0.0", "3.0.4",
-		"4.6.2", "4.5.8", "4.4.2", "4.5.1"}; 
-	boolean[] matchesPlugin = {false, true, true, true, true, 
-		false, false, true, true};
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[7];
-	String[] pluginPath = new String[7];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.10/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.10/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.10/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.10/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.10/plugin5.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.10/plugin6.xml");
-		for (int i = 0; i < pluginPath.length - 1; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("0.0.0 Unexpected exception - " + e.getMessage());
-	}
-	
-	for (int i = 0; i < fragmentIds.length; i++) {
-		try {
-			pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.10/fragment" + (i+1) + ".xml");
-			pluginURLs[6] = new URL (pluginPath[6]);
-		} catch (java.net.MalformedURLException e) {
-			fail("0.0.1 Unexpected exception - " + e.getMessage());
-		}
-	
-		IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-	
-		// We should have 6 plugins all with id 'tests.a'
-		IPluginDescriptor[] all = registry.getPluginDescriptors();
-		assertTrue(i + ".0", all.length == 6);
-		assertTrue(i + ".1", all[0].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".2", all[1].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".3", all[2].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".4", all[3].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".5", all[4].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".6", all[5].getUniqueIdentifier().equals("tests.a"));
-	
-		// Make sure we got all the version numbers
-		IPluginDescriptor pd125 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.5"));
-		IPluginDescriptor pd128 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.8"));
-		IPluginDescriptor pd123 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.3"));
-		IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-		IPluginDescriptor pd300 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.0"));
-		IPluginDescriptor pd453 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("4.5.3"));
-		assertNotNull(i + ".7", pd125);
-		assertNotNull(i + ".8", pd128);
-		assertNotNull(i + ".9", pd123);
-		assertNotNull(i + ".10", pd130);
-		assertNotNull(i + ".11", pd300);
-		assertNotNull(i + ".12", pd453);
-	
-		// Check the fragment list.  There should only be one
-		PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-		assertTrue(i + ".13", fragments.length == 1);
-		assertTrue(i + ".14", fragments[0].getId().equals("fragmentTest"));
-		assertTrue(i + ".15", fragments[0].getPluginVersion().equals(fragmentIds[i]));
-		
-		if (matchesPlugin[i]) {		
-			// Now make sure we hooked this fragment to the right plugin (and only
-			// one plugin)
-			PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-			PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-			PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-			PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-			PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-			PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-			assertNull(i + ".16", linkedFragments125);
-			assertNull(i + ".17", linkedFragments128);
-			assertNull(i + ".18", linkedFragments123);
-			assertNull(i + ".19", linkedFragments130);
-			assertNull(i + ".20", linkedFragments300);
-			assertNotNull(i + ".21", linkedFragments453);
-			assertTrue(i + ".22", linkedFragments453.length == 1);
-			assertTrue(i + ".23", linkedFragments453[0].getId().equals("fragmentTest"));
-			
-			// Finally, make sure the library entry in the fragment is
-			// now part of the proper plugin
-			ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-			ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-			ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-			ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-			ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-			ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-			assertTrue(i + ".24", libraries125.length == 0);
-			assertTrue(i + ".25", libraries128.length == 0);
-			assertTrue(i + ".26", libraries123.length == 0);
-			assertTrue(i + ".27", libraries130.length == 0);
-			assertTrue(i + ".28", libraries300.length == 0);
-			assertTrue(i + ".29", libraries453.length == 1);
-			assertTrue(i + ".30", ((Library)libraries453[0]).getName().equals("lib1.jar"));
-		} else {
-			// Now make sure we didn't hook this fragment to any plugin
-			PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-			PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-			PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-			PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-			PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-			PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-			assertNull(i + ".16", linkedFragments125);
-			assertNull(i + ".17", linkedFragments128);
-			assertNull(i + ".18", linkedFragments123);
-			assertNull(i + ".19", linkedFragments130);
-			assertNull(i + ".20", linkedFragments300);
-			assertNull(i + ".21", linkedFragments453);
-			
-			// Finally, make sure the library entry in the fragment is
-			// not part of any plugin
-			ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-			ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-			ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-			ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-			ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-			ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-			assertTrue(i + ".22", libraries125.length == 0);
-			assertTrue(i + ".23", libraries128.length == 0);
-			assertTrue(i + ".24", libraries123.length == 0);
-			assertTrue(i + ".25", libraries130.length == 0);
-			assertTrue(i + ".26", libraries300.length == 0);
-			assertTrue(i + ".27", libraries453.length == 0);
-		}
-	}
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_10("fullTest"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_11.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_11.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_11.java
deleted file mode 100644
index cb35ed4..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_11.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_11 extends EclipseWorkspaceTest {
-public FragmentResolveTest_11() {
-	super(null);
-}
-public FragmentResolveTest_11(String name) {
-	super(name);
-}
-
-static PluginRegistry doParsing(InternalFactory factory, URL[] pluginPath, boolean doResolve) {
-	PluginRegistry registry = (PluginRegistry) RegistryLoader.parseRegistry(pluginPath, factory, false);
-	if (doResolve)
-		// don't trim the disabled plugins for these tests
-		registry.resolve(false, true);
-	registry.markReadOnly();
-	registry.startup(null);
-	return registry;
-}
-
-public void fullTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[3];
-	String[] pluginPath = new String[3];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.11/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath[0]);
-	} catch (java.net.MalformedURLException e) {
-		fail("0.0.0 Unexpected exception - " + e.getMessage());
-	}
-	
-	try {
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.11/fragment1.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.11/fragment2.xml");
-		pluginURLs[1] = new URL (pluginPath[1]);
-		pluginURLs[2] = new URL (pluginPath[2]);
-	} catch (java.net.MalformedURLException e) {
-		fail("0.0.1 Unexpected exception - " + e.getMessage());
-	}
-
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 1 plugin
-	PluginDescriptorModel[] all = ((PluginRegistryModel)registry).getPlugins();
-	assertTrue("1.0", all.length == 1);
-	assertTrue("1.1", all[0].getId().equals("pluginOne"));
-	PluginDescriptorModel plugin = all[0];
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.2", fragments.length == 2);
-	assertTrue("1.3", fragments[0].getId().equals("fragmentOne"));
-	assertTrue("1.4", fragments[1].getId().equals("fragmentOne"));
-	
-	PluginFragmentModel[] pluginFragments = plugin.getFragments();
-	assertTrue("1.5", pluginFragments.length == 1);
-	assertTrue("1.6", pluginFragments[0].getId().equals("fragmentOne"));
-	assertTrue("1.7", pluginFragments[0].getVersion().equals("1.0.1"));
-	
-	LibraryModel[] libraries = plugin.getRuntime();
-	assertTrue("1.8", libraries.length == 2);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_11("fullTest"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_12.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_12.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_12.java
deleted file mode 100644
index 84494e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_12.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_12 extends EclipseWorkspaceTest {
-public FragmentResolveTest_12() {
-	super(null);
-}
-public FragmentResolveTest_12(String name) {
-	super(name);
-}
-
-static PluginRegistry doParsing(InternalFactory factory, URL[] pluginPath, boolean doResolve) {
-	PluginRegistry registry = (PluginRegistry) RegistryLoader.parseRegistry(pluginPath, factory, false);
-	if (doResolve)
-		// don't trim the disabled plugins for these tests
-		registry.resolve(false, true);
-	registry.markReadOnly();
-	registry.startup(null);
-	return registry;
-}
-
-public void fullTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[9];
-	String[] pluginPath = new String[9];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.12/plugin1.xml");
-	
-	try {
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.12/fragment1.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.12/fragment2.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.12/fragment3.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.12/fragment4.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.12/fragment5.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.12/fragment6.xml");
-		pluginPath[7] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.12/fragment7.xml");
-		pluginPath[8] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.12/fragment8.xml");
-		
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("0.0.0 Unexpected exception - " + e.getMessage());
-	}
-
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 1 plugin
-	PluginDescriptorModel[] all = ((PluginRegistryModel)registry).getPlugins();
-	assertTrue("1.0", all.length == 1);
-	assertTrue("1.1", all[0].getId().equals("pluginOne"));
-	PluginDescriptorModel plugin = all[0];
-
-	// Check the fragment list.  There should be eight
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.2", fragments.length == 8);
-	assertTrue("1.3", fragments[0].getId().equals("fragmentOne"));
-	assertTrue("1.4", fragments[1].getId().equals("fragmentOne"));
-	assertTrue("1.5", fragments[2].getId().equals("fragmentOne"));
-	assertTrue("1.6", fragments[3].getId().equals("fragmentOne"));
-	assertTrue("1.7", fragments[4].getId().equals("fragmentOne"));
-	assertTrue("1.8", fragments[5].getId().equals("fragmentOne"));
-	assertTrue("1.9", fragments[6].getId().equals("fragmentOne"));
-	assertTrue("1.10", fragments[7].getId().equals("fragmentOne"));
-	
-	// Only the latest one should hang off the plugin
-	PluginFragmentModel[] pluginFragments = plugin.getFragments();
-	assertTrue("1.11", pluginFragments.length == 1);
-	assertTrue("1.12", pluginFragments[0].getId().equals("fragmentOne"));
-	assertTrue("1.13", pluginFragments[0].getVersion().equals("1.7.2"));
-	
-	// But we should only have used fragment5.xml
-	LibraryModel[] libraries = plugin.getRuntime();
-	assertTrue("1.14", libraries.length == 5);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_12("fullTest"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_13.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_13.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_13.java
deleted file mode 100644
index c4fd81f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_13.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_13 extends EclipseWorkspaceTest {
-public FragmentResolveTest_13() {
-	super(null);
-}
-public FragmentResolveTest_13(String name) {
-	super(name);
-}
-
-static PluginRegistry doParsing(InternalFactory factory, URL[] pluginPath, boolean doResolve) {
-	PluginRegistry registry = (PluginRegistry) RegistryLoader.parseRegistry(pluginPath, factory, false);
-	if (doResolve)
-		// don't trim the disabled plugins for these tests
-		registry.resolve(false, true);
-	registry.markReadOnly();
-	registry.startup(null);
-	return registry;
-}
-
-public void fullTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[16];
-	String[] pluginPath = new String[16];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/plugin1.xml");
-	
-	try {
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment1.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment2.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment3.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment4.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment5.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment6.xml");
-		pluginPath[7] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment7.xml");
-		pluginPath[8] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment8.xml");
-		pluginPath[9] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment21.xml");
-		pluginPath[10] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment22.xml");
-		pluginPath[11] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment23.xml");
-		pluginPath[12] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment24.xml");
-		pluginPath[13] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment25.xml");
-		pluginPath[14] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment26.xml");
-		pluginPath[15] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.13/fragment27.xml");
-		
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("0.0.0 Unexpected exception - " + e.getMessage());
-	}
-
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 1 plugin
-	PluginDescriptorModel[] all = ((PluginRegistryModel)registry).getPlugins();
-	assertTrue("1.0", all.length == 1);
-	assertTrue("1.1", all[0].getId().equals("pluginOne"));
-	PluginDescriptorModel plugin = all[0];
-
-	// Check the fragment list.  There should be 15
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.2", fragments.length == 15);
-	
-	// Only 2 fragments should hang off the plugin
-	PluginFragmentModel[] pluginFragments = plugin.getFragments();
-	assertTrue("1.3", pluginFragments.length == 2);
-	PluginFragmentModel fragment1 = null;
-	PluginFragmentModel fragment2 = null;
-	for (int i = 0; i < pluginFragments.length; i++) {
-		if (pluginFragments[i].getId().equals("fragmentOne"))
-			fragment1 = pluginFragments[i];
-		else if (pluginFragments[i].getId().equals("fragmentTwo"))
-			fragment2 = pluginFragments[i];
-	}
-			
-	// Make sure we picked up both fragments
-	assertNotNull("1.4", fragment1);
-	assertNotNull("1.5", fragment2);
-	
-	// Make sure we picked up the right version for each fragment
-	assertTrue("1.6", fragment1.getVersion().equals("4.5.0"));
-	assertTrue("1.7", fragment2.getVersion().equals("3.0.0"));
-	
-	// But we should only have used fragment5.xml
-	LibraryModel[] libraries = plugin.getRuntime();
-	assertTrue("1.8", libraries.length == 4);
-	
-	// Make sure we got the right libraries
-	boolean lib1 = false;
-	boolean lib2 = false;
-	boolean lib3 = false;
-	boolean lib21 = false;
-	boolean somethingElse = false;
-	
-	for (int i = 0; i < libraries.length; i++) {
-		String libName = libraries[i].getName();
-		if (libName.equals("lib1.jar"))
-			lib1 = true;
-		else if (libName.equals("lib2.jar"))
-			lib2 = true;
-		else if (libName.equals("lib3.jar"))
-			lib3 = true;
-		else if (libName.equals("lib21.jar"))
-			lib21 = true;
-		else
-			somethingElse = true;
-	}
-	assertTrue("1.9", lib1 && lib2 && lib3 && lib21 && !somethingElse);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_13("fullTest"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_2.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_2.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_2.java
deleted file mode 100644
index dd8e871..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_2.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_2 extends EclipseWorkspaceTest {
-public FragmentResolveTest_2() {
-	super(null);
-}
-public FragmentResolveTest_2(String name) {
-	super(name);
-}
-
-static PluginRegistry doParsing(InternalFactory factory, URL[] pluginPath, boolean doResolve) {
-	PluginRegistry registry = (PluginRegistry) RegistryLoader.parseRegistry(pluginPath, factory, false);
-	if (doResolve)
-		// don't trim the disabled plugins for these tests
-		registry.resolve(false, true);
-	registry.markReadOnly();
-	registry.startup(null);
-	return registry;
-}
-
-public void test1() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/fragment1.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 4);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("1.5", pd124);
-	assertNotNull("1.6", pd130);
-	assertNotNull("1.7", pd240);
-	assertNotNull("1.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.9", fragments.length == 1);
-	assertTrue("1.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.11", fragments[0].getPluginVersion().equals("1.2.3"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("1.12", linkedFragments124);
-	assertNotNull("1.13", linkedFragments130);
-	assertNull("1.14", linkedFragments240);
-	assertNull("1.15", linkedFragments110);
-	assertTrue("1.16", linkedFragments130.length == 1);
-	assertTrue("1.17", linkedFragments130[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("1.18", libraries124.length == 0);
-	assertTrue("1.19", libraries130.length == 1);
-	assertTrue("1.20", libraries240.length == 0);
-	assertTrue("1.21", libraries110.length == 0);
-	assertTrue("1.22", ((Library)libraries130[0]).getName().equals("lib1.jar"));
-}
-
-public void test2() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/fragment2.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("2.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("2.0", all.length == 4);
-	assertTrue("2.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("2.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("2.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("2.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("2.5", pd124);
-	assertNotNull("2.6", pd130);
-	assertNotNull("2.7", pd240);
-	assertNotNull("2.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("2.9", fragments.length == 1);
-	assertTrue("2.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("2.11", fragments[0].getPluginVersion().equals("1.0.0"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("2.12", linkedFragments124);
-	assertNotNull("2.13", linkedFragments130);
-	assertNull("2.14", linkedFragments240);
-	assertNull("2.15", linkedFragments110);
-	assertTrue("2.16", linkedFragments130.length == 1);
-	assertTrue("2.17", linkedFragments130[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("2.18", libraries124.length == 0);
-	assertTrue("2.19", libraries130.length == 1);
-	assertTrue("2.20", libraries240.length == 0);
-	assertTrue("2.21", libraries110.length == 0);
-	assertTrue("2.22", ((Library)libraries130[0]).getName().equals("lib1.jar"));
-}
-
-public void test3() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/fragment3.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("3.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("3.0", all.length == 4);
-	assertTrue("3.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("3.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("3.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("3.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("3.5", pd124);
-	assertNotNull("3.6", pd130);
-	assertNotNull("3.7", pd240);
-	assertNotNull("3.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("3.9", fragments.length == 1);
-	assertTrue("3.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("3.11", fragments[0].getPluginVersion().equals("2.1.1"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("3.12", linkedFragments124);
-	assertNull("3.13", linkedFragments130);
-	assertNotNull("3.14", linkedFragments240);
-	assertNull("3.15", linkedFragments110);
-	assertTrue("3.16", linkedFragments240.length == 1);
-	assertTrue("3.17", linkedFragments240[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("3.18", libraries124.length == 0);
-	assertTrue("3.19", libraries130.length == 0);
-	assertTrue("3.20", libraries240.length == 1);
-	assertTrue("3.21", libraries110.length == 0);
-	assertTrue("3.22", ((Library)libraries240[0]).getName().equals("lib1.jar"));
-}
-
-public void test4() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/fragment4.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("4.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("4.0", all.length == 4);
-	assertTrue("4.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("4.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("4.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("4.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("4.5", pd124);
-	assertNotNull("4.6", pd130);
-	assertNotNull("4.7", pd240);
-	assertNotNull("4.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("4.9", fragments.length == 1);
-	assertTrue("4.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("4.11", fragments[0].getPluginVersion().equals("2.5.0"));
-	
-	// Now make sure we didn't hood this fragment anywhere
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("4.12", linkedFragments124);
-	assertNull("4.13", linkedFragments130);
-	assertNull("4.14", linkedFragments240);
-	assertNull("4.15", linkedFragments110);
-	
-	// Finally, make sure the library entry didn't show
-	// up in any of the plugins
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("4.16", libraries124.length == 0);
-	assertTrue("4.17", libraries130.length == 0);
-	assertTrue("4.18", libraries240.length == 0);
-	assertTrue("4.19", libraries110.length == 0);
-}
-
-public void test5() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/fragment5.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("5.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("5.0", all.length == 4);
-	assertTrue("5.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("5.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("5.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("5.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("5.5", pd124);
-	assertNotNull("5.6", pd130);
-	assertNotNull("5.7", pd240);
-	assertNotNull("5.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("5.9", fragments.length == 1);
-	assertTrue("5.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("5.11", fragments[0].getPluginVersion().equals("1.2.4"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("5.12", linkedFragments124);
-	assertNotNull("5.13", linkedFragments130);
-	assertNull("5.14", linkedFragments240);
-	assertNull("5.15", linkedFragments110);
-	assertTrue("5.16", linkedFragments130.length == 1);
-	assertTrue("5.17", linkedFragments130[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("5.18", libraries124.length == 0);
-	assertTrue("5.19", libraries130.length == 1);
-	assertTrue("5.20", libraries240.length == 0);
-	assertTrue("5.21", libraries110.length == 0);
-	assertTrue("5.22", ((Library)libraries130[0]).getName().equals("lib1.jar"));
-}
-
-public void test6() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/fragment6.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("6.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("6.0", all.length == 4);
-	assertTrue("6.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("6.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("6.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("6.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("6.5", pd124);
-	assertNotNull("6.6", pd130);
-	assertNotNull("6.7", pd240);
-	assertNotNull("6.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("6.9", fragments.length == 1);
-	assertTrue("6.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("6.11", fragments[0].getPluginVersion().equals("3.0.0"));
-	
-	// Now make sure we didn't hook this fragment anywhere
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("6.12", linkedFragments124);
-	assertNull("6.13", linkedFragments130);
-	assertNull("6.14", linkedFragments240);
-	assertNull("6.15", linkedFragments110);
-	
-	// Finally, make sure the library entry in the fragment doesn't
-	// show up in any of the plugins
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("6.16", libraries124.length == 0);
-	assertTrue("6.17", libraries130.length == 0);
-	assertTrue("6.18", libraries240.length == 0);
-	assertTrue("6.19", libraries110.length == 0);
-}
-
-public void test7() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.2/fragment7.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("7.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("7.0", all.length == 4);
-	assertTrue("7.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("7.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("7.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("7.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("7.5", pd124);
-	assertNotNull("7.6", pd130);
-	assertNotNull("7.7", pd240);
-	assertNotNull("7.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("7.9", fragments.length == 1);
-	assertTrue("7.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("7.11", fragments[0].getPluginVersion().equals("2.4.0"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("7.12", linkedFragments124);
-	assertNull("7.13", linkedFragments130);
-	assertNotNull("7.14", linkedFragments240);
-	assertNull("7.15", linkedFragments110);
-	assertTrue("7.16", linkedFragments240.length == 1);
-	assertTrue("7.17", linkedFragments240[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("7.18", libraries124.length == 0);
-	assertTrue("7.19", libraries130.length == 0);
-	assertTrue("7.20", libraries240.length == 1);
-	assertTrue("7.21", libraries110.length == 0);
-	assertTrue("7.22", ((Library)libraries240[0]).getName().equals("lib1.jar"));
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_2("test1"));
-	suite.addTest(new FragmentResolveTest_2("test2"));
-	suite.addTest(new FragmentResolveTest_2("test3"));
-	suite.addTest(new FragmentResolveTest_2("test4"));
-	suite.addTest(new FragmentResolveTest_2("test5"));
-	suite.addTest(new FragmentResolveTest_2("test6"));
-	suite.addTest(new FragmentResolveTest_2("test7"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_3.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_3.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_3.java
deleted file mode 100644
index 2575cbb..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_3.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_3 extends EclipseWorkspaceTest {
-public FragmentResolveTest_3() {
-	super(null);
-}
-public FragmentResolveTest_3(String name) {
-	super(name);
-}
-
-public void fullTest() {
-	String[] fragmentIds = {"1.2.1", "1.2.2", "1.2.0", "1.1.0", 
-		"1.1.1", "1.5.0", "1.5.1", "3.0.0", "3.2.1"}; 
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	for (int i = 0; i < fragmentIds.length; i++) {
-		URL pluginURLs[] = new URL[2];
-		try {
-			PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-			String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.3/plugin1.xml");
-			pluginURLs[0] = new URL (pluginPath);
-			pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.3/fragment" + (i + 1) + ".xml");
-			pluginURLs[1] = new URL (pluginPath);
-		} catch (java.net.MalformedURLException e) {
-			fail("0.0 Unexpected exception - " + e.getMessage());
-		}
-		IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-		IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-	
-		// check descriptor
-		assertNotNull(i + ".0", pd);
-		assertTrue(i + ".1", pd.getUniqueIdentifier().equals("tests.a"));
-	
-		// check to see if we have all plugins
-		IPluginDescriptor[] all = registry.getPluginDescriptors();
-		assertTrue(i + ".2", all.length == 1);
-		assertTrue(i + ".3", all[0].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.1")));
-	
-		// Check the fragment list.  There should only be one
-		PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-		assertTrue(i + ".5", fragment.length == 1);
-		assertTrue(i + ".6", fragment[0].getId().equals("fragmentTest"));
-		
-		// Have we got all the fragments
-		PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-		assertTrue(i + ".7", fragments.length == 1);
-		assertTrue(i + ".8", fragments[0].getId().equals("fragmentTest"));
-		assertTrue(i + ".9", fragments[0].getPluginVersion().equals(fragmentIds[i]));
-		
-		if (fragmentIds[i].equals("1.2.1")) {
-			// Now make sure we hooked this fragment and this plugin
-			PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-			assertNotNull(i + ".10", linkedFragments);
-			assertTrue(i + ".11", linkedFragments.length == 1);
-			assertTrue(i + ".12", linkedFragments[0].getId().equals("fragmentTest"));
-			
-			// Finally, make sure the library entry in the fragment is
-			// now part of the plugin
-			ILibrary[] libraries = pd.getRuntimeLibraries();
-			assertTrue(i + ".13", libraries.length == 1);
-			assertTrue(i + ".14", ((Library)libraries[0]).getName().equals("lib1.jar"));
-		} else {
-			// Now make sure we didn't hook this fragment and this plugin.
-			PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-			assertNull(i + ".10", linkedFragments);
-			
-			// Finally, make sure the library entry in the fragment is
-			// not part of the plugin
-			ILibrary[] libraries = pd.getRuntimeLibraries();
-			assertTrue(i + ".11", libraries.length == 0);
-		}
-	}
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_3("fullTest"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_4.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_4.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_4.java
deleted file mode 100644
index 34cd330..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_4.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_4 extends EclipseWorkspaceTest {
-public FragmentResolveTest_4() {
-	super(null);
-}
-public FragmentResolveTest_4(String name) {
-	super(name);
-}
-
-static PluginRegistry doParsing(InternalFactory factory, URL[] pluginPath, boolean doResolve) {
-	PluginRegistry registry = (PluginRegistry) RegistryLoader.parseRegistry(pluginPath, factory, false);
-	if (doResolve)
-		// don't trim the disabled plugins for these tests
-		registry.resolve(false, true);
-	registry.markReadOnly();
-	registry.startup(null);
-	return registry;
-}
-
-public void fullTest() {
-	String[] fragmentIds = {"1.2.1", "1.2.2", "1.2.0", "1.1.0", 
-		"1.1.1", "1.5.0", "1.5.1", "3.0.0", "3.2.1"}; 
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[6];
-	String[] pluginPath = new String[6];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.4/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.4/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.4/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.4/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.4/plugin5.xml");
-		for (int i = 0; i < pluginPath.length - 1; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("0.0.0 Unexpected exception - " + e.getMessage());
-	}
-	
-	for (int i = 0; i < fragmentIds.length; i++) {
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.4/fragment" + (i + 1) + ".xml");
-		try {
-			pluginURLs[5] = new URL (pluginPath[5]);
-		} catch (java.net.MalformedURLException e) {
-			fail("0.0.1 Unexpected exception - " + e.getMessage());
-		}
-		IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-	
-		// We should have 5 plugins all with id 'tests.a'
-		IPluginDescriptor[] all = registry.getPluginDescriptors();
-		assertTrue(i + ".0", all.length == 5);
-		assertTrue(i + ".1", all[0].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".2", all[1].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".3", all[2].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".4", all[3].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".5", all[4].getUniqueIdentifier().equals("tests.a"));
-	
-		// Make sure we got all the version numbers
-		IPluginDescriptor pd121 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.1"));
-		IPluginDescriptor pd140 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.4.0"));
-		IPluginDescriptor pd117 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.7"));
-		IPluginDescriptor pd302 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.2"));
-		IPluginDescriptor pd021 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("0.2.1"));
-		assertNotNull(i + ".6", pd121);
-		assertNotNull(i + ".7", pd140);
-		assertNotNull(i + ".8", pd117);
-		assertNotNull(i + ".9", pd302);
-		assertNotNull(i + ".10", pd021);
-	
-		// Check the fragment list.  There should only be one
-		PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-		assertTrue(i + ".11", fragments.length == 1);
-		assertTrue(i + ".12", fragments[0].getId().equals("fragmentTest"));
-		assertTrue(i + ".13", fragments[0].getPluginVersion().equals(fragmentIds[i]));
-		
-		if (fragmentIds[i].equals("1.2.1")) {
-			// Now make sure we hooked this fragment to the right plugin (and only
-			// one plugin)
-			PluginFragmentModel[] linkedFragments121 = ((PluginDescriptorModel)pd121).getFragments();
-			PluginFragmentModel[] linkedFragments140 = ((PluginDescriptorModel)pd140).getFragments();
-			PluginFragmentModel[] linkedFragments117 = ((PluginDescriptorModel)pd117).getFragments();
-			PluginFragmentModel[] linkedFragments302 = ((PluginDescriptorModel)pd302).getFragments();
-			PluginFragmentModel[] linkedFragments021 = ((PluginDescriptorModel)pd021).getFragments();
-			assertNotNull(i + ".14", linkedFragments121);
-			assertNull(i + ".15", linkedFragments140);
-			assertNull(i + ".16", linkedFragments117);
-			assertNull(i + ".17", linkedFragments302);
-			assertNull(i + ".18", linkedFragments021);
-			assertTrue(i + ".19", linkedFragments121.length == 1);
-			assertTrue(i + ".20", linkedFragments121[0].getId().equals("fragmentTest"));
-			
-			// Finally, make sure the library entry in the fragment is
-			// now part of the proper plugin
-			ILibrary[] libraries121 = pd121.getRuntimeLibraries();
-			ILibrary[] libraries140 = pd140.getRuntimeLibraries();
-			ILibrary[] libraries117 = pd117.getRuntimeLibraries();
-			ILibrary[] libraries302 = pd302.getRuntimeLibraries();
-			ILibrary[] libraries021 = pd021.getRuntimeLibraries();
-			assertTrue(i + ".21", libraries121.length == 1);
-			assertTrue(i + ".22", libraries140.length == 0);
-			assertTrue(i + ".23", libraries117.length == 0);
-			assertTrue(i + ".24", libraries302.length == 0);
-			assertTrue(i + ".25", libraries021.length == 0);
-			assertTrue(i + ".26", ((Library)libraries121[0]).getName().equals("lib1.jar"));
-		} else {
-			// Now make sure we didn't hook this fragment to any plugin
-			PluginFragmentModel[] linkedFragments121 = ((PluginDescriptorModel)pd121).getFragments();
-			PluginFragmentModel[] linkedFragments140 = ((PluginDescriptorModel)pd140).getFragments();
-			PluginFragmentModel[] linkedFragments117 = ((PluginDescriptorModel)pd117).getFragments();
-			PluginFragmentModel[] linkedFragments302 = ((PluginDescriptorModel)pd302).getFragments();
-			PluginFragmentModel[] linkedFragments021 = ((PluginDescriptorModel)pd021).getFragments();
-			assertNull(i + ".14", linkedFragments121);
-			assertNull(i + ".15", linkedFragments140);
-			assertNull(i + ".16", linkedFragments117);
-			assertNull(i + ".17", linkedFragments302);
-			assertNull(i + ".18", linkedFragments021);
-			
-			// Finally, make sure the library entry in the fragment is
-			// not part of the proper plugin
-			ILibrary[] libraries121 = pd121.getRuntimeLibraries();
-			ILibrary[] libraries140 = pd140.getRuntimeLibraries();
-			ILibrary[] libraries117 = pd117.getRuntimeLibraries();
-			ILibrary[] libraries302 = pd302.getRuntimeLibraries();
-			ILibrary[] libraries021 = pd021.getRuntimeLibraries();
-			assertTrue(i + ".19", libraries121.length == 0);
-			assertTrue(i + ".20", libraries140.length == 0);
-			assertTrue(i + ".21", libraries117.length == 0);
-			assertTrue(i + ".22", libraries302.length == 0);
-			assertTrue(i + ".23", libraries021.length == 0);
-		}
-	}
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_4("fullTest"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_5.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_5.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_5.java
deleted file mode 100644
index 5d1bbff..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_5.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_5 extends EclipseWorkspaceTest {
-public FragmentResolveTest_5() {
-	super(null);
-}
-public FragmentResolveTest_5(String name) {
-	super(name);
-}
-
-public void fullTest() {
-	String[] fragmentIds = {"1.3.2", "1.3.7", "1.2.5", "1.2.8",
-		"1.2.2", "1.2.0", "1.1.5", "1.1.0", "1.3.5", "3.0.0", "3.2.5", "3.2.4"}; 
-	boolean[] matchesFragment = {false, false, true, false,
-		true, true, false, false, false, false, false, false};
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	for (int i = 0; i < fragmentIds.length; i++) {
-		URL pluginURLs[] = new URL[2];
-		try {
-			PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-			String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.5/plugin1.xml");
-			pluginURLs[0] = new URL (pluginPath);
-			pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.5/fragment" + (i + 1) + ".xml");
-			pluginURLs[1] = new URL (pluginPath);
-		} catch (java.net.MalformedURLException e) {
-			fail("0.0.0 Unexpected exception - " + e.getMessage());
-		}
-		IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-		IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-	
-		// check descriptor
-		assertNotNull(i + ".0", pd);
-		assertTrue(i + ".1", pd.getUniqueIdentifier().equals("tests.a"));
-	
-		// check to see if we have all plugins
-		IPluginDescriptor[] all = registry.getPluginDescriptors();
-		assertTrue(i + ".2", all.length == 1);
-		assertTrue(i + ".3", all[0].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.5")));
-	
-		// Check the fragment list.  There should only be one
-		PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-		assertTrue(i + ".5", fragment.length == 1);
-		assertTrue(i + ".6", fragment[0].getId().equals("fragmentTest"));
-		
-		// Have we got all the fragments
-		PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-		assertTrue(i + ".7", fragments.length == 1);
-		assertTrue(i + ".8", fragments[0].getId().equals("fragmentTest"));
-		assertTrue(i + ".9", fragments[0].getPluginVersion().equals(fragmentIds[i]));
-		
-		if (matchesFragment[i]) {
-			// Now make sure we hooked this fragment and this plugin
-			PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-			assertNotNull(i + ".10", linkedFragments);
-			assertTrue(i + ".11", linkedFragments.length == 1);
-			assertTrue(i + ".12", linkedFragments[0].getId().equals("fragmentTest"));
-			
-			// Finally, make sure the library entry in the fragment is
-			// now part of the plugin
-			ILibrary[] libraries = pd.getRuntimeLibraries();
-			assertTrue(i + ".13", libraries.length == 1);
-			assertTrue(i + ".14", ((Library)libraries[0]).getName().equals("lib1.jar"));
-		} else {
-			// Now make sure we didn't hook this fragment and this plugin.
-			PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-			assertNull(i + ".10", linkedFragments);
-			
-			// Finally, make sure the library entry in the fragment is
-			// not part of the plugin
-			ILibrary[] libraries = pd.getRuntimeLibraries();
-			assertTrue(i + ".11", libraries.length == 0);
-		}
-	}
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_5("fullTest"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_6.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_6.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_6.java
deleted file mode 100644
index f1c655c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_6.java
+++ /dev/null
@@ -1,815 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_6 extends EclipseWorkspaceTest {
-public FragmentResolveTest_6() {
-	super(null);
-}
-public FragmentResolveTest_6(String name) {
-	super(name);
-}
-
-static PluginRegistry doParsing(InternalFactory factory, URL[] pluginPath, boolean doResolve) {
-	PluginRegistry registry = (PluginRegistry) RegistryLoader.parseRegistry(pluginPath, factory, false);
-	if (doResolve)
-		// don't trim the disabled plugins for these tests
-		registry.resolve(false, true);
-	registry.markReadOnly();
-	registry.startup(null);
-	return registry;
-}
-
-public void test1() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[7];
-	String[] pluginPath = new String[7];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin5.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin6.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/fragment1.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 5 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 6);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.5", all[4].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.6", all[5].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd125 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.5"));
-	IPluginDescriptor pd128 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.8"));
-	IPluginDescriptor pd123 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.3"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd300 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.0"));
-	IPluginDescriptor pd453 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("4.5.3"));
-	assertNotNull("1.7", pd125);
-	assertNotNull("1.8", pd128);
-	assertNotNull("1.9", pd123);
-	assertNotNull("1.10", pd130);
-	assertNotNull("1.11", pd300);
-	assertNotNull("1.12", pd453);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.13", fragments.length == 1);
-	assertTrue("1.14", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.15", fragments[0].getPluginVersion().equals("5.9.8"));
-	
-	// Now make sure we didn't hook this fragment to any plugin
-	PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-	PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-	PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-	PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-	assertNull("1.16", linkedFragments125);
-	assertNull("1.17", linkedFragments128);
-	assertNull("1.18", linkedFragments123);
-	assertNull("1.19", linkedFragments130);
-	assertNull("1.20", linkedFragments300);
-	assertNull("1.21", linkedFragments453);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of any plugin
-	ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-	ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-	ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-	ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-	assertTrue("1.22", libraries125.length == 0);
-	assertTrue("1.23", libraries128.length == 0);
-	assertTrue("1.24", libraries123.length == 0);
-	assertTrue("1.25", libraries130.length == 0);
-	assertTrue("1.26", libraries300.length == 0);
-	assertTrue("1.27", libraries453.length == 0);
-}
-
-public void test2() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[7];
-	String[] pluginPath = new String[7];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin5.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin6.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/fragment2.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 5 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 6);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.5", all[4].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.6", all[5].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd125 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.5"));
-	IPluginDescriptor pd128 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.8"));
-	IPluginDescriptor pd123 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.3"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd300 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.0"));
-	IPluginDescriptor pd453 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("4.5.3"));
-	assertNotNull("1.7", pd125);
-	assertNotNull("1.8", pd128);
-	assertNotNull("1.9", pd123);
-	assertNotNull("1.10", pd130);
-	assertNotNull("1.11", pd300);
-	assertNotNull("1.12", pd453);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.13", fragments.length == 1);
-	assertTrue("1.14", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.15", fragments[0].getPluginVersion().equals("1.2.3"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-	PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-	PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-	PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-	assertNull("1.16", linkedFragments125);
-	assertNotNull("1.17", linkedFragments128);
-	assertNull("1.18", linkedFragments123);
-	assertNull("1.19", linkedFragments130);
-	assertNull("1.20", linkedFragments300);
-	assertNull("1.21", linkedFragments453);
-	assertTrue("1.22", linkedFragments128.length == 1);
-	assertTrue("1.23", linkedFragments128[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-	ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-	ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-	ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-	assertTrue("1.24", libraries125.length == 0);
-	assertTrue("1.25", libraries128.length == 1);
-	assertTrue("1.26", libraries123.length == 0);
-	assertTrue("1.27", libraries130.length == 0);
-	assertTrue("1.28", libraries300.length == 0);
-	assertTrue("1.29", libraries453.length == 0);
-	assertTrue("1.30", ((Library)libraries128[0]).getName().equals("lib1.jar"));
-}
-
-public void test3() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[7];
-	String[] pluginPath = new String[7];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin5.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin6.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/fragment3.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 5 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 6);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.5", all[4].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.6", all[5].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd125 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.5"));
-	IPluginDescriptor pd128 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.8"));
-	IPluginDescriptor pd123 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.3"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd300 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.0"));
-	IPluginDescriptor pd453 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("4.5.3"));
-	assertNotNull("1.7", pd125);
-	assertNotNull("1.8", pd128);
-	assertNotNull("1.9", pd123);
-	assertNotNull("1.10", pd130);
-	assertNotNull("1.11", pd300);
-	assertNotNull("1.12", pd453);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.13", fragments.length == 1);
-	assertTrue("1.14", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.15", fragments[0].getPluginVersion().equals("1.2.4"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-	PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-	PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-	PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-	assertNull("1.16", linkedFragments125);
-	assertNotNull("1.17", linkedFragments128);
-	assertNull("1.18", linkedFragments123);
-	assertNull("1.19", linkedFragments130);
-	assertNull("1.20", linkedFragments300);
-	assertNull("1.21", linkedFragments453);
-	assertTrue("1.22", linkedFragments128.length == 1);
-	assertTrue("1.23", linkedFragments128[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-	ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-	ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-	ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-	assertTrue("1.24", libraries125.length == 0);
-	assertTrue("1.25", libraries128.length == 1);
-	assertTrue("1.26", libraries123.length == 0);
-	assertTrue("1.27", libraries130.length == 0);
-	assertTrue("1.28", libraries300.length == 0);
-	assertTrue("1.29", libraries453.length == 0);
-	assertTrue("1.30", ((Library)libraries128[0]).getName().equals("lib1.jar"));
-}
-
-public void test4() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[7];
-	String[] pluginPath = new String[7];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin5.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin6.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/fragment4.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 5 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 6);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.5", all[4].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.6", all[5].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd125 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.5"));
-	IPluginDescriptor pd128 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.8"));
-	IPluginDescriptor pd123 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.3"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd300 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.0"));
-	IPluginDescriptor pd453 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("4.5.3"));
-	assertNotNull("1.7", pd125);
-	assertNotNull("1.8", pd128);
-	assertNotNull("1.9", pd123);
-	assertNotNull("1.10", pd130);
-	assertNotNull("1.11", pd300);
-	assertNotNull("1.12", pd453);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.13", fragments.length == 1);
-	assertTrue("1.14", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.15", fragments[0].getPluginVersion().equals("2.0.0"));
-	
-	// Now make sure we didn't hook this fragment to any plugin
-	PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-	PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-	PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-	PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-	assertNull("1.16", linkedFragments125);
-	assertNull("1.17", linkedFragments128);
-	assertNull("1.18", linkedFragments123);
-	assertNull("1.19", linkedFragments130);
-	assertNull("1.20", linkedFragments300);
-	assertNull("1.21", linkedFragments453);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of any plugin
-	ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-	ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-	ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-	ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-	assertTrue("1.22", libraries125.length == 0);
-	assertTrue("1.23", libraries128.length == 0);
-	assertTrue("1.24", libraries123.length == 0);
-	assertTrue("1.25", libraries130.length == 0);
-	assertTrue("1.26", libraries300.length == 0);
-	assertTrue("1.27", libraries453.length == 0);
-}
-
-public void test5() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[7];
-	String[] pluginPath = new String[7];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin5.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin6.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/fragment5.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 5 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 6);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.5", all[4].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.6", all[5].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd125 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.5"));
-	IPluginDescriptor pd128 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.8"));
-	IPluginDescriptor pd123 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.3"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd300 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.0"));
-	IPluginDescriptor pd453 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("4.5.3"));
-	assertNotNull("1.7", pd125);
-	assertNotNull("1.8", pd128);
-	assertNotNull("1.9", pd123);
-	assertNotNull("1.10", pd130);
-	assertNotNull("1.11", pd300);
-	assertNotNull("1.12", pd453);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.13", fragments.length == 1);
-	assertTrue("1.14", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.15", fragments[0].getPluginVersion().equals("3.0.4"));
-	
-	// Now make sure we didn't hook this fragment to any plugin
-	PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-	PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-	PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-	PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-	assertNull("1.16", linkedFragments125);
-	assertNull("1.17", linkedFragments128);
-	assertNull("1.18", linkedFragments123);
-	assertNull("1.19", linkedFragments130);
-	assertNull("1.20", linkedFragments300);
-	assertNull("1.21", linkedFragments453);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of any plugin
-	ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-	ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-	ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-	ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-	assertTrue("1.22", libraries125.length == 0);
-	assertTrue("1.23", libraries128.length == 0);
-	assertTrue("1.24", libraries123.length == 0);
-	assertTrue("1.25", libraries130.length == 0);
-	assertTrue("1.26", libraries300.length == 0);
-	assertTrue("1.27", libraries453.length == 0);
-}
-
-public void test6() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[7];
-	String[] pluginPath = new String[7];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin5.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin6.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/fragment6.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 5 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 6);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.5", all[4].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.6", all[5].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd125 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.5"));
-	IPluginDescriptor pd128 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.8"));
-	IPluginDescriptor pd123 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.3"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd300 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.0"));
-	IPluginDescriptor pd453 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("4.5.3"));
-	assertNotNull("1.7", pd125);
-	assertNotNull("1.8", pd128);
-	assertNotNull("1.9", pd123);
-	assertNotNull("1.10", pd130);
-	assertNotNull("1.11", pd300);
-	assertNotNull("1.12", pd453);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.13", fragments.length == 1);
-	assertTrue("1.14", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.15", fragments[0].getPluginVersion().equals("4.6.2"));
-	
-	// Now make sure we didn't hook this fragment to any plugin
-	PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-	PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-	PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-	PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-	assertNull("1.16", linkedFragments125);
-	assertNull("1.17", linkedFragments128);
-	assertNull("1.18", linkedFragments123);
-	assertNull("1.19", linkedFragments130);
-	assertNull("1.20", linkedFragments300);
-	assertNull("1.21", linkedFragments453);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of any plugin
-	ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-	ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-	ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-	ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-	assertTrue("1.22", libraries125.length == 0);
-	assertTrue("1.23", libraries128.length == 0);
-	assertTrue("1.24", libraries123.length == 0);
-	assertTrue("1.25", libraries130.length == 0);
-	assertTrue("1.26", libraries300.length == 0);
-	assertTrue("1.27", libraries453.length == 0);
-}
-
-public void test7() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[7];
-	String[] pluginPath = new String[7];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin5.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin6.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/fragment7.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 5 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 6);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.5", all[4].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.6", all[5].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd125 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.5"));
-	IPluginDescriptor pd128 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.8"));
-	IPluginDescriptor pd123 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.3"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd300 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.0"));
-	IPluginDescriptor pd453 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("4.5.3"));
-	assertNotNull("1.7", pd125);
-	assertNotNull("1.8", pd128);
-	assertNotNull("1.9", pd123);
-	assertNotNull("1.10", pd130);
-	assertNotNull("1.11", pd300);
-	assertNotNull("1.12", pd453);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.13", fragments.length == 1);
-	assertTrue("1.14", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.15", fragments[0].getPluginVersion().equals("4.5.8"));
-	
-	// Now make sure we didn't hook this fragment to any plugin
-	PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-	PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-	PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-	PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-	assertNull("1.16", linkedFragments125);
-	assertNull("1.17", linkedFragments128);
-	assertNull("1.18", linkedFragments123);
-	assertNull("1.19", linkedFragments130);
-	assertNull("1.20", linkedFragments300);
-	assertNull("1.21", linkedFragments453);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of any plugin
-	ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-	ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-	ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-	ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-	assertTrue("1.22", libraries125.length == 0);
-	assertTrue("1.23", libraries128.length == 0);
-	assertTrue("1.24", libraries123.length == 0);
-	assertTrue("1.25", libraries130.length == 0);
-	assertTrue("1.26", libraries300.length == 0);
-	assertTrue("1.27", libraries453.length == 0);
-}
-
-public void test8() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[7];
-	String[] pluginPath = new String[7];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin5.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin6.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/fragment8.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 5 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 6);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.5", all[4].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.6", all[5].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd125 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.5"));
-	IPluginDescriptor pd128 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.8"));
-	IPluginDescriptor pd123 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.3"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd300 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.0"));
-	IPluginDescriptor pd453 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("4.5.3"));
-	assertNotNull("1.7", pd125);
-	assertNotNull("1.8", pd128);
-	assertNotNull("1.9", pd123);
-	assertNotNull("1.10", pd130);
-	assertNotNull("1.11", pd300);
-	assertNotNull("1.12", pd453);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.13", fragments.length == 1);
-	assertTrue("1.14", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.15", fragments[0].getPluginVersion().equals("4.4.2"));
-	
-	// Now make sure we didn't hook this fragment to any plugin
-	PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-	PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-	PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-	PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-	assertNull("1.16", linkedFragments125);
-	assertNull("1.17", linkedFragments128);
-	assertNull("1.18", linkedFragments123);
-	assertNull("1.19", linkedFragments130);
-	assertNull("1.20", linkedFragments300);
-	assertNull("1.21", linkedFragments453);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of any plugin
-	ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-	ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-	ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-	ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-	assertTrue("1.22", libraries125.length == 0);
-	assertTrue("1.23", libraries128.length == 0);
-	assertTrue("1.24", libraries123.length == 0);
-	assertTrue("1.25", libraries130.length == 0);
-	assertTrue("1.26", libraries300.length == 0);
-	assertTrue("1.27", libraries453.length == 0);
-}
-
-public void test9() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[7];
-	String[] pluginPath = new String[7];
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	try {
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin5.xml");
-		pluginPath[5] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/plugin6.xml");
-		pluginPath[6] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.6/fragment9.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 5 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 6);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.5", all[4].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.6", all[5].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd125 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.5"));
-	IPluginDescriptor pd128 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.8"));
-	IPluginDescriptor pd123 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.3"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd300 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("3.0.0"));
-	IPluginDescriptor pd453 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("4.5.3"));
-	assertNotNull("1.7", pd125);
-	assertNotNull("1.8", pd128);
-	assertNotNull("1.9", pd123);
-	assertNotNull("1.10", pd130);
-	assertNotNull("1.11", pd300);
-	assertNotNull("1.12", pd453);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.13", fragments.length == 1);
-	assertTrue("1.14", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.15", fragments[0].getPluginVersion().equals("4.5.1"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments125 = ((PluginDescriptorModel)pd125).getFragments();
-	PluginFragmentModel[] linkedFragments128 = ((PluginDescriptorModel)pd128).getFragments();
-	PluginFragmentModel[] linkedFragments123 = ((PluginDescriptorModel)pd123).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments300 = ((PluginDescriptorModel)pd300).getFragments();
-	PluginFragmentModel[] linkedFragments453 = ((PluginDescriptorModel)pd453).getFragments();
-	assertNull("1.16", linkedFragments125);
-	assertNull("1.17", linkedFragments128);
-	assertNull("1.18", linkedFragments123);
-	assertNull("1.19", linkedFragments130);
-	assertNull("1.20", linkedFragments300);
-	assertNotNull("1.21", linkedFragments453);
-	assertTrue("1.22", linkedFragments453.length == 1);
-	assertTrue("1.23", linkedFragments453[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries125 = pd125.getRuntimeLibraries();
-	ILibrary[] libraries128 = pd128.getRuntimeLibraries();
-	ILibrary[] libraries123 = pd123.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries300 = pd300.getRuntimeLibraries();
-	ILibrary[] libraries453 = pd453.getRuntimeLibraries();
-	assertTrue("1.24", libraries125.length == 0);
-	assertTrue("1.25", libraries128.length == 0);
-	assertTrue("1.26", libraries123.length == 0);
-	assertTrue("1.27", libraries130.length == 0);
-	assertTrue("1.28", libraries300.length == 0);
-	assertTrue("1.29", libraries453.length == 1);
-	assertTrue("1.30", ((Library)libraries453[0]).getName().equals("lib1.jar"));
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_6("test1"));
-	suite.addTest(new FragmentResolveTest_6("test2"));
-	suite.addTest(new FragmentResolveTest_6("test3"));
-	suite.addTest(new FragmentResolveTest_6("test4"));
-	suite.addTest(new FragmentResolveTest_6("test5"));
-	suite.addTest(new FragmentResolveTest_6("test6"));
-	suite.addTest(new FragmentResolveTest_6("test7"));
-	suite.addTest(new FragmentResolveTest_6("test8"));
-	suite.addTest(new FragmentResolveTest_6("test9"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_7.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_7.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_7.java
deleted file mode 100644
index 9823344..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_7.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_7 extends EclipseWorkspaceTest {
-public FragmentResolveTest_7() {
-	super(null);
-}
-public FragmentResolveTest_7(String name) {
-	super(name);
-}
-
-public void test1() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/fragment1.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("1.0", pd);
-	assertTrue("1.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.2", all.length == 1);
-	assertTrue("1.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("1.5", fragment.length == 1);
-	assertTrue("1.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.7", fragments.length == 1);
-	assertTrue("1.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.9", fragments[0].getPluginVersion().equals("1.2.0"));
-	
-	// Now make sure we hooked this fragment and this plugin
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNotNull("1.10", linkedFragments);
-	assertTrue("1.11", linkedFragments.length == 1);
-	assertTrue("1.12", linkedFragments[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("1.13", libraries.length == 1);
-	assertTrue("1.14", ((Library)libraries[0]).getName().equals("lib1.jar"));
-}
-
-public void test2() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/fragment2.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("2.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("2.0", pd);
-	assertTrue("2.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("2.2", all.length == 1);
-	assertTrue("2.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("2.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("2.5", fragment.length == 1);
-	assertTrue("2.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("2.7", fragments.length == 1);
-	assertTrue("2.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("2.9", fragments[0].getPluginVersion().equals("1.3.0"));
-	
-	// Now make sure we didn't hook this fragment and this plugin (they aren't compatible)
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNull("2.10", linkedFragments);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("2.11", libraries.length == 0);
-}
-
-public void test3() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/fragment3.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("3.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("3.0", pd);
-	assertTrue("3.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("3.2", all.length == 1);
-	assertTrue("3.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("3.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("3.5", fragment.length == 1);
-	assertTrue("3.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("3.7", fragments.length == 1);
-	assertTrue("3.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("3.9", fragments[0].getPluginVersion().equals("1.1.0"));
-	
-	// Now make sure we hooked this fragment and this plugin
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNotNull("3.10", linkedFragments);
-	assertTrue("3.11", linkedFragments.length == 1);
-	assertTrue("3.12", linkedFragments[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("3.13", libraries.length == 1);
-	assertTrue("3.14", ((Library)libraries[0]).getName().equals("lib1.jar"));
-}
-
-public void test4() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/fragment4.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("4.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("4.0", pd);
-	assertTrue("4.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("4.2", all.length == 1);
-	assertTrue("4.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("4.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("4.5", fragment.length == 1);
-	assertTrue("4.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("4.7", fragments.length == 1);
-	assertTrue("4.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("4.9", fragments[0].getPluginVersion().equals("2.0.0"));
-	
-	// Now make sure we didn't hook this fragment and this plugin (they aren't compatible)
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNull("4.10", linkedFragments);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("4.11", libraries.length == 0);
-}
-
-public void test5() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/plugin1.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/fragment5.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("5.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("5.0", pd);
-	assertTrue("5.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("5.2", all.length == 1);
-	assertTrue("5.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("5.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("5.5", fragment.length == 1);
-	assertTrue("5.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("5.7", fragments.length == 1);
-	assertTrue("5.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("5.9", fragments[0].getPluginVersion().equals("1.2.1"));
-	
-	// Now make sure we didn't hook this fragment and this plugin.
-	// They are not compatible unless the service number is 0 in this case.
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNull("5.10", linkedFragments);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("5.11", libraries.length == 0);
-}
-
-public void test6() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/plugin2.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/fragment6.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("6.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("6.0", pd);
-	assertTrue("6.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("6.2", all.length == 1);
-	assertTrue("6.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("6.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.6")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("6.5", fragment.length == 1);
-	assertTrue("6.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("6.7", fragments.length == 1);
-	assertTrue("6.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("6.9", fragments[0].getPluginVersion().equals("1.2.4"));
-	
-	// Now make sure we hooked this fragment and this plugin
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNotNull("6.10", linkedFragments);
-	assertTrue("6.11", linkedFragments.length == 1);
-	assertTrue("6.12", linkedFragments[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("6.13", libraries.length == 1);
-	assertTrue("6.14", ((Library)libraries[0]).getName().equals("lib1.jar"));
-}
-
-public void test7() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[2];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/plugin2.xml");
-		pluginURLs[0] = new URL (pluginPath);
-		pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.7/fragment7.xml");
-		pluginURLs[1] = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("7.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-
-	// check descriptor
-	assertNotNull("7.0", pd);
-	assertTrue("7.1", pd.getUniqueIdentifier().equals("tests.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("7.2", all.length == 1);
-	assertTrue("7.3", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("7.4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.6")));
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-	assertTrue("7.5", fragment.length == 1);
-	assertTrue("7.6", fragment[0].getId().equals("fragmentTest"));
-	
-	// Have we got all the fragments
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("7.7", fragments.length == 1);
-	assertTrue("7.8", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("7.9", fragments[0].getPluginVersion().equals("1.2.8"));
-	
-	// Now make sure we didn't hook this fragment and this plugin
-	PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-	assertNull("7.10", linkedFragments);
-	
-	// Finally, make sure the library entry in the fragment is
-	// not part of the plugin
-	ILibrary[] libraries = pd.getRuntimeLibraries();
-	assertTrue("7.11", libraries.length == 0);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_7("test1"));
-	suite.addTest(new FragmentResolveTest_7("test2"));
-	suite.addTest(new FragmentResolveTest_7("test3"));
-	suite.addTest(new FragmentResolveTest_7("test4"));
-	suite.addTest(new FragmentResolveTest_7("test5"));
-	suite.addTest(new FragmentResolveTest_7("test6"));
-	suite.addTest(new FragmentResolveTest_7("test7"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_8.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_8.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_8.java
deleted file mode 100644
index 511706f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_8.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_8 extends EclipseWorkspaceTest {
-public FragmentResolveTest_8() {
-	super(null);
-}
-public FragmentResolveTest_8(String name) {
-	super(name);
-}
-
-static PluginRegistry doParsing(InternalFactory factory, URL[] pluginPath, boolean doResolve) {
-	PluginRegistry registry = (PluginRegistry) RegistryLoader.parseRegistry(pluginPath, factory, false);
-	if (doResolve)
-		// don't trim the disabled plugins for these tests
-		registry.resolve(false, true);
-	registry.markReadOnly();
-	registry.startup(null);
-	return registry;
-}
-
-public void test1() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/fragment1.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("1.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length == 4);
-	assertTrue("1.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("1.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("1.5", pd124);
-	assertNotNull("1.6", pd130);
-	assertNotNull("1.7", pd240);
-	assertNotNull("1.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("1.9", fragments.length == 1);
-	assertTrue("1.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("1.11", fragments[0].getPluginVersion().equals("1.2.3"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("1.12", linkedFragments124);
-	assertNotNull("1.13", linkedFragments130);
-	assertNull("1.14", linkedFragments240);
-	assertNull("1.15", linkedFragments110);
-	assertTrue("1.16", linkedFragments130.length == 1);
-	assertTrue("1.17", linkedFragments130[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("1.18", libraries124.length == 0);
-	assertTrue("1.19", libraries130.length == 1);
-	assertTrue("1.20", libraries240.length == 0);
-	assertTrue("1.21", libraries110.length == 0);
-	assertTrue("1.22", ((Library)libraries130[0]).getName().equals("lib1.jar"));
-}
-
-public void test2() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/fragment2.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("2.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("2.0", all.length == 4);
-	assertTrue("2.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("2.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("2.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("2.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("2.5", pd124);
-	assertNotNull("2.6", pd130);
-	assertNotNull("2.7", pd240);
-	assertNotNull("2.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("2.9", fragments.length == 1);
-	assertTrue("2.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("2.11", fragments[0].getPluginVersion().equals("1.0.0"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("2.12", linkedFragments124);
-	assertNotNull("2.13", linkedFragments130);
-	assertNull("2.14", linkedFragments240);
-	assertNull("2.15", linkedFragments110);
-	assertTrue("2.16", linkedFragments130.length == 1);
-	assertTrue("2.17", linkedFragments130[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("2.18", libraries124.length == 0);
-	assertTrue("2.19", libraries130.length == 1);
-	assertTrue("2.20", libraries240.length == 0);
-	assertTrue("2.21", libraries110.length == 0);
-	assertTrue("2.22", ((Library)libraries130[0]).getName().equals("lib1.jar"));
-}
-
-public void test3() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/fragment3.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("3.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("3.0", all.length == 4);
-	assertTrue("3.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("3.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("3.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("3.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("3.5", pd124);
-	assertNotNull("3.6", pd130);
-	assertNotNull("3.7", pd240);
-	assertNotNull("3.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("3.9", fragments.length == 1);
-	assertTrue("3.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("3.11", fragments[0].getPluginVersion().equals("2.1.1"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("3.12", linkedFragments124);
-	assertNull("3.13", linkedFragments130);
-	assertNotNull("3.14", linkedFragments240);
-	assertNull("3.15", linkedFragments110);
-	assertTrue("3.16", linkedFragments240.length == 1);
-	assertTrue("3.17", linkedFragments240[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("3.18", libraries124.length == 0);
-	assertTrue("3.19", libraries130.length == 0);
-	assertTrue("3.20", libraries240.length == 1);
-	assertTrue("3.21", libraries110.length == 0);
-	assertTrue("3.22", ((Library)libraries240[0]).getName().equals("lib1.jar"));
-}
-
-public void test4() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/fragment4.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("4.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("4.0", all.length == 4);
-	assertTrue("4.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("4.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("4.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("4.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("4.5", pd124);
-	assertNotNull("4.6", pd130);
-	assertNotNull("4.7", pd240);
-	assertNotNull("4.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("4.9", fragments.length == 1);
-	assertTrue("4.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("4.11", fragments[0].getPluginVersion().equals("2.5.0"));
-	
-	// Now make sure we didn't hood this fragment anywhere
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("4.12", linkedFragments124);
-	assertNull("4.13", linkedFragments130);
-	assertNull("4.14", linkedFragments240);
-	assertNull("4.15", linkedFragments110);
-	
-	// Finally, make sure the library entry didn't show
-	// up in any of the plugins
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("4.16", libraries124.length == 0);
-	assertTrue("4.17", libraries130.length == 0);
-	assertTrue("4.18", libraries240.length == 0);
-	assertTrue("4.19", libraries110.length == 0);
-}
-
-public void test5() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/fragment5.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("5.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("5.0", all.length == 4);
-	assertTrue("5.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("5.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("5.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("5.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("5.5", pd124);
-	assertNotNull("5.6", pd130);
-	assertNotNull("5.7", pd240);
-	assertNotNull("5.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("5.9", fragments.length == 1);
-	assertTrue("5.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("5.11", fragments[0].getPluginVersion().equals("1.2.4"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("5.12", linkedFragments124);
-	assertNotNull("5.13", linkedFragments130);
-	assertNull("5.14", linkedFragments240);
-	assertNull("5.15", linkedFragments110);
-	assertTrue("5.16", linkedFragments130.length == 1);
-	assertTrue("5.17", linkedFragments130[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("5.18", libraries124.length == 0);
-	assertTrue("5.19", libraries130.length == 1);
-	assertTrue("5.20", libraries240.length == 0);
-	assertTrue("5.21", libraries110.length == 0);
-	assertTrue("5.22", ((Library)libraries130[0]).getName().equals("lib1.jar"));
-}
-
-public void test6() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/fragment6.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("6.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("6.0", all.length == 4);
-	assertTrue("6.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("6.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("6.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("6.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("6.5", pd124);
-	assertNotNull("6.6", pd130);
-	assertNotNull("6.7", pd240);
-	assertNotNull("6.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("6.9", fragments.length == 1);
-	assertTrue("6.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("6.11", fragments[0].getPluginVersion().equals("3.0.0"));
-	
-	// Now make sure we didn't hook this fragment anywhere
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("6.12", linkedFragments124);
-	assertNull("6.13", linkedFragments130);
-	assertNull("6.14", linkedFragments240);
-	assertNull("6.15", linkedFragments110);
-	
-	// Finally, make sure the library entry in the fragment doesn't
-	// show up in any of the plugins
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("6.16", libraries124.length == 0);
-	assertTrue("6.17", libraries130.length == 0);
-	assertTrue("6.18", libraries240.length == 0);
-	assertTrue("6.19", libraries110.length == 0);
-}
-
-public void test7() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[5];
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String[] pluginPath = new String[5];
-		pluginPath[0] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin1.xml");
-		pluginPath[1] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin2.xml");
-		pluginPath[2] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin3.xml");
-		pluginPath[3] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/plugin4.xml");
-		pluginPath[4] = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.8/fragment7.xml");
-		for (int i = 0; i < pluginPath.length; i++) {
-			pluginURLs[i] = new URL (pluginPath[i]);
-		}
-	} catch (java.net.MalformedURLException e) {
-		fail("7.0.1 Unexpected exception - " + e.getMessage());
-	}
-	IPluginRegistry registry = doParsing(factory, pluginURLs, true);
-
-	// We should have 4 plugins all with id 'tests.a'
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("7.0", all.length == 4);
-	assertTrue("7.1", all[0].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("7.2", all[1].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("7.3", all[2].getUniqueIdentifier().equals("tests.a"));
-	assertTrue("7.4", all[3].getUniqueIdentifier().equals("tests.a"));
-
-	// Make sure we got all the version numbers
-	IPluginDescriptor pd124 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.2.4"));
-	IPluginDescriptor pd130 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.3.0"));
-	IPluginDescriptor pd240 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("2.4.0"));
-	IPluginDescriptor pd110 = registry.getPluginDescriptor("tests.a", new PluginVersionIdentifier("1.1.0"));
-	assertNotNull("7.5", pd124);
-	assertNotNull("7.6", pd130);
-	assertNotNull("7.7", pd240);
-	assertNotNull("7.8", pd110);
-
-	// Check the fragment list.  There should only be one
-	PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-	assertTrue("7.9", fragments.length == 1);
-	assertTrue("7.10", fragments[0].getId().equals("fragmentTest"));
-	assertTrue("7.11", fragments[0].getPluginVersion().equals("2.4.0"));
-	
-	// Now make sure we hooked this fragment to the right plugin (and only
-	// one plugin)
-	PluginFragmentModel[] linkedFragments124 = ((PluginDescriptorModel)pd124).getFragments();
-	PluginFragmentModel[] linkedFragments130 = ((PluginDescriptorModel)pd130).getFragments();
-	PluginFragmentModel[] linkedFragments240 = ((PluginDescriptorModel)pd240).getFragments();
-	PluginFragmentModel[] linkedFragments110 = ((PluginDescriptorModel)pd110).getFragments();
-	assertNull("7.12", linkedFragments124);
-	assertNull("7.13", linkedFragments130);
-	assertNotNull("7.14", linkedFragments240);
-	assertNull("7.15", linkedFragments110);
-	assertTrue("7.16", linkedFragments240.length == 1);
-	assertTrue("7.17", linkedFragments240[0].getId().equals("fragmentTest"));
-	
-	// Finally, make sure the library entry in the fragment is
-	// now part of the proper plugin
-	ILibrary[] libraries124 = pd124.getRuntimeLibraries();
-	ILibrary[] libraries130 = pd130.getRuntimeLibraries();
-	ILibrary[] libraries240 = pd240.getRuntimeLibraries();
-	ILibrary[] libraries110 = pd110.getRuntimeLibraries();
-	assertTrue("7.18", libraries124.length == 0);
-	assertTrue("7.19", libraries130.length == 0);
-	assertTrue("7.20", libraries240.length == 1);
-	assertTrue("7.21", libraries110.length == 0);
-	assertTrue("7.22", ((Library)libraries240[0]).getName().equals("lib1.jar"));
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_8("test1"));
-	suite.addTest(new FragmentResolveTest_8("test2"));
-	suite.addTest(new FragmentResolveTest_8("test3"));
-	suite.addTest(new FragmentResolveTest_8("test4"));
-	suite.addTest(new FragmentResolveTest_8("test5"));
-	suite.addTest(new FragmentResolveTest_8("test6"));
-	suite.addTest(new FragmentResolveTest_8("test7"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_9.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_9.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_9.java
deleted file mode 100644
index 1fe1cc8..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/FragmentResolveTest_9.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-
-public class FragmentResolveTest_9 extends EclipseWorkspaceTest {
-public FragmentResolveTest_9() {
-	super(null);
-}
-public FragmentResolveTest_9(String name) {
-	super(name);
-}
-
-public void fullTest() {
-	String[] fragmentIds = {"1.3.2", "1.3.7", "1.2.5", "1.2.8",
-		"1.2.2", "1.2.0", "1.1.5", "1.1.0", "1.3.5", "3.0.0", "3.2.5", "3.2.4"}; 
-	boolean[] matchesFragment = {false, false, true, false,
-		true, true, true, true, false, false, false, false};
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, "fragmentResolveTest", null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	for (int i = 0; i < fragmentIds.length; i++) {
-		URL pluginURLs[] = new URL[2];
-		try {
-			PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-			String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.9/plugin1.xml");
-			pluginURLs[0] = new URL (pluginPath);
-			pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/fragment.resolve.9/fragment" + (i + 1) + ".xml");
-			pluginURLs[1] = new URL (pluginPath);
-		} catch (java.net.MalformedURLException e) {
-			fail("0.0.1 Unexpected exception - " + e.getMessage());
-		}
-		IPluginRegistry registry = ParseHelper.doParsing(factory, pluginURLs, true);
-		IPluginDescriptor pd = registry.getPluginDescriptor("tests.a");
-	
-		// check descriptor
-		assertNotNull(i + ".0", pd);
-		assertTrue(i + ".1", pd.getUniqueIdentifier().equals("tests.a"));
-	
-		// check to see if we have all plugins
-		IPluginDescriptor[] all = registry.getPluginDescriptors();
-		assertTrue(i + ".2", all.length == 1);
-		assertTrue(i + ".3", all[0].getUniqueIdentifier().equals("tests.a"));
-		assertTrue(i + ".4", all[0].getVersionIdentifier().equals(new PluginVersionIdentifier("1.2.5")));
-	
-		// Check the fragment list.  There should only be one
-		PluginFragmentModel[] fragment = ((PluginRegistry) registry).getFragments("fragmentTest");
-		assertTrue(i + ".5", fragment.length == 1);
-		assertTrue(i + ".6", fragment[0].getId().equals("fragmentTest"));
-		
-		// Have we got all the fragments
-		PluginFragmentModel[] fragments = ((PluginRegistry)registry).getFragments();
-		assertTrue(i + ".7", fragments.length == 1);
-		assertTrue(i + ".8", fragments[0].getId().equals("fragmentTest"));
-		assertTrue(i + ".9", fragments[0].getPluginVersion().equals(fragmentIds[i]));
-		
-		if (matchesFragment[i]) {
-			// Now make sure we hooked this fragment and this plugin
-			PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-			assertNotNull(i + ".10", linkedFragments);
-			assertTrue(i + ".11", linkedFragments.length == 1);
-			assertTrue(i + ".12", linkedFragments[0].getId().equals("fragmentTest"));
-			
-			// Finally, make sure the library entry in the fragment is
-			// now part of the plugin
-			ILibrary[] libraries = pd.getRuntimeLibraries();
-			assertTrue(i + ".13", libraries.length == 1);
-			assertTrue(i + ".14", ((Library)libraries[0]).getName().equals("lib1.jar"));
-		} else {
-			// Now make sure we didn't hook this fragment and this plugin.
-			PluginFragmentModel[] linkedFragments = ((PluginDescriptorModel)pd).getFragments();
-			assertNull(i + ".10", linkedFragments);
-			
-			// Finally, make sure the library entry in the fragment is
-			// not part of the plugin
-			ILibrary[] libraries = pd.getRuntimeLibraries();
-			assertTrue(i + ".11", libraries.length == 0);
-		}
-	}
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new FragmentResolveTest_9("fullTest"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/GetPluginPathTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/GetPluginPathTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/GetPluginPathTest.java
deleted file mode 100644
index 02707b8..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/GetPluginPathTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.io.*;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class GetPluginPathTest extends WorkspaceSessionTest {
-	
-public GetPluginPathTest() {
-	super(null);
-}
-public GetPluginPathTest(String name) {
-	super(name);
-}
-public void testGetRelevantStrings() {
-	String basePath = null;
-	String pluginPath = null;
-	String pluginName = "org.eclipse.core.tests.runtime";
-	
-	pluginPath = ((PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor(pluginName)).getLocation().concat("Plugin_Testing/plugins.activation.1/");
-	int i = pluginPath.indexOf(pluginName);
-	if (i != -1)
-		basePath = pluginPath.substring (0, i);
-	if (basePath == null && pluginPath == null)
-		return;
-		
-	String fileName = System.getProperty("user.dir").concat("/testingTemp.plugin-path");
-	File pluginPathFile = new File(fileName);
-	DataOutputStream output = null;
-	try {
-		output = new DataOutputStream(new FileOutputStream(pluginPathFile));
-	} catch (IOException ioe) {
-		System.out.print ("1.0 IOException encountered on creation of " + fileName);
-	}
-	PrintWriter printNow = new PrintWriter (output);
-	try {
-		if (basePath != null)
-			printNow.println("base=" + basePath);
-		if (pluginPath != null)
-			printNow.println("test=" + pluginPath);
-	} finally {
-		try {
-			printNow.flush();
-			printNow.close();
-			output.close();
-		} catch (IOException ioe) {
-		}
-	}
-	pluginPathFile.delete();
-}
-}
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/JarPluginPathTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/JarPluginPathTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/JarPluginPathTest.java
deleted file mode 100644
index a9fd1b6..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/JarPluginPathTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.io.*;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.tests.harness.*;
-
-public class JarPluginPathTest extends WorkspaceSessionTest {
-	
-public JarPluginPathTest() {
-	super(null);
-}
-public JarPluginPathTest(String name) {
-	super(name);
-}
-public void test1() {
-	String basePath = null;
-	String pluginPath = null;
-	String pluginName = "org.eclipse.core.tests.runtime";
-	
-	pluginPath = ((PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor(pluginName)).getLocation().concat("Plugin_Testing/LibraryLookupTests/JarLookupTests/");
-	int i = pluginPath.indexOf(pluginName);
-	if (i != -1)
-		basePath = pluginPath.substring (0, i);
-	if (basePath == null && pluginPath == null)
-		return;
-		
-	String fileName = System.getProperty("user.dir").concat("/testingTemp.tempPlugin-path");
-	File pluginPathFile = new File(fileName);
-	DataOutputStream output = null;
-	try {
-		output = new DataOutputStream(new FileOutputStream(pluginPathFile));
-	} catch (IOException ioe) {
-		System.out.print ("1.0 IOException encountered on creation of " + fileName);
-	}
-	PrintWriter printNow = new PrintWriter (output);
-	try {
-		if (basePath != null)
-			printNow.println("base=" + basePath);
-		if (pluginPath != null)
-			printNow.println("test=" + pluginPath);
-	} finally {
-		try {
-			printNow.flush();
-			printNow.close();
-			output.close();
-		} catch (IOException ioe) {
-		}
-	}
-}
-
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/JarSearchTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/JarSearchTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/JarSearchTests.java
deleted file mode 100644
index 92286e4..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/JarSearchTests.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.PlatformMetaArea;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.tests.harness.*;
-
-public class JarSearchTests extends WorkspaceSessionTest {
-	
-public JarSearchTests() {
-	super(null);
-}
-public JarSearchTests(String name) {
-	super(name);
-}
-public void test1() {
-	IPluginRegistry registry = Platform.getPluginRegistry();
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors("JarLookupTest1");
-	assertTrue("1.0 Only one jarLookup1 plugin", plugins.length == 1);
-	System.out.println("jarLookup1 plugin name = " + plugins[0].getLabel());
-	assertTrue("1.1 Plugin name translated", plugins[0].getLabel().equals("Jar Lookup Test 1"));
-
-	plugins = registry.getPluginDescriptors("JarLookupTest2");
-	assertTrue("2.0 Only one jarLookup2 plugin", plugins.length == 1);
-	System.out.println("jarLookup2 plugin name = " + plugins[0].getLabel());
-	assertTrue("2.1 Plugin name translated", plugins[0].getLabel().equals("Jar Lookup Test 2"));
-
-	plugins = registry.getPluginDescriptors("JarLookupTest3");
-	assertTrue("3.0 Only one jarLookup3 plugin", plugins.length == 1);
-	System.out.println("jarLookup3 plugin name = " + plugins[0].getLabel());
-	assertTrue("3.1 Plugin name translated", plugins[0].getLabel().equals("%pluginName"));
-
-	plugins = registry.getPluginDescriptors("JarLookupTest4");
-	assertTrue("4.0 Only one jarLookup4 plugin", plugins.length == 1);
-	System.out.println("jarLookup4 plugin name = " + plugins[0].getLabel());
-	assertTrue("4.1 Plugin name translated", plugins[0].getLabel().equals("Jar Lookup Test 4"));
-}
-
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/LoaderTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/LoaderTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/LoaderTest.java
deleted file mode 100644
index 0ad27c3..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/LoaderTest.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-/**
- */
-public class LoaderTest extends WorkspaceSessionTest {
-public LoaderTest() {
-	super(null);
-}
-public LoaderTest(String name) {
-	super(name);
-}
-public void testBase() {
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pluginA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pluginB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pluginC = registry.getPluginDescriptor("plugin.c");
-	IPluginDescriptor pluginD = registry.getPluginDescriptor("plugin.d");
-	assertNotNull("0.0", pluginA);
-	assertNotNull("0.1", pluginB);
-	assertNotNull("0.2", pluginC);
-	assertNotNull("0.3", pluginD);
-
-	// get plugin loaders
-	Plugin p = null;
-
-	try {
-		p = pluginA.getPlugin();
-	} catch (CoreException e) {
-		fail("2.0.0");
-	}
-	assertTrue("2.0.1", pluginA.isPluginActivated());
-	assertTrue("2.1", !pluginB.isPluginActivated());
-	assertTrue("2.2", !pluginC.isPluginActivated());
-	assertTrue("2.3", !pluginD.isPluginActivated());
-	ClassLoader loaderA = p.getClass().getClassLoader();
-
-	try {
-		p = pluginB.getPlugin();
-	} catch (CoreException e) {
-		fail("3.0.0");
-	}
-	assertTrue("3.0.1", pluginA.isPluginActivated());
-	assertTrue("3.1", pluginB.isPluginActivated());
-	assertTrue("3.2", !pluginC.isPluginActivated());
-	assertTrue("3.3", !pluginD.isPluginActivated());
-	ClassLoader loaderB = p.getClass().getClassLoader();
-
-	try {
-		p = pluginC.getPlugin();
-	} catch (CoreException e) {
-		fail("4.0.0");
-	}
-	assertTrue("4.0.1", pluginA.isPluginActivated());
-	assertTrue("4.1", pluginB.isPluginActivated());
-	assertTrue("4.2", pluginC.isPluginActivated());
-	assertTrue("4.3", !pluginD.isPluginActivated());
-	ClassLoader loaderC = p.getClass().getClassLoader();
-
-	try {
-		p = pluginD.getPlugin();
-	} catch (CoreException e) {
-		fail("5.0.0");
-	}
-	assertTrue("5.0.1", pluginA.isPluginActivated());
-	assertTrue("5.1", pluginB.isPluginActivated());
-	assertTrue("5.2", pluginC.isPluginActivated());
-	assertTrue("5.3", pluginD.isPluginActivated());
-	ClassLoader loaderD = p.getClass().getClassLoader();
-
-	// try to load classes
-
-	load(loaderD, "org.eclipse.core.tests.internal.plugin.a.api.ApiClass", false, "6.1");
-	load(loaderD, "org.eclipse.core.tests.internal.plugin.b.api.ApiClass", false, "6.2");
-	load(loaderD, "org.eclipse.core.tests.internal.plugin.c.api.ApiClass", false, "6.3");
-	load(loaderD, "org.eclipse.core.tests.internal.plugin.d.api.ApiClass", true, "6.4");
-	load(loaderD, "org.eclipse.core.tests.internal.plugin.a.PluginClass", false, "6.5");
-	load(loaderD, "org.eclipse.core.tests.internal.plugin.b.PluginClass", false, "6.6");
-	load(loaderD, "org.eclipse.core.tests.internal.plugin.c.PluginClass", false, "6.7");
-	load(loaderD, "org.eclipse.core.tests.internal.plugin.d.PluginClass", true, "6.8");
-	load(loaderD, "plugin.c.ExportedClass", false, "6.9");
-
-	load(loaderC, "org.eclipse.core.tests.internal.plugin.a.api.ApiClass", false, "7.1");
-	load(loaderC, "org.eclipse.core.tests.internal.plugin.b.api.ApiClass", false, "7.2");
-	load(loaderC, "org.eclipse.core.tests.internal.plugin.c.api.ApiClass", true, "7.3");
-	load(loaderC, "org.eclipse.core.tests.internal.plugin.d.api.ApiClass", false, "7.4");
-	load(loaderC, "org.eclipse.core.tests.internal.plugin.a.PluginClass", false, "7.5");
-	load(loaderC, "org.eclipse.core.tests.internal.plugin.b.PluginClass", false, "7.6");
-	load(loaderC, "org.eclipse.core.tests.internal.plugin.c.PluginClass", true, "7.7");
-	load(loaderC, "org.eclipse.core.tests.internal.plugin.d.PluginClass", false, "7.8");
-	load(loaderC, "org.eclipse.core.tests.internal.plugin.c.ExportedClass", true, "7.9");
-
-	load(loaderB, "org.eclipse.core.tests.internal.plugin.a.api.ApiClass", false, "8.1");
-	load(loaderB, "org.eclipse.core.tests.internal.plugin.b.api.ApiClass", true, "8.2");
-	load(loaderB, "org.eclipse.core.tests.internal.plugin.c.api.ApiClass", true, "8.3");
-	load(loaderB, "org.eclipse.core.tests.internal.plugin.d.api.ApiClass", true, "8.4");
-	load(loaderB, "org.eclipse.core.tests.internal.plugin.a.PluginClass", false, "8.5");
-	load(loaderB, "org.eclipse.core.tests.internal.plugin.b.PluginClass", true, "8.6");
-	load(loaderB, "org.eclipse.core.tests.internal.plugin.c.PluginClass", false, "8.7");
-	load(loaderB, "org.eclipse.core.tests.internal.plugin.d.PluginClass", false, "8.8");
-	load(loaderB, "org.eclipse.core.tests.internal.plugin.c.ExportedClass", true, "8.9");
-
-	load(loaderA, "org.eclipse.core.tests.internal.plugin.a.api.ApiClass", true, "9.1");
-	load(loaderA, "org.eclipse.core.tests.internal.plugin.b.api.ApiClass", true, "9.2");
-	load(loaderA, "org.eclipse.core.tests.internal.plugin.c.api.ApiClass", true, "9.3");
-	load(loaderA, "org.eclipse.core.tests.internal.plugin.d.api.ApiClass", false, "9.4");
-	load(loaderA, "org.eclipse.core.tests.internal.plugin.a.PluginClass", true, "9.5");
-	load(loaderA, "org.eclipse.core.tests.internal.plugin.b.PluginClass", true, "9.6");
-	load(loaderA, "org.eclipse.core.tests.internal.plugin.c.PluginClass", false, "9.7");
-	load(loaderA, "org.eclipse.core.tests.internal.plugin.d.PluginClass", false, "9.8");
-	load(loaderA, "org.eclipse.core.tests.internal.plugin.c.ExportedClass", true, "9.9");
-
-	load(null, "org.eclipse.core.tests.internal.plugin.a.api.ApiClass", true, "10.1");
-	load(null, "org.eclipse.core.tests.internal.plugin.b.api.ApiClass", true, "10.2");
-	load(null, "org.eclipse.core.tests.internal.plugin.c.api.ApiClass", true, "10.3");
-	load(null, "org.eclipse.core.tests.internal.plugin.d.api.ApiClass", true, "10.4");
-	load(null, "org.eclipse.core.tests.internal.plugin.a.PluginClass", true, "10.5");
-	load(null, "org.eclipse.core.tests.internal.plugin.b.PluginClass", true, "10.6");
-	load(null, "org.eclipse.core.tests.internal.plugin.c.PluginClass", true, "10.7");
-	load(null, "org.eclipse.core.tests.internal.plugin.d.PluginClass", true, "10.8");
-	load(null, "org.eclipse.core.tests.internal.plugin.c.ExportedClass", true, "10.9");
-
-}
-public String getResource(Object o, String name, boolean success, String msg) {
-
-	String result = null;
-	InputStream content;
-	byte[] buf;
-
-	URL url;
-	if (o instanceof Class)
-		url = ((Class) o).getResource(name);
-	else
-		url = ((ClassLoader) o).getResource(name);
-
-	if (success) {
-		assertTrue(msg + "0", url != null);
-		try {
-			content = url.openStream();
-			buf = new byte[content.available()];
-			content.read(buf);
-			content.close();
-			result = (new String(buf)).trim();
-		} catch (IOException ea) {
-			fail(msg + "1 " + ea);
-		}
-	} else
-		assertTrue(msg + "2", url == null);
-
-	return result;
-}
-public Vector getResources(ClassLoader loader, String name, String msg) {
-
-	Vector result = new Vector();
-	Enumeration enum;
-	String file = null;
-	String tmp = null;
-	try {
-		enum = loader.getResources(name);
-		while (enum.hasMoreElements()) {
-			file = ((URL) enum.nextElement()).getFile();
-			tmp = file.substring(0, file.length() - name.length() - 1);
-			tmp = tmp.substring(tmp.length() - 1, tmp.length());
-			result.add(tmp);
-		}
-	} catch (IOException e) {
-		fail(msg + "0" + e.getMessage());
-	}
-	return result;
-}
-public void getResourcesTest() {
-
-	String path = "org.eclipse.core.tests.internal.plugins";
-	String clazz = path + ".TestClass";
-	String res = "test.txt";
-	String absres = path.replace('.', '/') + "/" + res;
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pluginA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pluginB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pluginC = registry.getPluginDescriptor("plugin.c");
-	IPluginDescriptor pluginD = registry.getPluginDescriptor("plugin.d");
-	assertNotNull("0.0", pluginA);
-	assertNotNull("0.1", pluginB);
-	assertNotNull("0.2", pluginC);
-	assertNotNull("0.3", pluginD);
-
-	// get loaders
-	Plugin p = null;
-	ClassLoader platform = Platform.class.getClassLoader();
-
-	try {
-		p = pluginA.getPlugin();
-	} catch (CoreException e) {
-		fail("2.0");
-	}
-	ClassLoader loaderA = p.getClass().getClassLoader();
-
-	try {
-		p = pluginB.getPlugin();
-	} catch (CoreException e) {
-		fail("3.0");
-	}
-	ClassLoader loaderB = p.getClass().getClassLoader();
-
-	try {
-		p = pluginC.getPlugin();
-	} catch (CoreException e) {
-		fail("4.0");
-	}
-	ClassLoader loaderC = p.getClass().getClassLoader();
-
-	try {
-		p = pluginD.getPlugin();
-	} catch (CoreException e) {
-		fail("5.0");
-	}
-	ClassLoader loaderD = p.getClass().getClassLoader();
-
-	// load resources for A
-	Vector v;
-	v = getResources(loaderA, absres, "6.0.");
-	assertTrue("6.1", v.size() == 1);
-	assertTrue("6.2", v.contains("C"));
-
-	// load resources for B
-	v = getResources(loaderB, absres, "7.0.");
-	assertTrue("7.1", v.size() == 3);
-	assertTrue("7.2", v.contains("B"));
-	assertTrue("7.3", v.contains("C"));
-	assertTrue("7.4", v.contains("D"));
-
-	// load resources for C
-	v = getResources(loaderC, absres, "8.0.");
-	assertTrue("8.1", v.size() == 1);
-	assertTrue("8.2", v.contains("C"));
-
-	// load resources for D
-	v = getResources(loaderD, absres, "9.0.");
-	assertTrue("9.1", v.size() == 1);
-	assertTrue("9.2", v.contains("D"));
-
-	// load resources for platform
-	v = getResources(platform, absres, "9.0.");
-	assertTrue("9.1", v.size() == 0);
-
-}
-public void getResourceTest() {
-
-	String path = "org.eclipse.core.tests.internal.plugins";
-	String clazz = path + ".TestClass";
-	String res = "test.txt";
-	String absres = path.replace('.', '/') + "/" + res;
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pluginA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pluginB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pluginC = registry.getPluginDescriptor("plugin.c");
-	IPluginDescriptor pluginD = registry.getPluginDescriptor("plugin.d");
-	assertNotNull("0.0", pluginA);
-	assertNotNull("0.1", pluginB);
-	assertNotNull("0.2", pluginC);
-	assertNotNull("0.3", pluginD);
-
-	// get plugin loaders
-	Plugin p = null;
-
-	try {
-		p = pluginA.getPlugin();
-	} catch (CoreException e) {
-		fail("2.0");
-	}
-	ClassLoader loaderA = p.getClass().getClassLoader();
-
-	try {
-		p = pluginB.getPlugin();
-	} catch (CoreException e) {
-		fail("3.0");
-	}
-	ClassLoader loaderB = p.getClass().getClassLoader();
-
-	try {
-		p = pluginC.getPlugin();
-	} catch (CoreException e) {
-		fail("4.0");
-	}
-	ClassLoader loaderC = p.getClass().getClassLoader();
-
-	try {
-		p = pluginD.getPlugin();
-	} catch (CoreException e) {
-		fail("5.0");
-	}
-	ClassLoader loaderD = p.getClass().getClassLoader();
-
-	Class test = load(loaderA, clazz, true, "6.0");
-	String text = null;
-
-	// load resources relative to class from plugin A
-
-	text = getResource(test, res, true, "7.0.");
-	assertTrue("7.1", text.equals("Text from Plugin C")); // delegated
-
-	// load resources directly
-
-	text = getResource(loaderA, absres, true, "8.0.");
-	assertTrue("8.1", text.equals("Text from Plugin C")); // delegated
-
-	text = getResource(loaderB, absres, true, "9.0.");
-	assertTrue("9.1", text.equals("Text from Plugin B"));
-
-	text = getResource(loaderC, absres, true, "10.0.");
-	assertTrue("10.1", text.equals("Text from Plugin C"));
-
-	text = getResource(loaderD, absres, true, "11.0.");
-	assertTrue("11.1", text.equals("Text from Plugin D"));
-
-	text = getResource(Platform.class.getClassLoader(), absres, false, "12.0.");
-}
-public Class load(ClassLoader loader, String name, boolean success, String msg) {
-
-	Class result = null;
-	try {
-		if (loader == null)
-			result = Class.forName(name);
-		else
-			result = loader.loadClass(name);
-		if (!success)
-			fail(msg + ".0");
-	} catch (ClassNotFoundException e) {
-		if (success)
-			// We should have found this class
-			fail(msg + ".1");
-		// else
-			// We were expecting not to find this class so don't fail
-	} catch (Exception e) {
-		fail(msg + ".2" + e.getMessage());
-	}
-	return result;
-}
-//public static Test suite() {
-//	TestSuite suite = new TestSuite();
-//	suite.addTest(new LoaderTest("baseTest"));
-////	suite.addTest(new LoaderTest("xmlTest"));
-////	suite.addTest(new LoaderTest("getResourceTest"));
-////	suite.addTest(new LoaderTest("getResourcesTest"));
-//	return suite;
-//}
-public void xmlTest() {
-
-	// xml class
-	String xml = "org.apache.xerces.framework.XMLParser";
-
-	// get platform loader (has private copy of xml4j
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	ClassLoader platformLoader = Platform.class.getClassLoader();
-	assertTrue("0.0", platformLoader instanceof org.eclipse.core.internal.boot.PlatformClassLoader);
-
-	// get test plugin A (requires com.ibm.xml)
-	Plugin p = null;
-	IPluginDescriptor pd;
-	IPluginDescriptor pdA = registry.getPluginDescriptor("plugin.a");
-	assertTrue("0.1.0", pdA != null);
-	try {
-		p = pdA.getPlugin();
-	} catch (CoreException e) {
-		fail("0.1.1.0");
-	}
-	assertTrue("0.1.2", pdA.isPluginActivated());
-	ClassLoader a = p.getClass().getClassLoader();
-	assertTrue("0.1.3", a instanceof org.eclipse.core.internal.plugins.PluginClassLoader);
-
-	// get test plugin D (contains unexported xml4j)
-	IPluginDescriptor pdD = registry.getPluginDescriptor("plugin.d");
-	assertTrue("0.2.0", pdD != null);
-	try {
-		p = pdD.getPlugin();
-	} catch (CoreException e) {
-		fail("0.2.1.0");
-	}
-	assertTrue("0.2.2", pdD.isPluginActivated());
-	ClassLoader d = p.getClass().getClassLoader();
-	assertTrue("0.2.3", d instanceof org.eclipse.core.internal.plugins.PluginClassLoader);
-
-	// load class
-	Class platformXML = load(platformLoader, xml, true, "1.0");
-	Class aXML = load(a, xml, true, "1.1");
-	Class dXML = load(d, xml, true, "1.2");
-
-	// jdk mode
-	assertTrue("2.0", platformXML != aXML);
-	assertTrue("2.1", platformXML != dXML);
-	assertTrue("2.2", aXML != dXML);
-	assertTrue("2.3", platformXML.getClassLoader() == platformLoader);
-	assertTrue("2.4", aXML.getClassLoader() != a); // loaded by prereq com.ibm.xml loader
-	assertTrue("2.5", dXML.getClassLoader() == d);
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/NumberOfElementsTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/NumberOfElementsTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/NumberOfElementsTest.java
deleted file mode 100644
index 990e3b7..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/NumberOfElementsTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.runtime.*;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.tests.harness.*;
-import java.io.*;
-import java.net.URL;
-import junit.framework.*;
-import org.xml.sax.*;
-
-public class NumberOfElementsTest extends EclipseWorkspaceTest {
-
-public NumberOfElementsTest() {
-	super(null);
-}
-
-public NumberOfElementsTest(String name) {
-	super(name);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new NumberOfElementsTest("numberRequiresTest"));
-	suite.addTest(new NumberOfElementsTest("numberRuntimeTest"));
-	return suite;
-}
-
-public void numberRequiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/numberOfRequires/plugin.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue ("1.0 Plugins should not validate", pluginDescriptors.length == 0);
-}
-
-public void numberRuntimeTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/numberOfRuntimes/plugin.xml");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertTrue ("2.0 Should have only one plugin", pluginDescriptors.length == 1);
-	PluginDescriptorModel plugin = (PluginDescriptorModel)pluginDescriptors[0];
-	LibraryModel libraryArray[] = plugin.getRuntime();
-	// There should only be 3 library entries (not 6)
-	assertTrue ("2.1 Three library entries", libraryArray.length == 3);
-}
-
-}
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ParseHelper.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ParseHelper.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ParseHelper.java
deleted file mode 100644
index 5ecb7d6..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/ParseHelper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.runtime.IStatus;
-public class ParseHelper extends PluginVersionTest {
-/**
- * ParseHelper constructor comment.
- */
-public ParseHelper() {
-	super();
-}
-/**
- * ParseHelper constructor comment.
- * @param name java.lang.String
- */
-public ParseHelper(String name) {
-	super(name);
-}
-/* doParsing
- * This method will parse a series of XML files.  The input array should be
- * an array of string buffers where each string buffer is considered a complete 
- * XML file.  The returning array will have a corresponding plugin descriptor
- * for each of the XML files in the input array
- */
-static PluginRegistry doParsing(InternalFactory factory, URL[] pluginPath, boolean doResolve) {
-	PluginRegistry registry = (PluginRegistry) RegistryLoader.parseRegistry(pluginPath, factory, false);
-	if (doResolve) {
-		IStatus resolveStatus = registry.resolve(true, true);
-		factory.getStatus().merge(resolveStatus);
-	}
-	registry.markReadOnly();
-	registry.startup(null);
-	return registry;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLPerformanceTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLPerformanceTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLPerformanceTest.java
deleted file mode 100644
index aa7a5e2..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLPerformanceTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLClassLoader;
-
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-/**
- */
-public class PlatformURLPerformanceTest extends WorkspaceSessionTest {
-public PlatformURLPerformanceTest() {
-	super(null);
-}
-public PlatformURLPerformanceTest(String name) {
-	super(name);
-}
-public long doLoad(String urls, String clazz, int count) {
-
-	// force gc at start of test
-	for (int i = 0; i < 2; i++) {
-		System.runFinalization();
-		System.gc();
-	}
-
-	long time = 0;
-	long first = 0;
-	long last = 0;
-	try {
-		System.out.println(urls);
-		URL path = new URL(urls);
-		time = (new java.util.Date()).getTime();
-		for (int i=0; i<count; i++) {
-			if (i==1) first = (new java.util.Date()).getTime();
-			URLClassLoader l = null;
-			l = new URLClassLoader(new URL[] {path},null);
-			Class c = l.loadClass(clazz);
-		}
-		last = (new java.util.Date()).getTime();
-		time = last-time;
-		System.out.println("Total: "+time+" ["+(last-first)+"]");
-		System.out.println("Average: "+(time/count)+" ["+((last-first)/count-1)+"]");
-	}
-	catch(Exception e) { System.out.println(e); }
-	
-	return time;
-}
-public void testPlatformURLCompareTest() {
-
-	// -cp file:some.jar
-	// -cp jar:file:some.jar!/
-	// -cp platform:/test/some.jar!/ with file: install
-
-	// -cp jar:http:some.jar!/
-	// -cp platform:/test/some.jar!/ with http: install
-
-	int count = 250; // # of load iterations
-	String jar = "plugin_a_external.jar";
-	String clazz = "org.eclipse.core.tests.internal.plugin.a.Dummy";
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pd = registry.getPluginDescriptor("plugin.a");
-	assertNotNull ("0.0", pd);
-
-	URL base = ((PluginDescriptor) pd).getInstallURLInternal();
-	PlatformURLPerformanceTestConnection.startup(base);
-
-	System.out.println(clazz);
-	System.out.println("Count: " + count);
-	long time;
-
-	// local loads
-
-	String f = (new java.io.File(base.getFile())).getAbsolutePath();
-	f = (f + "/").replace('\\', '/');
-	String pathFile = "file:" + f + jar;
-	String pathJar = "jar:" + base.toExternalForm() + jar + "!/";
-	String pathEclipse = "platform:/test/" + jar + "!/";
-	String pathPlugin = pd.getInstallURL().toExternalForm() + jar + "!/";
-
-	doLoad(pathFile, clazz, count);
-
-	doLoad(pathJar, clazz, count);
-
-	doLoad(pathEclipse, clazz, count);
-
-	doLoad(pathPlugin, clazz, count);
-
-	doLoad(pathPlugin, clazz, count);
-
-	doLoad(pathEclipse, clazz, count);
-
-	doLoad(pathJar, clazz, count);
-
-	doLoad(pathFile, clazz, count);
-}
-public void testPlatformURLCompareTestLocal() {
-
-	// -cp file:some.jar
-	// -cp jar:file:some.jar!/
-	// -cp platform:/test/some.jar!/
-	// -cp platform:/plugin/.../some.jar!/
-
-	int count = 250; // # of load iterations
-	String jar = "plugin_a_external.jar";
-	String clazz = "org.eclipse.core.tests.internal.plugin.a.Dummy";
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pd = registry.getPluginDescriptor("plugin.a");
-	assertNotNull("0.0", pd);
-
-	URL base = ((PluginDescriptor) pd).getInstallURLInternal();
-	PlatformURLPerformanceTestConnection.startup(base);
-
-	System.out.println(clazz);
-	System.out.println("Count: " + count);
-	long time;
-
-	// local loads
-
-	String f = (new java.io.File(base.getFile())).getAbsolutePath();
-	f = (f + "/").replace('\\', '/');
-	String pathFile = "file:" + f + jar;
-	String pathJar = "jar:" + base.toExternalForm() + jar + "!/";
-	String pathEclipse = "platform:/test/" + jar + "!/";
-	String pathPlugin = pd.getInstallURL().toExternalForm() + jar + "!/";
-
-	doLoad(pathFile, clazz, count);
-
-	doLoad(pathJar, clazz, count);
-
-	doLoad(pathEclipse, clazz, count);
-
-	doLoad(pathPlugin, clazz, count);
-
-	doLoad(pathPlugin, clazz, count);
-
-	doLoad(pathEclipse, clazz, count);
-
-	doLoad(pathJar, clazz, count);
-
-	doLoad(pathFile, clazz, count);
-}
-public void xxxtestPlatformURLCompareTestServer() {
-	
-	// Ignore this test for now as it relies on a server which
-	// no longer exists.  Need to find some universal way of
-	// testing this.
-
-	// -cp jar:http:some.jar!/
-	// -cp platform:/test/some.jar!/
-
-	int count = 250; // # of load iterations
-	String jar = "plugin_a_external.jar";
-	String clazz = "org.eclipse.core.tests.internal.plugin.a.Dummy";
-	String server = "http://vlad.torolab.ibm.com/test/";
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pd = registry.getPluginDescriptor("plugin.a");
-	assertNotNull("0.0", pd);
-
-	URL base = null;
-	try {
-		base = new URL(server);
-	} catch (Exception e) {
-		System.out.println(e);
-		return;
-	}
-	PlatformURLPerformanceTestConnection.startup(base);
-
-	System.out.println("Test requires manual setup of " + server);
-	System.out.println(clazz);
-	System.out.println("Count: " + count);
-	long time;
-
-	// poke server to wake it up plus force any server caching so all tests
-	// are on equal footing
-
-	InputStream tmpis = null;
-	try {
-		URL tmp = new URL(server + jar);
-		tmpis = tmp.openStream();
-		byte[] buf = new byte[4096];
-		int tmpcount = tmpis.read(buf);
-		while (tmpcount != -1) {
-			tmpcount = tmpis.read(buf);
-		}
-		tmpis.close();
-		tmpis = null;
-	} catch (Exception e) {
-		System.out.println("Error initializing server");
-		if (tmpis != null)
-			try {
-				tmpis.close();
-			} catch (Exception e2) {
-			}
-		return;
-	}
-
-	// remote loads
-
-	String pathJar = "jar:" + base.toExternalForm() + jar + "!/";
-	String pathEclipse = "platform:/test/" + jar + "!/";
-
-	doLoad(pathJar, clazz, count);
-
-	doLoad(pathEclipse, clazz, count);
-
-	doLoad(pathEclipse, clazz, count);
-
-	doLoad(pathJar, clazz, count);
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLPerformanceTestConnection.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLPerformanceTestConnection.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLPerformanceTestConnection.java
deleted file mode 100644
index b365d68..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLPerformanceTestConnection.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-/*
- * Licensed Materials - Property of IBM,
- * WebSphere Studio Workbench
- * (c) Copyright IBM Corp 2000
- */
-
-/**
- * Eclipse URL support
- * platform:platform/	maps to platform installation location
- */
-
-import java.net.*;
-import java.io.*;
-import java.util.*;
-import junit.framework.*;
-import org.eclipse.core.internal.boot.*;
-import org.eclipse.core.tests.harness.*;
-
-public class PlatformURLPerformanceTestConnection extends PlatformURLConnection {
-
-	// platform/ protocol
-	public static final String TEST = "test";
-	private static URL installURL;
-public PlatformURLPerformanceTestConnection() {
-	super(null);
-}
-public PlatformURLPerformanceTestConnection(URL url) {
-	super(url);
-}
-protected boolean allowCaching() {
-	return true;
-}
-protected URL resolve() throws IOException {
-	
-	String spec = url.getFile().trim();
-	if (spec.startsWith("/")) spec = spec.substring(1);
-
-	if (!spec.startsWith(TEST+"/")) throw new IOException("Unsupported protocol variation "+url.toString());
-
-	return spec.length()==TEST.length()+1 ? installURL : new URL(installURL,spec.substring(TEST.length()+1)); 
-}
-public static void startup(URL url) {
-	
-	// register connection type for platform:/plugin handling
-	installURL = url;
-	PlatformURLHandler.register(TEST, PlatformURLPerformanceTestConnection.class);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PlatformURLPerformanceTest("platformURLCompareTestLocal"));
-//	suite.addTest(new PlatformURLPerformanceTest("platformURLCompareTestServer"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLTest.java
deleted file mode 100644
index c748fe3..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PlatformURLTest.java
+++ /dev/null
@@ -1,547 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.*;
-import java.util.*;
-
-import org.eclipse.core.internal.boot.InternalBootLoader;
-import org.eclipse.core.internal.boot.PlatformURLConnection;
-import org.eclipse.core.internal.boot.PlatformURLHandler;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-/**
- */
-public class PlatformURLTest extends WorkspaceSessionTest {
-public PlatformURLTest() {
-	super(null);
-}
-public PlatformURLTest(String name) {
-	super(name);
-}
-public URL createURL(String id, String spec, boolean success) {
-
-	URL url = null;
-
-	try {
-		url = new URL(spec);
-		if (!success)
-			fail(id + ".0 " + url.toString());
-	} catch (MalformedURLException e) {
-		if (success)
-			fail(id + ".1 " + e);
-	}
-
-	return url;
-
-}
-public URL createURL(String id, URL base, String spec, boolean success) {
-
-	URL url = null;
-
-	try {
-		url = new URL(base, spec);
-		if (!success)
-			fail(id + ".0 " + url.toString());
-	} catch (MalformedURLException e) {
-		if (success)
-			fail(id + ".1 " + e);
-	}
-
-	return url;
-
-}
-public void testPlatformURLLoader() {
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pd = registry.getPluginDescriptor("plugin.a");
-	assertNotNull("0.0", pd);
-
-	URL path = null;
-	try {
-		path = new URL(pd.getInstallURL(), "plugin_a_external.jar!/");
-	} catch (MalformedURLException e) {
-		fail("1.0 " + e);
-	};
-
-	// load a class from a jar
-	ClassLoader l = new URLClassLoader(new URL[] { path }, null);
-	Class c = null;
-	try {
-		c = l.loadClass("org.eclipse.core.tests.internal.plugin.a.Dummy");
-	} catch (ClassNotFoundException e) {
-		fail("2.0 " + e);
-	};
-	URL src = c.getProtectionDomain().getCodeSource().getLocation();
-
-	// do it again using new loader
-	l = new URLClassLoader(new URL[] { path }, null);
-	c = null;
-	try {
-		c = l.loadClass("org.eclipse.core.tests.internal.plugin.a.Dummy");
-	} catch (ClassNotFoundException e) {
-		fail("3.0 " + e);
-	};
-	src = c.getProtectionDomain().getCodeSource().getLocation();
-
-	c = null;
-
-}
-public void testPlatformURLResolve() {
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pluginA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pluginB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pluginC = registry.getPluginDescriptor("plugin.c");
-	IPluginDescriptor pluginD = registry.getPluginDescriptor("plugin.d" );
-	assertNotNull("0.0", pluginA);
-	assertNotNull("0.1", pluginB);
-	assertNotNull("0.2", pluginC);
-	assertNotNull("0.3", pluginD);
-
-	URL install = null;
-	URL url = null;
-	URL resolvedURL = null;
-	URL resolvedURL2 = null;
-	URL localURL = null;
-	String result = null;
-
-	// resolve/ asLocalURL for plugin directory URL
-	install = url = pluginA.getInstallURL();
-	assertNotNull("1.0.0", url);
-	assertTrue("1.0.1", url.getProtocol().equals(PlatformURLHandler.PROTOCOL));
-
-	try {
-		resolvedURL = Platform.resolve(url);
-	} catch (IOException e) {
-		fail("1.1.0 " + e);
-	};
-	assertNotNull("1.1.1", resolvedURL);
-	assertTrue("1.1.2", !resolvedURL.getProtocol().equals(PlatformURLHandler.PROTOCOL));
-
-	try {
-		resolvedURL2 = Platform.resolve(resolvedURL);
-	} catch (IOException e) {
-		fail("1.2.0 " + e);
-	};
-	assertTrue("1.2.1", resolvedURL2.equals(resolvedURL));
-
-	try {
-		localURL = Platform.asLocalURL(url);
-		fail("1.3.0");
-	} catch (IOException e) {
-	};
-
-	// resolve/ asLocalURL for file URL
-
-	try {
-		url = new URL(install, "plugin.xml");
-	} catch (java.io.IOException e) {
-		fail("2.0.0.0 " + e);
-	}
-	assertNotNull("2.0.0", url);
-	assertTrue("2.0.1", url.getProtocol().equals(PlatformURLHandler.PROTOCOL));
-
-	try {
-		resolvedURL = Platform.resolve(url);
-	} catch (IOException e) {
-		fail("2.1.0 " + e);
-	};
-	assertNotNull("2.1.1", resolvedURL);
-	assertTrue("2.1.2", !resolvedURL.getProtocol().equals(PlatformURLHandler.PROTOCOL));
-
-	try {
-		resolvedURL2 = Platform.resolve(resolvedURL);
-	} catch (IOException e) {
-		fail("2.2.0 " + e);
-	};
-	assertTrue("2.2.1", resolvedURL2.equals(resolvedURL));
-
-	try {
-		localURL = Platform.asLocalURL(url);
-	} catch (IOException e) {
-		fail("2.3.0 " + e);
-	};
-	assertTrue("2.3.1", localURL.getProtocol().equals(PlatformURLHandler.FILE));
-
-	// resolve/ asLocalURL for jar URL 
-
-	try {
-		url = new URL(install, "plugin_a_external.jar!/");
-	} catch (java.io.IOException e) {
-		fail("3.0.0.0 " + e);
-	}
-	assertNotNull("3.0.0", url);
-	assertTrue("3.0.1", url.getProtocol().equals(PlatformURLHandler.PROTOCOL));
-
-	try {
-		resolvedURL = Platform.resolve(url);
-	} catch (IOException e) {
-		fail("3.1.0 " + e);
-	};
-	assertNotNull("3.1.1", resolvedURL);
-	assertTrue("3.1.2", !resolvedURL.getProtocol().equals(PlatformURLHandler.PROTOCOL));
-
-	try {
-		resolvedURL2 = Platform.resolve(resolvedURL);
-	} catch (IOException e) {
-		fail("3.2.0 " + e);
-	};
-	assertTrue("3.2.1", resolvedURL2.equals(resolvedURL));
-
-	try {
-		localURL = Platform.asLocalURL(url);
-	} catch (IOException e) {
-		fail("3.3.0 " + e);
-	};
-	assertTrue("3.3.1", localURL.getProtocol().equals(PlatformURLHandler.JAR));
-
-	// resolve/ asLocalURL for class inside jar URL 
-
-	try {
-		url = new URL(install, "plugin_a_external.jar!/org/eclipse/core/tests/internal/plugin/a/DummyClass.class");
-	} catch (java.io.IOException e) {
-		fail("4.0.0.0 " + e);
-	}
-	assertNotNull("4.0.0", url);
-	assertTrue("4.0.1", url.getProtocol().equals(PlatformURLHandler.PROTOCOL));
-
-	try {
-		resolvedURL = Platform.resolve(url);
-	} catch (IOException e) {
-		fail("4.1.0 " + e);
-	};
-	assertNotNull("4.1.1", resolvedURL);
-	assertTrue("4.1.2", !resolvedURL.getProtocol().equals(PlatformURLHandler.PROTOCOL));
-
-	try {
-		resolvedURL2 = Platform.resolve(resolvedURL);
-	} catch (IOException e) {
-		fail("4.2.0 " + e);
-	};
-	assertTrue("4.2.1", resolvedURL2.equals(resolvedURL));
-
-	try {
-		localURL = Platform.asLocalURL(url);
-	} catch (IOException e) {
-		fail("4.3.0 " + e);
-	};
-	assertTrue("4.3.1", localURL.getProtocol().equals(PlatformURLHandler.JAR));
-
-}
-public void testPlatformURL() {
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pluginA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pluginB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pluginC = registry.getPluginDescriptor("plugin.c");
-	IPluginDescriptor pluginD = registry.getPluginDescriptor("plugin.d" );
-	assertNotNull("0.0", pluginA);
-	assertNotNull("0.1", pluginB);
-	assertNotNull("0.2", pluginC);
-	assertNotNull("0.3", pluginD);
-
-	URL url = null;
-	String result = null;
-
-	// bad protocol spec "badurl"
-	url = createURL("1.0", "platform:badurl/" + "plugin.a" + "/", true);
-	result = getResourceStringFromURL("1.1", url, "key", false);
-
-	// nonexistent plugin
-	url = createURL("2.0", "platform:plugin/some.bad.plugin/", true);
-	result = getResourceStringFromURL("2.1", url, "key", false);
-
-	// good plugin
-	url = createURL("3.0", "platform:plugin/" + "plugin.a" + "/", true);
-	url = createURL("3.1", url, "plugin.properties", true);
-	result = getResourceStringFromURL("3.2", url, "key", true);
-	assertNotNull("3.3", result);
-	assertTrue("3.4", result.equals("Test String"));
-
-	// good plugin from cache
-	url = createURL("4.0", "platform:plugin/" + "plugin.a" + "/", true);
-	url = createURL("4.1", url, "plugin.properties", true);
-	PlatformURLConnection euc = null;
-	try {
-		euc = (PlatformURLConnection) url.openConnection();
-	} catch (IOException e) {
-		fail("4.1.1 " + e);
-	}
-	try {
-		url = euc.getURLAsLocal();
-	} catch (IOException e) {
-		fail("4.1.2 " + e);
-	}
-	result = getResourceStringFromURL("4.4", url, "key", true);
-	assertNotNull("4.3", result);
-	assertTrue("4.4", result.equals("Test String"));
-}
-public String getResourceStringFromConnection(String id, URLConnection uc, String key, boolean success) {
-
-	InputStream is = null;
-	PropertyResourceBundle bundle = null;
-	String result = null;
-
-	try {
-		try {
-			is = uc.getInputStream();
-			if (!success)
-				fail(id + ".2 " + uc.getURL().toString());
-		} catch (IOException e) {
-			if (success)
-				fail(id + ".3 " + e);
-			return null;
-		}
-
-		try {
-			bundle = new PropertyResourceBundle(is);
-			if (!success)
-				fail(id + ".4 " + uc.getURL().toString());
-		} catch (IOException e) {
-			if (success)
-				fail(id + ".5 " + e);
-			return null;
-		}
-
-		try {
-			result = bundle.getString(key);
-			if (!success)
-				fail(id + ".6 " + uc.getURL().toString());
-		} catch (MissingResourceException e) {
-			if (success)
-				fail(id + ".7 " + e);
-			return null;
-		}
-
-	} finally {
-		if (is != null)
-			try {
-				is.close();
-			} catch (IOException e) {
-			}
-	}
-
-	return result;
-
-}
-public String getResourceStringFromURL(String id, URL url, String key, boolean success) {
-
-	URLConnection uc = null;
-	InputStream is = null;
-	PropertyResourceBundle bundle = null;
-	String result = null;
-
-	try {
-		try {
-			uc = url.openConnection();
-			if (!success)
-				fail(id + ".0 " + url.toString());
-		} catch (IOException e) {
-			if (success)
-				fail(id + ".1 " + e);
-			return null;
-		}
-
-		try {
-			is = uc.getInputStream();
-			if (!success)
-				fail(id + ".2 " + url.toString());
-		} catch (IOException e) {
-			if (success)
-				fail(id + ".3 " + e);
-			return null;
-		}
-
-		try {
-			bundle = new PropertyResourceBundle(is);
-			if (!success)
-				fail(id + ".4 " + url.toString());
-		} catch (IOException e) {
-			if (success)
-				fail(id + ".5 " + e);
-			return null;
-		}
-
-		try {
-			result = bundle.getString(key);
-			if (!success)
-				fail(id + ".6 " + url.toString());
-		} catch (MissingResourceException e) {
-			if (success)
-				fail(id + ".7 " + e);
-			return null;
-		}
-
-	} finally {
-		if (is != null)
-			try {
-				is.close();
-			} catch (IOException e) {
-			}
-	}
-
-	return result;
-
-}
-private void buildPropertyFile(String fileName, String fileData, URL fileLocation) {
-	String fullFileName = fileLocation.getFile() + fileName;
-	try {
-		FileOutputStream fs = new FileOutputStream(fullFileName);
-		PrintWriter w = new PrintWriter(fs);
-		try {
-			w.println(fileData);
-			w.flush();
-		} finally {
-			w.close();
-		}
-	} catch (FileNotFoundException ioe) {
-		fail ("Unable to create test file " + fullFileName);
-	}
-
-}
-private void buildResourceEnv(IPluginDescriptor pluginB, IPluginDescriptor pluginC, String nl, String smallnl) {
-	buildPropertyFile("plugin_" + nl + ".properties", "key = Test String from " + nl, 
-		pluginC.find(new Path("./")));
-	if (!smallnl.equals(nl))
-		buildPropertyFile("plugin_" + smallnl + ".properties", "key = Test String from " + smallnl, 
-			pluginC.find(new Path("./")));
-	buildPropertyFile("plugin_" + smallnl + ".properties", "key = Test String from " + smallnl, 
-		pluginB.find(new Path("./")));
-}
-
-private void cleanupResourceEnv(IPluginDescriptor pluginB, IPluginDescriptor pluginC, String nl, String smallnl) {
-	File file = new File(pluginB.find(new Path("./")).getFile() + "plugin_" + smallnl + ".properties");
-	file.delete();
-	file = new File(pluginC.find(new Path("./")).getFile() + "plugin_" + nl + ".properties");
-	file.delete();
-	if (!smallnl.equals(nl)) {
-		file = new File(pluginC.find(new Path("./")).getFile() + "plugin_" + smallnl + ".properties");
-		file.delete();
-	}
-}
-
-public void testGetResourceString() {
-
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	// get descriptors
-	IPluginDescriptor pluginA = registry.getPluginDescriptor("plugin.a");
-	IPluginDescriptor pluginB = registry.getPluginDescriptor("plugin.b");
-	IPluginDescriptor pluginC = registry.getPluginDescriptor("plugin.c");
-	IPluginDescriptor pluginD = registry.getPluginDescriptor("plugin.d" );
-	assertNotNull("0.0", pluginA);
-	assertNotNull("0.1", pluginB);
-	assertNotNull("0.2", pluginC);
-	assertNotNull("0.3", pluginD);
-
-	// We are making the assumption here that nl will have at 
-	// most 2 segments
-	String nl = InternalBootLoader.getNL();
-	String smallnl = nl;
-	int i = nl.lastIndexOf('_');
-	if (i != -1) {
-		smallnl = nl.substring(0, i);
-	}
-	
-	// resource strings - no lookup
-	String s1 = "Hello World";
-	String s2 = "%%" + s1;
-	// resource strings - default bundle lookup
-	String s3 = "Test String";
-	String key = "%key";
-	String bad = "%bad";
-	
-	try {
-		buildResourceEnv(pluginB, pluginC, nl, smallnl);
-	
-		assertEquals("2.0", s1, pluginA.getResourceString(s1));
-		assertEquals("2.1", s2.substring(1), pluginA.getResourceString(s2));
-	
-		assertEquals("3.0", s3, pluginA.getResourceString(key));
-		assertEquals("3.1", s3 + " from " + smallnl, pluginB.getResourceString(key));
-		assertEquals("3.2", s3 + " from " + nl, pluginC.getResourceString(key));
-		assertEquals("3.3", key, pluginD.getResourceString(key));
-	
-		assertEquals("4.0", bad, pluginA.getResourceString(bad));
-		assertEquals("4.1", bad, pluginB.getResourceString(bad));
-		assertEquals("4.2", bad, pluginC.getResourceString(bad));
-		assertEquals("4.3", bad, pluginD.getResourceString(bad));
-	
-		assertEquals("5.0", s1, pluginA.getResourceString(bad + " " + s1));
-		assertEquals("5.1", s1, pluginB.getResourceString(bad + " " + s1));
-		assertEquals("5.2", s1, pluginC.getResourceString(bad + " " + s1));
-		assertEquals("5.3", s1, pluginD.getResourceString(bad + " " + s1));
-	
-		assertEquals("6.0", s3, pluginA.getResourceString(key + " " + s1));
-		assertEquals("6.1", s3 + " from " + smallnl, pluginB.getResourceString(key + " " + s1));
-		assertEquals("6.2", s3 + " from " + nl, pluginC.getResourceString(key + " " + s1));
-		assertEquals("6.3", s1, pluginD.getResourceString(key + " " + s1));
-	} finally {
-		cleanupResourceEnv(pluginB, pluginC, nl, smallnl);
-	}
-
-	// resource strings - specified bundle
-	ClassLoader loader = new URLClassLoader(new URL[] { pluginD.getInstallURL()}, null);
-	ResourceBundle bundle = null;
-	try {
-		bundle = ResourceBundle.getBundle("resource", Locale.getDefault(), loader);
-	} catch (MissingResourceException e) {
-		// We don't need to worry about the locale here.  We should always find
-		// resource.properties
-		fail("7.0.1");
-	};
-	assertNotNull("7.0.2", bundle);
-
-	assertEquals("7.1", s1, pluginA.getResourceString(s1, bundle));
-	assertEquals("7.2", s2.substring(1), pluginA.getResourceString(s2, bundle));
-	assertEquals("7.3", "resource.properties " + s3, pluginA.getResourceString(key, bundle));
-	assertEquals("7.4", bad, pluginA.getResourceString(bad, bundle));
-	assertEquals("7.5", s1, pluginA.getResourceString(bad + " " + s1, bundle));
-	assertEquals("7.6", "resource.properties " + s3, pluginA.getResourceString(key + " " + s1, bundle));
-
-	assertEquals("8.1", s1, pluginB.getResourceString(s1, bundle));
-	assertEquals("8.2", s2.substring(1), pluginB.getResourceString(s2, bundle));
-	assertEquals("8.3", "resource.properties " + s3, pluginB.getResourceString(key, bundle));
-	assertEquals("8.4", bad, pluginB.getResourceString(bad, bundle));
-	assertEquals("8.5", s1, pluginB.getResourceString(bad + " " + s1, bundle));
-	assertEquals("8.6", "resource.properties " + s3, pluginB.getResourceString(key + " " + s1, bundle));
-
-	assertEquals("9.1", s1, pluginC.getResourceString(s1, bundle));
-	assertEquals("9.2", s2.substring(1), pluginC.getResourceString(s2, bundle));
-	assertEquals("9.3", "resource.properties " + s3, pluginC.getResourceString(key, bundle));
-	assertEquals("9.4", bad, pluginC.getResourceString(bad, bundle));
-	assertEquals("9.5", s1, pluginC.getResourceString(bad + " " + s1, bundle));
-	assertEquals("9.6", "resource.properties " + s3, pluginC.getResourceString(key + " " + s1, bundle));
-
-	assertEquals("10.1", s1, pluginD.getResourceString(s1, bundle));
-	assertEquals("10.2", s2.substring(1), pluginD.getResourceString(s2, bundle));
-	assertEquals("10.3", "resource.properties " + s3, pluginD.getResourceString(key, bundle));
-	assertEquals("10.4", bad, pluginD.getResourceString(bad, bundle));
-	assertEquals("10.5", s1, pluginD.getResourceString(bad + " " + s1, bundle));
-	assertEquals("10.6", "resource.properties " + s3, pluginD.getResourceString(key + " " + s1, bundle));
-
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest.java
deleted file mode 100644
index 82cfc6a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import junit.framework.*;
-import java.net.URL;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.tests.harness.*;
-
-public abstract class PluginResolveTest extends EclipseWorkspaceTest {
-public PluginResolveTest() {
-	super(null);
-}
-public PluginResolveTest(String name) {
-	super(name);
-}
-public IPluginDescriptor checkResolved(IPluginRegistry r, String pfx, String id, String v) {
-
-	IPluginDescriptor pd = r.getPluginDescriptor(id);
-	assertNotNull(pfx + ".0.0", pd);
-	assertEquals(pfx + ".0.1", pd.getUniqueIdentifier(), id);
-	assertEquals(pfx + ".0.2", pd.getVersionIdentifier(), new PluginVersionIdentifier(v));
-	return pd;
-}
-public IPluginDescriptor checkResolved(IPluginRegistry r, String pfx, String id, String v, boolean ok) {
-
-	IPluginDescriptor pd = r.getPluginDescriptor(id, new PluginVersionIdentifier(v));
-	if (ok) {
-		assertNotNull(pfx + ".0.0", pd);
-		assertEquals(pfx + ".0.1", pd.getUniqueIdentifier(), id);
-		assertEquals(pfx + ".0.2", pd.getVersionIdentifier(), new PluginVersionIdentifier(v));
-	} else
-		assertNull(pfx + ".0.3", pd);
-	return pd;
-}
-public void checkResolvedPrereqs(String pfx, IPluginDescriptor pd, String[] id, String[] v) {
-
-	IPluginPrerequisite[] prq = pd.getPluginPrerequisites();
-	assertEquals(pfx + ".0.0", prq.length, id.length);
-	for (int i = 0; i < prq.length; i++) {
-		int ix = -1;
-		for (int j = 0; j < id.length; j++) {
-			if (prq[i].getUniqueIdentifier().equals(id[j])) {
-				ix = j;
-				break;
-			}
-		}
-		assertTrue(pfx + ".0.1 " + prq[i].getUniqueIdentifier(), ix != -1);
-		assertEquals(pfx + ".0.2 " + prq[i].getUniqueIdentifier(), prq[i].getResolvedVersionIdentifier(), new PluginVersionIdentifier(v[ix]));
-	}
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_1.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_1.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_1.java
deleted file mode 100644
index 4626e20..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_1.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_1 extends PluginResolveTest {
-public PluginResolveTest_1() {
-	super(null);
-}
-public PluginResolveTest_1(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.1/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor pluginDescriptor = null;
-
-	PluginVersionIdentifier verIdA = new PluginVersionIdentifier("1.2.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.a", verIdA);
-	assertNotNull("0.0", pluginDescriptor);
-	assertEquals("0.1", pluginDescriptor.getUniqueIdentifier(), "tests.a");
-	assertEquals("0.2", pluginDescriptor.getVersionIdentifier(), verIdA);
-	verIdA = null;
-
-	PluginVersionIdentifier verIdB = new PluginVersionIdentifier("2.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.b", verIdB);
-	assertNotNull("1.0", pluginDescriptor);
-	assertEquals("1.1", pluginDescriptor.getUniqueIdentifier(), "tests.b");
-	assertEquals("1.2", pluginDescriptor.getVersionIdentifier(), verIdB);
-	verIdB = null;
-
-	PluginVersionIdentifier verIdC = new PluginVersionIdentifier("1.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC);
-	assertNotNull("2.0", pluginDescriptor);
-	assertEquals("2.1", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("2.2", pluginDescriptor.getVersionIdentifier(), verIdC);
-	verIdC = null;
-
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_1("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_10.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_10.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_10.java
deleted file mode 100644
index d7831c4..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_10.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_10 extends PluginResolveTest {
-public PluginResolveTest_10() {
-	super(null);
-}
-public PluginResolveTest_10(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.10/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor pluginDescriptor = null;
-
-	PluginVersionIdentifier verIdA = new PluginVersionIdentifier("1.2.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.a", verIdA);
-	assertNotNull("0.0", pluginDescriptor);
-	assertEquals("0.1", pluginDescriptor.getUniqueIdentifier(), "tests.a");
-	assertEquals("0.2", pluginDescriptor.getVersionIdentifier(), verIdA);
-	verIdA = null;
-
-	PluginVersionIdentifier verIdB = new PluginVersionIdentifier("1.0.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.b", verIdB);
-	assertNotNull("1.0", pluginDescriptor);
-	assertEquals("1.1", pluginDescriptor.getUniqueIdentifier(), "tests.b");
-	assertEquals("1.2", pluginDescriptor.getVersionIdentifier(), verIdB);
-	verIdB = null;
-
-	PluginVersionIdentifier verIdC1 = new PluginVersionIdentifier("1.1.0");
-	PluginVersionIdentifier verIdC2 = new PluginVersionIdentifier("2.0.5");
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC1);
-	assertNotNull("2.0", pluginDescriptor);
-	assertEquals("2.1", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("2.2", pluginDescriptor.getVersionIdentifier(), verIdC1);
-	verIdC1 = null;
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC2);
-	assertNotNull("2.3", pluginDescriptor);
-	assertEquals("2.4", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("2.5", pluginDescriptor.getVersionIdentifier(), verIdC2);
-	verIdC2 = null;
-
-	PluginVersionIdentifier verIdD = new PluginVersionIdentifier("1.0.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.d", verIdD);
-	assertNotNull("3.0", pluginDescriptor);
-	assertEquals("3.1", pluginDescriptor.getUniqueIdentifier(), "tests.d");
-	assertEquals("3.2", pluginDescriptor.getVersionIdentifier(), verIdD);
-	verIdD = null;
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_10("baseTest"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_11.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_11.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_11.java
deleted file mode 100644
index d7ccaeb..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_11.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_11 extends PluginResolveTest {
-public PluginResolveTest_11() {
-	super(null);
-}
-public PluginResolveTest_11(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.11/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor pluginDescriptor = null;
-	
-	PluginVersionIdentifier verIdA = new PluginVersionIdentifier("1.2.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.a", verIdA);
-	assertNotNull("0.0", pluginDescriptor);
-	assertEquals("0.1", pluginDescriptor.getUniqueIdentifier(), "tests.a");
-	assertEquals("0.2", pluginDescriptor.getVersionIdentifier(), verIdA);
-	verIdA = null;
-
-	PluginVersionIdentifier verIdB = new PluginVersionIdentifier("2.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.b", verIdB);
-	assertNotNull("1.0", pluginDescriptor);
-	assertEquals("1.1", pluginDescriptor.getUniqueIdentifier(), "tests.b");
-	assertEquals("1.2", pluginDescriptor.getVersionIdentifier(), verIdB);
-	verIdB = null;
-
-	PluginVersionIdentifier verIdC = new PluginVersionIdentifier("1.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC);
-	assertNotNull("2.0", pluginDescriptor);
-	assertEquals("2.1", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("2.2", pluginDescriptor.getVersionIdentifier(), verIdC);
-	verIdC = null;
-
-	verIdC = new PluginVersionIdentifier("2.0.5");
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC);
-	assertNotNull("3.0", pluginDescriptor);
-	assertEquals("3.1", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptor.getVersionIdentifier(), verIdC);
-	verIdC = null;
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_11("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_12.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_12.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_12.java
deleted file mode 100644
index 447be7b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_12.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_12 extends PluginResolveTest {
-public PluginResolveTest_12() {
-	super(null);
-}
-public PluginResolveTest_12(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.12/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor pluginDescriptor = null;
-
-	PluginVersionIdentifier verIdA = new PluginVersionIdentifier("1.2.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.a", verIdA);
-	assertNotNull("0.0", pluginDescriptor);
-	assertEquals("0.1", pluginDescriptor.getUniqueIdentifier(), "tests.a");
-	assertEquals("0.2", pluginDescriptor.getVersionIdentifier(), verIdA);
-	verIdA = null;
-
-	PluginVersionIdentifier verIdB = new PluginVersionIdentifier("2.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.b", verIdB);
-	assertNotNull("1.0", pluginDescriptor);
-	assertEquals("1.1", pluginDescriptor.getUniqueIdentifier(), "tests.b");
-	assertEquals("1.2", pluginDescriptor.getVersionIdentifier(), verIdB);
-	verIdB = null;
-
-	PluginVersionIdentifier verIdC = new PluginVersionIdentifier("1.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC);
-	assertNotNull("2.0", pluginDescriptor);
-	assertEquals("2.1", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("2.2", pluginDescriptor.getVersionIdentifier(), verIdC);
-	verIdC = null;
-
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_12("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_13.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_13.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_13.java
deleted file mode 100644
index 526575b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_13.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_13 extends PluginResolveTest {
-public PluginResolveTest_13() {
-	super(null);
-}
-public PluginResolveTest_13(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.13/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor pluginDescriptor = null;
-
-	PluginVersionIdentifier verIdB = new PluginVersionIdentifier("2.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.b", verIdB);
-	assertNotNull("0.0", pluginDescriptor);
-	assertEquals("0.1", pluginDescriptor.getUniqueIdentifier(), "tests.b");
-	assertEquals("0.2", pluginDescriptor.getVersionIdentifier(), verIdB);
-	verIdB = null;
-
-	PluginVersionIdentifier verIdC = new PluginVersionIdentifier("2.0.5");
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC);
-	assertNotNull("1.0", pluginDescriptor);
-	assertEquals("1.1", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("1.2", pluginDescriptor.getVersionIdentifier(), verIdC);
-	verIdC = null;
-
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_13("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_14.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_14.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_14.java
deleted file mode 100644
index 33ebaf5..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_14.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_14 extends PluginResolveTest {
-public PluginResolveTest_14() {
-	super(null);
-}
-public PluginResolveTest_14(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.14/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor pluginDescriptor = null;
-	
-	PluginVersionIdentifier verIdA = new PluginVersionIdentifier("1.2.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.a", verIdA);
-	assertNotNull("0.0", pluginDescriptor);
-	assertEquals("0.1", pluginDescriptor.getUniqueIdentifier(), "tests.a");
-	assertEquals("0.2", pluginDescriptor.getVersionIdentifier(), verIdA);
-	verIdA = null;
-
-	PluginVersionIdentifier verIdB = new PluginVersionIdentifier("2.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.b", verIdB);
-	assertNotNull("1.0", pluginDescriptor);
-	assertEquals("1.1", pluginDescriptor.getUniqueIdentifier(), "tests.b");
-	assertEquals("1.2", pluginDescriptor.getVersionIdentifier(), verIdB);
-	verIdB = null;
-
-	PluginVersionIdentifier verIdC1 = new PluginVersionIdentifier("1.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC1);
-	assertNotNull("2.0", pluginDescriptor);
-	assertEquals("2.1", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("2.2", pluginDescriptor.getVersionIdentifier(), verIdC1);
-	verIdC1 = null;
-	
-	PluginVersionIdentifier verIdC2 = new PluginVersionIdentifier("2.0.5");
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC2);
-	assertNotNull("3.0", pluginDescriptor);
-	assertEquals("3.1", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptor.getVersionIdentifier(), verIdC2);
-	verIdC2 = null;
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_14("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_15.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_15.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_15.java
deleted file mode 100644
index 44c930b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_15.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_15 extends PluginResolveTest {
-public PluginResolveTest_15() {
-	super(null);
-}
-public PluginResolveTest_15(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.15/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	// This scenario should fail to resolve (I think)
-	// but gives 2 plugins.
-	
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	PluginVersionIdentifier verIdB = new PluginVersionIdentifier("2.1.0");
-	IPluginDescriptor pluginDescriptor = registry.getPluginDescriptor("tests.b", verIdB);
-	assertNotNull("1.0", pluginDescriptor);
-	assertEquals("1.1", pluginDescriptor.getUniqueIdentifier(), "tests.b");
-	assertEquals("1.2", pluginDescriptor.getVersionIdentifier(), verIdB);
-	verIdB = null;
-
-	PluginVersionIdentifier verIdC1 = new PluginVersionIdentifier("2.0.5");
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC1);
-	assertNotNull("2.0", pluginDescriptor);
-	assertEquals("2.1", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("2.2", pluginDescriptor.getVersionIdentifier(), verIdC1);
-	verIdC1 = null;
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_15("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_16.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_16.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_16.java
deleted file mode 100644
index 2919d34..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_16.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_16 extends PluginResolveTest {
-public PluginResolveTest_16() {
-	super(null);
-}
-public PluginResolveTest_16(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.16/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.0.1"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_16("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_17.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_17.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_17.java
deleted file mode 100644
index ce9574c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_17.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_17 extends PluginResolveTest {
-public PluginResolveTest_17() {
-	super(null);
-}
-public PluginResolveTest_17(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.17/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 0);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_17("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_18.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_18.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_18.java
deleted file mode 100644
index e8e14b6..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_18.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_18 extends PluginResolveTest {
-public PluginResolveTest_18() {
-	super(null);
-}
-public PluginResolveTest_18(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.18/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.0.2"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_18("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_19.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_19.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_19.java
deleted file mode 100644
index e5cc71f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_19.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_19 extends PluginResolveTest {
-public PluginResolveTest_19() {
-	super(null);
-}
-public PluginResolveTest_19(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.19/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.0.2"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_19("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_2.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_2.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_2.java
deleted file mode 100644
index ee50272..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_2.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_2 extends PluginResolveTest {
-public PluginResolveTest_2() {
-	super(null);
-}
-public PluginResolveTest_2(String name) {
-	super(name);
-}
-public void baseTest() {
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-		String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.2/");
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		fail("0.0.0 Unexpected exception - " + e.getMessage());
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor pd = null;
-
-	pd = checkResolved(registry, "0.0", "tests.a", "1.2.2");
-	checkResolvedPrereqs("0.1", pd, new String[] { "tests.b" }, new String[] { "2.2.0" });
-
-	pd = checkResolved(registry, "1.0", "tests.b", "2.2.0");
-	checkResolvedPrereqs("1.1", pd, new String[] { "tests.c" }, new String[] { "2.0.5" });
-
-	pd = checkResolved(registry, "2.0", "tests.c", "2.0.5");
-	checkResolvedPrereqs("2.1", pd, new String[] { "tests.d" }, new String[] { "2.0.0" });
-
-	pd = checkResolved(registry, "3.0", "tests.d", "2.0.0");
-	checkResolvedPrereqs("3.1", pd, new String[] { "tests.e" }, new String[] { "2.1.0" });
-
-	pd = checkResolved(registry, "4.0", "tests.e", "2.1.0");
-	checkResolvedPrereqs("4.1", pd, new String[] {	}, new String[] {	});
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_2("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_20.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_20.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_20.java
deleted file mode 100644
index 043f475..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_20.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_20 extends PluginResolveTest {
-public PluginResolveTest_20() {
-	super(null);
-}
-public PluginResolveTest_20(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.20/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 0);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_20("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_21.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_21.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_21.java
deleted file mode 100644
index 024678f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_21.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_21 extends PluginResolveTest {
-public PluginResolveTest_21() {
-	super(null);
-}
-public PluginResolveTest_21(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.21/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.2.4"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_21("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_22.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_22.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_22.java
deleted file mode 100644
index caf9600..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_22.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_22 extends PluginResolveTest {
-public PluginResolveTest_22() {
-	super(null);
-}
-public PluginResolveTest_22(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.22/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.2.4"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_22("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_23.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_23.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_23.java
deleted file mode 100644
index bddc140..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_23.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_23 extends PluginResolveTest {
-public PluginResolveTest_23() {
-	super(null);
-}
-public PluginResolveTest_23(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.23/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.3.0"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_23("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_24.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_24.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_24.java
deleted file mode 100644
index bbbcf72..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_24.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_24 extends PluginResolveTest {
-public PluginResolveTest_24() {
-	super(null);
-}
-public PluginResolveTest_24(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.24/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.3.0"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_24("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_25.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_25.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_25.java
deleted file mode 100644
index 3389d85..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_25.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_25 extends PluginResolveTest {
-public PluginResolveTest_25() {
-	super(null);
-}
-public PluginResolveTest_25(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.25/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 0);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_25("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_26.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_26.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_26.java
deleted file mode 100644
index e83b44b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_26.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_26 extends PluginResolveTest {
-public PluginResolveTest_26() {
-	super(null);
-}
-public PluginResolveTest_26(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.26/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("3.0.1"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_26("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_27.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_27.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_27.java
deleted file mode 100644
index ef37ffe..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_27.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_27 extends PluginResolveTest {
-public PluginResolveTest_27() {
-	super(null);
-}
-public PluginResolveTest_27(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.27/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("3.0.1"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_27("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_28.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_28.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_28.java
deleted file mode 100644
index 1d46693..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_28.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_28 extends PluginResolveTest {
-public PluginResolveTest_28() {
-	super(null);
-}
-public PluginResolveTest_28(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.28/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 0);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_28("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_29.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_29.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_29.java
deleted file mode 100644
index 768ef96..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_29.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_29 extends PluginResolveTest {
-public PluginResolveTest_29() {
-	super(null);
-}
-public PluginResolveTest_29(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.29/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.2.4"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_29("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_3.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_3.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_3.java
deleted file mode 100644
index f9e766d..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_3.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_3 extends PluginResolveTest {
-public PluginResolveTest_3() {
-	super(null);
-}
-public PluginResolveTest_3(String name) {
-	super(name);
-}
-public void baseTest() {
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.3/");
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor pd = null;
-
-	pd = checkResolved(registry, "0.0", "tests.a", "1.2.1");
-	checkResolvedPrereqs("0.1", pd, new String[] { "tests.b" }, new String[] { "1.0.0" });
-
-	pd = checkResolved(registry, "1.0", "tests.b", "1.0.0");
-	checkResolvedPrereqs("1.1", pd, new String[] { "tests.c" }, new String[] { "1.0.2" });
-
-	pd = checkResolved(registry, "2.0", "tests.c", "1.0.2");
-	checkResolvedPrereqs("2.1", pd, new String[] { "tests.d" }, new String[] { "1.1.1" });
-
-	pd = checkResolved(registry, "3.0", "tests.d", "1.1.1");
-	checkResolvedPrereqs("3.1", pd, new String[] { "tests.e" }, new String[] { "1.1.1" });
-
-	pd = checkResolved(registry, "4.0", "tests.e", "1.1.1");
-	checkResolvedPrereqs("4.1", pd, new String[] {	}, new String[] {	});
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_3("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_30.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_30.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_30.java
deleted file mode 100644
index 86a4eef..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_30.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_30 extends PluginResolveTest {
-public PluginResolveTest_30() {
-	super(null);
-}
-public PluginResolveTest_30(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.30/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.2.4"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_30("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_31.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_31.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_31.java
deleted file mode 100644
index 6d0c39c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_31.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_31 extends PluginResolveTest {
-public PluginResolveTest_31() {
-	super(null);
-}
-public PluginResolveTest_31(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.31/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.3.0"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_31("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_32.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_32.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_32.java
deleted file mode 100644
index f0c3cd4..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_32.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_32 extends PluginResolveTest {
-public PluginResolveTest_32() {
-	super(null);
-}
-public PluginResolveTest_32(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.32/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.3.0"));
-	
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_32("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_33.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_33.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_33.java
deleted file mode 100644
index 8782a42..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_33.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_33 extends PluginResolveTest {
-public PluginResolveTest_33() {
-	super(null);
-}
-public PluginResolveTest_33(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.33/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 0);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_33("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_4.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_4.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_4.java
deleted file mode 100644
index 9a35210..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_4.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_4 extends PluginResolveTest {
-public PluginResolveTest_4() {
-	super(null);
-}
-
-public PluginResolveTest_4(String name) {
-	super(name);
-}
-public void baseTest() {
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.4/");
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor pd = null;
-
-	pd = checkResolved(registry, "0.0", "tests.a", "1.2.0");
-	checkResolvedPrereqs("0.1", pd, new String[] { "tests.b", "tests.c" }, new String[] {"2.1.0", "2.0.5" });
-
-	pd = checkResolved(registry, "1.0", "tests.b", "2.1.0");
-	checkResolvedPrereqs("1.1", pd, new String[] { "tests.c" }, new String[] { "2.0.5" });
-
-	pd = checkResolved(registry, "2.0", "tests.c", "2.0.5");
-	checkResolvedPrereqs("2.1", pd, new String[] { "tests.d" }, new String[] { "2.0.0" });
-
-	pd = checkResolved(registry, "3.0", "tests.d", "2.0.0");
-	checkResolvedPrereqs("3.1", pd, new String[] { "tests.e" }, new String[] { "2.1.0" });
-
-	pd = checkResolved(registry, "4.0", "tests.e", "2.1.0");
-	checkResolvedPrereqs("4.1", pd, new String[] { }, new String[] { });
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_4("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_5.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_5.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_5.java
deleted file mode 100644
index 18b1fcd..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_5.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_5 extends PluginResolveTest {
-public PluginResolveTest_5() {
-	super(null);
-}
-public PluginResolveTest_5(String name) {
-	super(name);
-}
-public void baseTest() {
-	// prerequisite loop test
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.5/");
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor pd;
-
-	pd = registry.getPluginDescriptor("tests.a");
-	assertNull("0.1", pd);
-
-	pd = registry.getPluginDescriptor("tests.b");
-	assertNull("0.2", pd);
-
-	pd = registry.getPluginDescriptor("tests.c");
-	assertNull("0.3", pd);
-
-	pd = registry.getPluginDescriptor("tests.d");
-	assertNull("0.4", pd);
-
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_5("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_6.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_6.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_6.java
deleted file mode 100644
index aec567c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_6.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_6 extends PluginResolveTest {
-public PluginResolveTest_6() {
-	super(null);
-}
-public PluginResolveTest_6(String name) {
-	super(name);
-}
-public void baseTest() {
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.6/");
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor pd = null;
-
-	pd = checkResolved(registry, "0.0", "tests.a", "1.0.0", true);
-	checkResolvedPrereqs("0.1", pd, new String[] { "tests.c" }, new String[] { "1.0.9" });
-
-	pd = checkResolved(registry, "1.0", "tests.b", "1.0.0", true);
-	checkResolvedPrereqs("1.1", pd, new String[] { "tests.c" }, new String[] { "2.5.0" });
-
-	pd = checkResolved(registry, "2.0", "tests.c", "1.0.9", true);
-	checkResolvedPrereqs("2.1", pd, new String[] { }, new String[] { });
-
-	pd = checkResolved(registry, "3.0", "tests.c", "2.5.0", true);
-	checkResolvedPrereqs("3.1", pd, new String[] { }, new String[] { });
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_6("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_7.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_7.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_7.java
deleted file mode 100644
index b993455..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_7.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_7 extends PluginResolveTest {
-public PluginResolveTest_7() {
-	super(null);
-}
-public PluginResolveTest_7(String name) {
-	super(name);
-}
-public void baseTest() {
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.7/");
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor pd = null;
-
-	pd = checkResolved(registry, "0.0", "tests.a", "1.0.0", true);
-	checkResolvedPrereqs("0.1", pd, new String[] { "tests.c" }, new String[] { "1.0.9" });
-
-	pd = checkResolved(registry, "1.0", "tests.b", "1.0.0", false);
-
-	pd = checkResolved(registry, "2.0", "tests.c", "1.0.9", true);
-	checkResolvedPrereqs("2.1", pd, new String[] { }, new String[] { });
-
-	pd = checkResolved(registry, "3.0", "tests.c", "2.5.0", false);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_7("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_8.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_8.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_8.java
deleted file mode 100644
index 64cb189..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_8.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_8 extends PluginResolveTest {
-public PluginResolveTest_8() {
-	super(null);
-}
-public PluginResolveTest_8(String name) {
-	super(name);
-}
-public void baseTest() {
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.8/");
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor pd = null;
-
-	pd = checkResolved(registry, "0.0", "tests.a", "1.0.0", true);
-	checkResolvedPrereqs("0.1", pd, new String[] { "tests.c" }, new String[] { "1.0.9" });
-
-	pd = checkResolved(registry, "1.0", "tests.b", "1.0.0", false);
-
-	pd = checkResolved(registry, "2.0", "tests.c", "1.0.9", true);
-	checkResolvedPrereqs("2.1", pd, new String[] { }, new String[] { });
-
-	pd = checkResolved(registry, "3.0", "tests.c", "2.5.0", false);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_8("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_9.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_9.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_9.java
deleted file mode 100644
index cecf97a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginResolveTest_9.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class PluginResolveTest_9 extends PluginResolveTest {
-public PluginResolveTest_9() {
-	super(null);
-}
-public PluginResolveTest_9(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.resolve.9/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor pluginDescriptor = null;
-
-	PluginVersionIdentifier verIdA = new PluginVersionIdentifier("1.2.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.a", verIdA);
-	assertNotNull("0.0", pluginDescriptor);
-	assertEquals("0.1", pluginDescriptor.getUniqueIdentifier(), "tests.a");
-	assertEquals("0.2", pluginDescriptor.getVersionIdentifier(), verIdA);
-	verIdA = null;
-
-	PluginVersionIdentifier verIdB = new PluginVersionIdentifier("2.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.b", verIdB);
-	assertNotNull("1.0", pluginDescriptor);
-	assertEquals("1.1", pluginDescriptor.getUniqueIdentifier(), "tests.b");
-	assertEquals("1.2", pluginDescriptor.getVersionIdentifier(), verIdB);
-	verIdB = null;
-
-	PluginVersionIdentifier verIdC = new PluginVersionIdentifier("1.1.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.c", verIdC);
-	assertNotNull("2.0", pluginDescriptor);
-	assertEquals("2.1", pluginDescriptor.getUniqueIdentifier(), "tests.c");
-	assertEquals("2.2", pluginDescriptor.getVersionIdentifier(), verIdC);
-	verIdC = null;
-
-	PluginVersionIdentifier verIdD = new PluginVersionIdentifier("1.0.0");
-	pluginDescriptor = registry.getPluginDescriptor("tests.d", verIdD);
-	assertNotNull("3.0", pluginDescriptor);
-	assertEquals("3.1", pluginDescriptor.getUniqueIdentifier(), "tests.d");
-	assertEquals("3.2", pluginDescriptor.getVersionIdentifier(), verIdD);
-	verIdD = null;
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginResolveTest_9("baseTest"));
-	return suite;
-}
-}
-
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginVersionTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginVersionTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginVersionTest.java
deleted file mode 100644
index 2a5d4e6..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginVersionTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-/**
- */
-public class PluginVersionTest extends EclipseWorkspaceTest {
-public PluginVersionTest() {
-	super(null);
-}
-public PluginVersionTest(String name) {
-	super(name);
-}
-public void baseTest() {
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.version.1/");
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("plugin.a");
-
-	// check descriptor
-	assertTrue("0.0", null != pd);
-	assertTrue("0.1", pd.getUniqueIdentifier().equals("plugin.a"));
-
-	// check to see if we have all plugins
-	IPluginDescriptor[] all = registry.getPluginDescriptors();
-	assertTrue("1.0", all.length != 0);
-	int count = 0;
-	for (int i = 0; i < all.length; i++) {
-		if (all[i].getUniqueIdentifier().equals("plugin.a"))
-			count++;
-	}
-	assertTrue("1.1", count == 3);
-
-	// try again using filtered list
-	all = registry.getPluginDescriptors("plugin.a");
-	assertTrue("1.2", all.length == 3);
-
-	// try again using filtered list and invalid id
-	all = registry.getPluginDescriptors("plugin.a" + ".invalid");
-	assertTrue("1.3", all.length == 0);
-
-	// lookup descriptors individually
-	PluginVersionIdentifier v = new PluginVersionIdentifier("1.0.0");
-	pd = registry.getPluginDescriptor("plugin.a", v);
-	assertTrue("2.0.0", pd == null);
-
-	v = new PluginVersionIdentifier("1.0.1");
-	pd = registry.getPluginDescriptor("plugin.a", v);
-	assertTrue("2.1.0", pd != null);
-	assertTrue("2.1.1", "plugin.a".equals(pd.getUniqueIdentifier()));
-	assertTrue("2.1.2", v.equals(pd.getVersionIdentifier()));
-
-	v = new PluginVersionIdentifier("1.1.0");
-	pd = registry.getPluginDescriptor("plugin.a", v);
-	assertTrue("2.2.0", pd != null);
-	assertTrue("2.2.1", "plugin.a".equals(pd.getUniqueIdentifier()));
-	assertTrue("2.2.2", v.equals(pd.getVersionIdentifier()));
-
-	v = new PluginVersionIdentifier("2.0.0");
-	pd = registry.getPluginDescriptor("plugin.a", v);
-	assertTrue("2.3.0", pd == null);
-
-	v = new PluginVersionIdentifier("2.0.15");
-	pd = registry.getPluginDescriptor("plugin.a", v);
-	assertTrue("2.4.0", pd != null);
-	assertTrue("2.4.1", "plugin.a".equals(pd.getUniqueIdentifier()));
-	assertTrue("2.4.2", v.equals(pd.getVersionIdentifier()));
-
-	v = new PluginVersionIdentifier("9.9.9");
-	pd = registry.getPluginDescriptor("plugin.a", v);
-	assertTrue("2.5.0", pd == null);
-
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginVersionTest("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginVersionTest_2.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginVersionTest_2.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginVersionTest_2.java
deleted file mode 100644
index 7ac547f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginVersionTest_2.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-/**
- */
-public class PluginVersionTest_2 extends EclipseWorkspaceTest {
-public PluginVersionTest_2() {
-	super(null);
-}
-public PluginVersionTest_2(String name) {
-	super(name);
-}
-public void baseTest() {
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.version.2/");
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	
-	IPluginDescriptor pd;
-	IPluginDescriptor[] list;
-	IPluginPrerequisite[] prereqs;
-
-	// Check plugin a
-	list = registry.getPluginDescriptors("a");
-	assertEquals("1.0", list.length, 1);
-	pd = list[0];
-	assertEquals("1.1", pd.getVersionIdentifier(), new PluginVersionIdentifier("2.0.0"));
-	prereqs = pd.getPluginPrerequisites();
-	assertEquals("1.2", prereqs.length, 1);
-	assertEquals("1.3", prereqs[0].getUniqueIdentifier(), "b");
-	assertEquals("1.4", prereqs[0].getResolvedVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// Check plugin b
-	list = registry.getPluginDescriptors("b");
-	assertEquals("2.0", list.length, 1);
-	pd = list[0];
-	assertEquals("2.1", pd.getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	prereqs = pd.getPluginPrerequisites();
-	assertEquals("2.2", prereqs.length, 1);
-	assertEquals("2.3", prereqs[0].getUniqueIdentifier(), "c");
-	assertEquals("2.4", prereqs[0].getResolvedVersionIdentifier(), new PluginVersionIdentifier("1.3.0"));
-	
-	// Check plugin c
-	list = registry.getPluginDescriptors("c");
-	assertEquals("3.0", list.length, 1);
-	pd = list[0];
-	assertEquals("3.1", pd.getVersionIdentifier(), new PluginVersionIdentifier("1.3.0"));
-	prereqs = pd.getPluginPrerequisites();
-	assertEquals("3.2", prereqs.length, 2);
-	IPluginPrerequisite prereqD = null;
-	IPluginPrerequisite prereqE = null;
-	for (int i = 0; i < prereqs.length; i++) {
-		if (prereqs[i].getUniqueIdentifier().equals("d"))
-			prereqD = prereqs[i];
-		else if (prereqs[i].getUniqueIdentifier().equals("e"))
-			prereqE = prereqs[i];
-	}
-	assertNotNull("3.3", prereqD);
-	assertNotNull("3.4", prereqE);
-	assertEquals("3.5", prereqD.getResolvedVersionIdentifier(), new PluginVersionIdentifier("1.3.0"));
-	assertEquals("3.6", prereqE.getResolvedVersionIdentifier(), new PluginVersionIdentifier("1.3.2"));
-	
-	// Check plugin d
-	list = registry.getPluginDescriptors("d");
-	assertEquals("4.0", list.length, 1);
-	pd = list[0];
-	assertEquals("4.1", pd.getVersionIdentifier(), new PluginVersionIdentifier("1.3.0"));
-	prereqs = pd.getPluginPrerequisites();
-	assertEquals("4.2", prereqs.length, 0);
-	
-	// Check plugin e
-	list = registry.getPluginDescriptors("e");
-	assertEquals("5.0", list.length, 1);
-	pd = list[0];
-	assertEquals("5.1", pd.getVersionIdentifier(), new PluginVersionIdentifier("1.3.2"));
-	prereqs = pd.getPluginPrerequisites();
-	assertEquals("5.2", prereqs.length, 0);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginVersionTest_2("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginXmlTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginXmlTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginXmlTest.java
deleted file mode 100644
index fe8f58e..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/PluginXmlTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-/**
- */
-public class PluginXmlTest extends EclipseWorkspaceTest {
-public PluginXmlTest() {
-	super(null);
-}
-public PluginXmlTest(String name) {
-	super(name);
-}
-public void baseTest() {
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/plugins.parser.1/");
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-	IPluginDescriptor pd = registry.getPluginDescriptor("plugins.parser.1");
-
-	// check descriptor
-	assertTrue("0.0", null != pd);
-	assertTrue("0.1", pd.getUniqueIdentifier().equals("plugins.parser.1"));
-	assertTrue("0.2", pd.getLabel().equals("IBM Tooling Platform Core Tests"));
-	assertTrue("0.3", pd.getProviderName().equals("IBM"));
-	assertTrue("0.4", pd.getVersionIdentifier().equals(new PluginVersionIdentifier("1.2")));
-	assertTrue("0.6", !pd.isPluginActivated());
-	assertTrue("0.7", pd.getInstallURL().getFile().equals("/plugin/plugins.parser.1_1.2.0/"));
-
-	// check prereqs
-	IPluginPrerequisite[] prereq = pd.getPluginPrerequisites();
-	assertTrue("1.0", prereq.length == 2);
-
-	assertTrue("1.1.0", prereq[0].getUniqueIdentifier().equals("plugins.parser.2"));
-	assertTrue("1.1.0.0", prereq[0].getVersionIdentifier().equals(new PluginVersionIdentifier("3.7")));
-	assertTrue("1.1.1", prereq[0].getResolvedVersionIdentifier().equals(new PluginVersionIdentifier("3.7.9")));
-	assertTrue("1.1.2", prereq[0].isExported());
-	assertTrue("1.1.3", prereq[0].isMatchedAsCompatible());
-
-	assertTrue("1.2.0", prereq[1].getUniqueIdentifier().equals("plugins.parser.3"));
-	assertTrue("1.2.1", null == prereq[1].getVersionIdentifier());
-	assertTrue("1.2.2", prereq[1].getResolvedVersionIdentifier().equals(new PluginVersionIdentifier("1.2.0")));
-	assertTrue("1.2.3", !prereq[1].isExported());
-	assertTrue("1.2.4", !prereq[1].isMatchedAsPerfect());
-	assertTrue("1.2.4", !prereq[1].isMatchedAsEquivalent());
-	assertTrue("1.2.6", !prereq[1].isMatchedAsCompatible());
-	assertTrue("1.2.7", !prereq[1].isMatchedAsGreaterOrEqual());
-
-	// check runtime libs
-	ILibrary[] lib = pd.getRuntimeLibraries();
-	assertTrue("2.0", lib.length == 3);
-
-	assertTrue("2.1.0", null == lib[0].getContentFilters());
-	assertTrue("2.1.1", lib[0].getPath().toString().equals("lib1.jar"));
-	assertTrue("2.1.2", !lib[0].isExported());
-	assertTrue("2.1.3", !lib[0].isFullyExported());
-
-	assertTrue("2.2.0", null == lib[1].getContentFilters()); // fully exported => no filter
-	assertTrue("2.2.1", lib[1].getPath().toString().equals("lib2.jar"));
-	assertTrue("2.2.2", lib[1].isExported());
-	assertTrue("2.2.3", lib[1].isFullyExported());
-
-	assertTrue("2.3.0", null != lib[2].getContentFilters());
-	assertTrue("2.3.0.1", lib[2].getContentFilters().length == 1);
-	assertTrue("2.3.1", lib[2].getPath().toString().equals("lib3.jar"));
-	assertTrue("2.3.2", lib[2].isExported());
-	assertTrue("2.3.3", !lib[2].isFullyExported());
-
-	// check declared extension points
-	IExtensionPoint[] xpt;
-	xpt = pd.getExtensionPoints();
-	assertTrue("3.0", xpt.length == 2);
-
-	assertTrue("3.1.0", xpt[0].getDeclaringPluginDescriptor().equals(pd));
-	assertTrue("3.1.1", xpt[0].getUniqueIdentifier().equals("plugins.parser.1" + ".xpt1"));
-	assertTrue("3.1.2", xpt[0].getSimpleIdentifier().equals("xpt1"));
-	assertTrue("3.1.3", xpt[0].getLabel().equals("First extension point"));
-	assertTrue("3.1.4", xpt[0].getSchemaReference().equals("pde/xpt1.xml"));
-
-	assertTrue("3.2.0", xpt[1].getDeclaringPluginDescriptor().equals(pd));
-	assertTrue("3.2.1", xpt[1].getUniqueIdentifier().equals("plugins.parser.1" + ".xpt2"));
-	assertTrue("3.2.2", xpt[1].getSimpleIdentifier().equals("xpt2"));
-	assertTrue("3.2.3", xpt[1].getLabel().equals("Second extension point"));
-	assertTrue("3.2.4", xpt[1].getSchemaReference().equals(""));
-
-	// check declared extensions
-	IExtension[] ext;
-	ext = pd.getExtensions();
-	assertTrue("4.0", ext.length == 2);
-
-	assertTrue("4.1.0", ext[0].getDeclaringPluginDescriptor().equals(pd));
-	assertTrue("4.1.1", ext[0].getUniqueIdentifier().equals("plugins.parser.1" + ".ext1"));
-	assertTrue("4.1.2", ext[0].getSimpleIdentifier().equals("ext1"));
-	assertTrue("4.1.3", ext[0].getLabel().equals("First extension"));
-	assertTrue("4.1.4", ext[0].getExtensionPointUniqueIdentifier().equals("plugins.parser.1" + ".xpt1"));
-
-	assertTrue("4.2.0", ext[1].getDeclaringPluginDescriptor().equals(pd));
-	assertTrue("4.2.1", null == ext[1].getUniqueIdentifier());
-	assertTrue("4.2.2", null == ext[1].getSimpleIdentifier());
-	assertTrue("4.2.3", ext[1].getLabel().equals(""));
-	assertTrue("4.2.4", ext[1].getExtensionPointUniqueIdentifier().equals("plugins.parser.1" + ".xpt1"));
-
-	// check configured extensions (via extension point)
-	IExtensionPoint xpt1 = registry.getExtensionPoint("plugins.parser.1" + ".xpt1");
-	assertTrue("5.0", null != xpt1);
-	ext = xpt1.getExtensions();
-	assertTrue("5.0.1", ext.length == 2);
-
-	assertTrue("5.1.0", ext[0].getDeclaringPluginDescriptor().equals(pd));
-	assertTrue("5.1.1", ext[0].getUniqueIdentifier().equals("plugins.parser.1" + ".ext1"));
-	assertTrue("5.1.2", ext[0].getSimpleIdentifier().equals("ext1"));
-	assertTrue("5.1.3", ext[0].getLabel().equals("First extension"));
-	assertTrue("5.1.4", ext[0].getExtensionPointUniqueIdentifier().equals("plugins.parser.1" + ".xpt1"));
-
-	assertTrue("5.2.0", ext[1].getDeclaringPluginDescriptor().equals(pd));
-	assertTrue("5.2.1", null == ext[1].getUniqueIdentifier());
-	assertTrue("5.2.2", null == ext[1].getSimpleIdentifier());
-	assertTrue("5.2.3", ext[1].getLabel().equals(""));
-	assertTrue("5.2.4", ext[1].getExtensionPointUniqueIdentifier().equals("plugins.parser.1" + ".xpt1"));
-
-	// check configured extension (directly)
-	IExtension ext1 = registry.getExtension("plugins.parser.1", "xpt1", "plugins.parser.1" + ".ext1");
-	assertTrue("6.0", null != ext1);
-
-	assertTrue("6.1.0", ext1.getDeclaringPluginDescriptor().equals(pd));
-	assertTrue("6.1.1", ext1.getUniqueIdentifier().equals("plugins.parser.1" + ".ext1"));
-	assertTrue("6.1.2", ext1.getSimpleIdentifier().equals("ext1"));
-	assertTrue("6.1.3", ext1.getLabel().equals("First extension"));
-	assertTrue("6.1.4", ext1.getExtensionPointUniqueIdentifier().equals("plugins.parser.1" + ".xpt1"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new PluginXmlTest("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_1.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_1.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_1.java
deleted file mode 100644
index 86fbbf9..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_1.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginPrerequisiteModel;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class RegressionResolveTest_1 extends PluginResolveTest {
-public RegressionResolveTest_1() {
-	super(null);
-}
-public RegressionResolveTest_1(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/regression.resolve.1/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// Grab the prerequisite and examine it later
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.5"));
-	
-	// Now check the prerequisite and the return values of getMatch()
-	assertEquals("3.0", requires.length, 1);
-	assertTrue("3.1", requires[0].isMatchedAsExact());
-	assertTrue("3.2", !requires[0].isMatchedAsCompatible());
-	PluginPrerequisiteModel req = (PluginPrerequisiteModel)requires[0];
-	assertTrue("3.3", req.getMatch());
-	assertTrue("3.4", !(req.getMatch()) == false);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new RegressionResolveTest_1("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_10.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_10.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_10.java
deleted file mode 100644
index 1e88326..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_10.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginPrerequisiteModel;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class RegressionResolveTest_10 extends PluginResolveTest {
-public RegressionResolveTest_10() {
-	super(null);
-}
-public RegressionResolveTest_10(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/regression.resolve.10/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// Grab the prerequisite and examine it later
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("3.1.0"));
-	
-	// Now check the prerequisite and the return values of getMatch()
-	assertEquals("3.0", requires.length, 1);
-	assertTrue("3.1", !requires[0].isMatchedAsExact());
-	assertTrue("3.2", !requires[0].isMatchedAsCompatible());
-	PluginPrerequisiteModel req = (PluginPrerequisiteModel)requires[0];
-	assertTrue("3.3", req.getMatch() == false);
-	assertTrue("3.4", !(req.getMatch()) == true);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new RegressionResolveTest_10("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_2.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_2.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_2.java
deleted file mode 100644
index 4fc25c8..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_2.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginPrerequisiteModel;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class RegressionResolveTest_2 extends PluginResolveTest {
-public RegressionResolveTest_2() {
-	super(null);
-}
-public RegressionResolveTest_2(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/regression.resolve.2/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// Grab the prerequisite and examine it later
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.5"));
-	
-	// Now check the prerequisite and the return values of getMatch()
-	assertEquals("3.0", requires.length, 1);
-	assertTrue("3.1", requires[0].isMatchedAsExact());
-	assertTrue("3.2", !requires[0].isMatchedAsCompatible());
-	PluginPrerequisiteModel req = (PluginPrerequisiteModel)requires[0];
-	assertTrue("3.3", req.getMatch());
-	assertTrue("3.4", !(req.getMatch()) == false);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new RegressionResolveTest_2("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_3.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_3.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_3.java
deleted file mode 100644
index dfabd0e..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_3.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginPrerequisiteModel;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class RegressionResolveTest_3 extends PluginResolveTest {
-public RegressionResolveTest_3() {
-	super(null);
-}
-public RegressionResolveTest_3(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/regression.resolve.3/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// Grab the prerequisite and examine it later
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.3"));
-	
-	// Now check the prerequisite and the return values of getMatch()
-	assertEquals("3.0", requires.length, 1);
-	assertTrue("3.1", requires[0].isMatchedAsExact());
-	assertTrue("3.2", !requires[0].isMatchedAsCompatible());
-	PluginPrerequisiteModel req = (PluginPrerequisiteModel)requires[0];
-	assertTrue("3.3", req.getMatch());
-	assertTrue("3.4", !(req.getMatch()) == false);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new RegressionResolveTest_3("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_4.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_4.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_4.java
deleted file mode 100644
index af3e4e7..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_4.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginPrerequisiteModel;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class RegressionResolveTest_4 extends PluginResolveTest {
-public RegressionResolveTest_4() {
-	super(null);
-}
-public RegressionResolveTest_4(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/regression.resolve.4/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// Grab the prerequisite and examine it later
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.2.0"));
-	
-	// Now check the prerequisite and the return values of getMatch()
-	assertEquals("3.0", requires.length, 1);
-	assertTrue("3.1", !requires[0].isMatchedAsExact());
-	assertTrue("3.2", requires[0].isMatchedAsCompatible());
-	PluginPrerequisiteModel req = (PluginPrerequisiteModel)requires[0];
-	assertTrue("3.3", req.getMatch() == false);
-	assertTrue("3.4", !(req.getMatch()) == true);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new RegressionResolveTest_4("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_5.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_5.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_5.java
deleted file mode 100644
index fe1f8c9..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_5.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginPrerequisiteModel;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class RegressionResolveTest_5 extends PluginResolveTest {
-public RegressionResolveTest_5() {
-	super(null);
-}
-public RegressionResolveTest_5(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/regression.resolve.5/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// Grab the prerequisite and examine it later
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.2.0"));
-	
-	// Now check the prerequisite and the return values of getMatch()
-	assertEquals("3.0", requires.length, 1);
-	assertTrue("3.1", !requires[0].isMatchedAsExact());
-	assertTrue("3.2", requires[0].isMatchedAsCompatible());
-	PluginPrerequisiteModel req = (PluginPrerequisiteModel)requires[0];
-	assertTrue("3.3", req.getMatch() == false);
-	assertTrue("3.4", !(req.getMatch()) == true);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new RegressionResolveTest_5("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_6.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_6.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_6.java
deleted file mode 100644
index 655f6e5..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_6.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginPrerequisiteModel;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class RegressionResolveTest_6 extends PluginResolveTest {
-public RegressionResolveTest_6() {
-	super(null);
-}
-public RegressionResolveTest_6(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/regression.resolve.6/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// Grab the prerequisite and examine it later
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.3"));
-	
-	// Now check the prerequisite and the return values of getMatch()
-	assertEquals("3.0", requires.length, 1);
-	assertTrue("3.1", !requires[0].isMatchedAsExact());
-	assertTrue("3.2", requires[0].isMatchedAsCompatible());
-	PluginPrerequisiteModel req = (PluginPrerequisiteModel)requires[0];
-	assertTrue("3.3", req.getMatch() == false);
-	assertTrue("3.4", !(req.getMatch()) == true);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new RegressionResolveTest_6("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_7.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_7.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_7.java
deleted file mode 100644
index dcfad4e..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_7.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginPrerequisiteModel;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class RegressionResolveTest_7 extends PluginResolveTest {
-public RegressionResolveTest_7() {
-	super(null);
-}
-public RegressionResolveTest_7(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/regression.resolve.7/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// Grab the prerequisite and examine it later
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.2.0"));
-	
-	// Now check the prerequisite and the return values of getMatch()
-	assertEquals("3.0", requires.length, 1);
-	assertTrue("3.1", !requires[0].isMatchedAsExact());
-	assertTrue("3.2", requires[0].isMatchedAsCompatible());
-	PluginPrerequisiteModel req = (PluginPrerequisiteModel)requires[0];
-	assertTrue("3.3", req.getMatch() == false);
-	assertTrue("3.4", !(req.getMatch()) == true);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new RegressionResolveTest_7("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_8.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_8.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_8.java
deleted file mode 100644
index dce119b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_8.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginPrerequisiteModel;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class RegressionResolveTest_8 extends PluginResolveTest {
-public RegressionResolveTest_8() {
-	super(null);
-}
-public RegressionResolveTest_8(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/regression.resolve.8/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// Grab the prerequisite and examine it later
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.2.0"));
-	
-	// Now check the prerequisite and the return values of getMatch()
-	assertEquals("3.0", requires.length, 1);
-	assertTrue("3.1", !requires[0].isMatchedAsExact());
-	assertTrue("3.2", requires[0].isMatchedAsCompatible());
-	PluginPrerequisiteModel req = (PluginPrerequisiteModel)requires[0];
-	assertTrue("3.3", req.getMatch() == false);
-	assertTrue("3.4", !(req.getMatch()) == true);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new RegressionResolveTest_8("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_9.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_9.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_9.java
deleted file mode 100644
index cfca542..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/RegressionResolveTest_9.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginPrerequisiteModel;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class RegressionResolveTest_9 extends PluginResolveTest {
-public RegressionResolveTest_9() {
-	super(null);
-}
-public RegressionResolveTest_9(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/regression.resolve.9/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] plugins = registry.getPluginDescriptors();
-	assertEquals("0.0", plugins.length, 2);
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// Grab the prerequisite and examine it later
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.3"));
-	
-	// Now check the prerequisite and the return values of getMatch()
-	assertEquals("3.0", requires.length, 1);
-	assertTrue("3.1", !requires[0].isMatchedAsExact());
-	assertTrue("3.2", requires[0].isMatchedAsCompatible());
-	PluginPrerequisiteModel req = (PluginPrerequisiteModel)requires[0];
-	assertTrue("3.3", req.getMatch() == false);
-	assertTrue("3.4", !(req.getMatch()) == true);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new RegressionResolveTest_9("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_1.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_1.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_1.java
deleted file mode 100644
index 5b93831..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_1.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_1 extends PluginResolveTest {
-public SoftPrereqTest_1() {
-	super(null);
-}
-public SoftPrereqTest_1(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.1/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 1);
-	assertEquals("0.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("0.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// make sure it also has an optional prerequisite
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-	assertEquals("1.0", requires.length, 1);
-	assertEquals("1.1", requires[0].getUniqueIdentifier(), "tests.b");
-	assertTrue("1.2", !requires[0].isMatchedAsPerfect());
-	assertTrue("1.3", !requires[0].isMatchedAsEquivalent());
-	assertTrue("1.4", !requires[0].isMatchedAsCompatible());
-	assertTrue("1.5", !requires[0].isMatchedAsGreaterOrEqual());
-	assertTrue("1.6", requires[0].isOptional());
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_1("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_10.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_10.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_10.java
deleted file mode 100644
index 747845f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_10.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_10 extends PluginResolveTest {
-public SoftPrereqTest_10() {
-	super(null);
-}
-public SoftPrereqTest_10(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.10/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 0);
-	
-	// look for tests.b - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-	
-	// look for tests.c - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-
-	// look for tests.d - there should be 0
-	pluginDescriptors = registry.getPluginDescriptors("tests.d");
-	assertEquals("4.0", pluginDescriptors.length, 0);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_10("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_11.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_11.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_11.java
deleted file mode 100644
index 2c941ed..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_11.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_11 extends PluginResolveTest {
-public SoftPrereqTest_11() {
-	super(null);
-}
-public SoftPrereqTest_11(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.11/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_11("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_12.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_12.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_12.java
deleted file mode 100644
index 0a7e712..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_12.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_12 extends PluginResolveTest {
-public SoftPrereqTest_12() {
-	super(null);
-}
-public SoftPrereqTest_12(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.12/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 1);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 0);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_12("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_13.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_13.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_13.java
deleted file mode 100644
index 17e6dcd..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_13.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_13 extends PluginResolveTest {
-public SoftPrereqTest_13() {
-	super(null);
-}
-public SoftPrereqTest_13(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.13/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_13("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_14.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_14.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_14.java
deleted file mode 100644
index d7c9c77..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_14.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_14 extends PluginResolveTest {
-public SoftPrereqTest_14() {
-	super(null);
-}
-public SoftPrereqTest_14(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.14/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 1);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 0);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_14("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_15.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_15.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_15.java
deleted file mode 100644
index 3d81e50..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_15.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_15 extends PluginResolveTest {
-public SoftPrereqTest_15() {
-	super(null);
-}
-public SoftPrereqTest_15(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.15/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_15("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_16.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_16.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_16.java
deleted file mode 100644
index c74827c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_16.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_16 extends PluginResolveTest {
-public SoftPrereqTest_16() {
-	super(null);
-}
-public SoftPrereqTest_16(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.16/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 1);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 0);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_16("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_17.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_17.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_17.java
deleted file mode 100644
index ff903cb..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_17.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_17 extends PluginResolveTest {
-public SoftPrereqTest_17() {
-	super(null);
-}
-public SoftPrereqTest_17(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.17/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// Should be identical to softPrereq.3 as the only difference is the order of the 
-	// requires.
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// make sure it also has an optional prerequisite
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-	assertEquals("2.0", requires.length, 2);
-	IPluginPrerequisite requireB = null;
-	IPluginPrerequisite requireC = null;
-	for (int i = 0; i < requires.length; i++) {
-		if (requires[i].getUniqueIdentifier().equals("tests.b"))
-			requireB = requires[i];
-		else if (requires[i].getUniqueIdentifier().equals("tests.c"))
-			requireC = requires[i];
-	}
-	assertNotNull("2.1", requireB);
-	assertNotNull("2.2", requireC);
-	
-	// Now check the data in the prerequisites
-	assertTrue("3.0", !requireB.isMatchedAsPerfect());
-	assertTrue("3.1", !requireB.isMatchedAsEquivalent());
-	assertTrue("3.2", !requireB.isMatchedAsCompatible());
-	assertTrue("3.3", !requireB.isMatchedAsGreaterOrEqual());
-	assertTrue("3.4", requireB.isOptional());
-	assertNull("3.5", requireB.getVersionIdentifier());
-	assertTrue("3.6", !requireC.isMatchedAsPerfect());
-	assertTrue("3.7", !requireC.isMatchedAsEquivalent());
-	assertTrue("3.8", !requireC.isMatchedAsCompatible());
-	assertTrue("3.9", !requireC.isMatchedAsGreaterOrEqual());
-	assertTrue("3.10", !requireC.isOptional());
-	assertNull("3.11", requireC.getVersionIdentifier());
-	
-	// look for tests.b - shouldn't be found
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("4.0", pluginDescriptors.length, 0);
-	
-	// look for tests.c - should exist
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("5.0", pluginDescriptors.length, 1);
-	assertEquals("5.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("5.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.0.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_17("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_18.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_18.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_18.java
deleted file mode 100644
index e1b620b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_18.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_18 extends PluginResolveTest {
-public SoftPrereqTest_18() {
-	super(null);
-}
-public SoftPrereqTest_18(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.18/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	// Should be identical to softPrereq.4 as the only difference is the order of the 
-	// requires.
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 0);
-
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_18("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_19.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_19.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_19.java
deleted file mode 100644
index e3ff0bd..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_19.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_19 extends PluginResolveTest {
-public SoftPrereqTest_19() {
-	super(null);
-}
-public SoftPrereqTest_19(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.19/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	// Not quite identical to softPrereq.5 as a failed requirement occurs before
-	// the optional one so there will be no plugins (the optional one does not get
-	// considered as a new root node).
-	
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 0);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_19("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_2.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_2.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_2.java
deleted file mode 100644
index e5530ad..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_2.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_2 extends PluginResolveTest {
-public SoftPrereqTest_2() {
-	super(null);
-}
-public SoftPrereqTest_2(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.2/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// make sure it also has an optional prerequisite
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-	assertEquals("2.0", requires.length, 1);
-	assertEquals("2.1", requires[0].getUniqueIdentifier(), "tests.b");
-	assertTrue("2.2", !requires[0].isMatchedAsPerfect());
-	assertTrue("2.3", !requires[0].isMatchedAsEquivalent());
-	assertTrue("2.4", !requires[0].isMatchedAsCompatible());
-	assertTrue("2.5", !requires[0].isMatchedAsGreaterOrEqual());
-	assertTrue("2.6", requires[0].isOptional());
-	
-	// look for tests.b
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_2("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_20.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_20.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_20.java
deleted file mode 100644
index b92194c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_20.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_20 extends PluginResolveTest {
-public SoftPrereqTest_20() {
-	super(null);
-}
-public SoftPrereqTest_20(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.20/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 3);
-	
-	// Should be identical to softPrereq.6 as the only difference is the order of the 
-	// requires.
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// make sure it also has an optional prerequisite
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-	assertEquals("2.0", requires.length, 2);
-	IPluginPrerequisite requireB = null;
-	IPluginPrerequisite requireC = null;
-	for (int i = 0; i < requires.length; i++) {
-		if (requires[i].getUniqueIdentifier().equals("tests.b"))
-			requireB = requires[i];
-		else if (requires[i].getUniqueIdentifier().equals("tests.c"))
-			requireC = requires[i];
-	}
-	assertNotNull("2.1", requireB);
-	assertNotNull("2.2", requireC);
-	
-	// Now check the data in the prerequisites
-	assertTrue("3.0", !requireB.isMatchedAsPerfect());
-	assertTrue("3.1", !requireB.isMatchedAsEquivalent());
-	assertTrue("3.2", !requireB.isMatchedAsCompatible());
-	assertTrue("3.3", !requireB.isMatchedAsGreaterOrEqual());
-	assertTrue("3.4", requireB.isOptional());
-	assertNull("3.5", requireB.getVersionIdentifier());
-	assertTrue("3.6", !requireC.isMatchedAsPerfect());
-	assertTrue("3.7", !requireC.isMatchedAsEquivalent());
-	assertTrue("3.8", !requireC.isMatchedAsCompatible());
-	assertTrue("3.9", !requireC.isMatchedAsGreaterOrEqual());
-	assertTrue("3.10", !requireC.isOptional());
-	assertNull("3.11", requireC.getVersionIdentifier());
-	
-	// look for tests.b - should exist
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.0.1"));
-	
-	// look for tests.c - should exist
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("5.0", pluginDescriptors.length, 1);
-	assertEquals("5.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("5.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.0.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_20("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_21.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_21.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_21.java
deleted file mode 100644
index ce7ce69..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_21.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_21 extends PluginResolveTest {
-public SoftPrereqTest_21() {
-	super(null);
-}
-public SoftPrereqTest_21(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.21/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 4);
-	
-	// Should be identical to softPrereq.7 as the only difference is the order of the 
-	// requires.
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// make sure it also has an optional prerequisite
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-	assertEquals("2.0", requires.length, 2);
-	IPluginPrerequisite requireB = null;
-	IPluginPrerequisite requireC = null;
-	for (int i = 0; i < requires.length; i++) {
-		if (requires[i].getUniqueIdentifier().equals("tests.b"))
-			requireB = requires[i];
-		else if (requires[i].getUniqueIdentifier().equals("tests.c"))
-			requireC = requires[i];
-	}
-	assertNotNull("2.1", requireB);
-	assertNotNull("2.2", requireC);
-	
-	// Now check the data in the prerequisites
-	assertTrue("3.0", requireB.isMatchedAsCompatible());
-	assertTrue("3.1", !requireB.isMatchedAsExact());
-	assertTrue("3.2", requireB.isOptional());
-	assertEquals("3.3", requireB.getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	assertTrue("3.4", requireC.isMatchedAsCompatible());
-	assertTrue("3.5", !requireC.isMatchedAsExact());
-	assertTrue("3.6", !requireC.isOptional());
-	assertEquals("3.7", requireC.getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-	
-	// look for tests.b - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// look for tests.c - there should be 2
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("5.0", pluginDescriptors.length, 2);
-	IPluginDescriptor pluginC_110 = null;
-	IPluginDescriptor pluginC_210 = null;
-	for (int i = 0; i < pluginDescriptors.length; i++) {
-		boolean badVersion = false;
-		IPluginDescriptor thisPlugin = pluginDescriptors[i];
-		if (thisPlugin.getVersionIdentifier().equals(new PluginVersionIdentifier("1.1.0"))) {
-			pluginC_110 = thisPlugin;
-		} else if (thisPlugin.getVersionIdentifier().equals(new PluginVersionIdentifier("2.1.0"))) {
-			pluginC_210 = thisPlugin;
-		} else {
-			assertTrue ("5.1 Bad version number found" + thisPlugin.getVersionIdentifier().toString(), false);
-			badVersion = true;
-		}
-		// Check the common components of these plugins
-		if (thisPlugin != null && !badVersion) {
-			assertEquals("5.2", thisPlugin.getUniqueIdentifier(), "tests.c");
-		}
-	}
-	assertNotNull("5.3", pluginC_110);
-	assertNotNull("5.4", pluginC_210);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_21("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_22.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_22.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_22.java
deleted file mode 100644
index 2ade3ba..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_22.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_22 extends PluginResolveTest {
-public SoftPrereqTest_22() {
-	super(null);
-}
-public SoftPrereqTest_22(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.22/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// Should be identical to softPrereq.8 as the only difference is the order of the 
-	// requires.
-	
-	// look for tests.a - should not exist as it caused the conflict
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 0);
-	
-	// look for tests.b - there should be 1
-	// Because tests.a causes a conflict, it is removed/disabled.  This causes
-	// tests.b to be orphaned.  Therefore, tests.b gets considered a root node.
-	// We then pick up the latest version of tests.b and resolve for it.
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-	
-	// look for tests.c - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_22("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_3.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_3.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_3.java
deleted file mode 100644
index 5432435..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_3.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_3 extends PluginResolveTest {
-public SoftPrereqTest_3() {
-	super(null);
-}
-public SoftPrereqTest_3(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.3/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// make sure it also has an optional prerequisite
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-	assertEquals("2.0", requires.length, 2);
-	IPluginPrerequisite requireB = null;
-	IPluginPrerequisite requireC = null;
-	for (int i = 0; i < requires.length; i++) {
-		if (requires[i].getUniqueIdentifier().equals("tests.b"))
-			requireB = requires[i];
-		else if (requires[i].getUniqueIdentifier().equals("tests.c"))
-			requireC = requires[i];
-	}
-	assertNotNull("2.1", requireB);
-	assertNotNull("2.2", requireC);
-	
-	// Now check the data in the prerequisites
-	assertTrue("3.0", !requireB.isMatchedAsPerfect());
-	assertTrue("3.1", !requireB.isMatchedAsEquivalent());
-	assertTrue("3.2", !requireB.isMatchedAsCompatible());
-	assertTrue("3.3", !requireB.isMatchedAsGreaterOrEqual());
-	assertTrue("3.4", requireB.isOptional());
-	assertNull("3.5", requireB.getVersionIdentifier());
-	assertTrue("3.6", !requireC.isMatchedAsPerfect());
-	assertTrue("3.7", !requireC.isMatchedAsEquivalent());
-	assertTrue("3.8", !requireC.isMatchedAsCompatible());
-	assertTrue("3.9", !requireC.isMatchedAsGreaterOrEqual());
-	assertTrue("3.10", !requireC.isOptional());
-	assertNull("3.11", requireC.getVersionIdentifier());
-	
-	// look for tests.b - shouldn't be found
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("4.0", pluginDescriptors.length, 0);
-	
-	// look for tests.c - should exist
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("5.0", pluginDescriptors.length, 1);
-	assertEquals("5.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("5.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.0.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_3("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_4.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_4.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_4.java
deleted file mode 100644
index 770e776..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_4.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_4 extends PluginResolveTest {
-public SoftPrereqTest_4() {
-	super(null);
-}
-public SoftPrereqTest_4(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.4/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 0);
-
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_4("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_5.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_5.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_5.java
deleted file mode 100644
index 75468a1..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_5.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_5 extends PluginResolveTest {
-public SoftPrereqTest_5() {
-	super(null);
-}
-public SoftPrereqTest_5(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.5/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 1);
-	
-	// look for tests.a - should not be found (the real prerequisite doesn't exist)
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 0);
-
-	// look for tests.b - should exist
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.0.1"));
-	
-	// look for tests.c - shouldn't be found
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 0);
-	
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_5("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_6.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_6.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_6.java
deleted file mode 100644
index 21a6380..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_6.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_6 extends PluginResolveTest {
-public SoftPrereqTest_6() {
-	super(null);
-}
-public SoftPrereqTest_6(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.6/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 3);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// make sure it also has an optional prerequisite
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-	assertEquals("2.0", requires.length, 2);
-	IPluginPrerequisite requireB = null;
-	IPluginPrerequisite requireC = null;
-	for (int i = 0; i < requires.length; i++) {
-		if (requires[i].getUniqueIdentifier().equals("tests.b"))
-			requireB = requires[i];
-		else if (requires[i].getUniqueIdentifier().equals("tests.c"))
-			requireC = requires[i];
-	}
-	assertNotNull("2.1", requireB);
-	assertNotNull("2.2", requireC);
-	
-	// Now check the data in the prerequisites
-	assertTrue("3.0", !requireB.isMatchedAsPerfect());
-	assertTrue("3.1", !requireB.isMatchedAsEquivalent());
-	assertTrue("3.2", !requireB.isMatchedAsCompatible());
-	assertTrue("3.3", !requireB.isMatchedAsGreaterOrEqual());
-	assertTrue("3.4", requireB.isOptional());
-	assertNull("3.5", requireB.getVersionIdentifier());
-	assertTrue("3.6", !requireC.isMatchedAsPerfect());
-	assertTrue("3.7", !requireC.isMatchedAsEquivalent());
-	assertTrue("3.8", !requireC.isMatchedAsCompatible());
-	assertTrue("3.9", !requireC.isMatchedAsGreaterOrEqual());
-	assertTrue("3.10", !requireC.isOptional());
-	assertNull("3.11", requireC.getVersionIdentifier());
-	
-	// look for tests.b - should exist
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.0.1"));
-	
-	// look for tests.c - should exist
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("5.0", pluginDescriptors.length, 1);
-	assertEquals("5.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("5.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.0.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_6("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_7.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_7.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_7.java
deleted file mode 100644
index d960cca..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_7.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_7 extends PluginResolveTest {
-public SoftPrereqTest_7() {
-	super(null);
-}
-public SoftPrereqTest_7(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.7/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 4);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// make sure it also has an optional prerequisite
-	IPluginPrerequisite[] requires = pluginDescriptors[0].getPluginPrerequisites();
-	assertEquals("2.0", requires.length, 2);
-	IPluginPrerequisite requireB = null;
-	IPluginPrerequisite requireC = null;
-	for (int i = 0; i < requires.length; i++) {
-		if (requires[i].getUniqueIdentifier().equals("tests.b"))
-			requireB = requires[i];
-		else if (requires[i].getUniqueIdentifier().equals("tests.c"))
-			requireC = requires[i];
-	}
-	assertNotNull("2.1", requireB);
-	assertNotNull("2.2", requireC);
-	
-	// Now check the data in the prerequisites
-	assertTrue("3.0", requireB.isMatchedAsCompatible());
-	assertTrue("3.1", !requireB.isMatchedAsExact());
-	assertTrue("3.2", requireB.isOptional());
-	assertEquals("3.3", requireB.getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	assertTrue("3.4", requireC.isMatchedAsCompatible());
-	assertTrue("3.5", !requireC.isMatchedAsExact());
-	assertTrue("3.6", !requireC.isOptional());
-	assertEquals("3.7", requireC.getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-	
-	// look for tests.b - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// look for tests.c - there should be 2
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("5.0", pluginDescriptors.length, 2);
-	IPluginDescriptor pluginC_110 = null;
-	IPluginDescriptor pluginC_210 = null;
-	for (int i = 0; i < pluginDescriptors.length; i++) {
-		boolean badVersion = false;
-		IPluginDescriptor thisPlugin = pluginDescriptors[i];
-		if (thisPlugin.getVersionIdentifier().equals(new PluginVersionIdentifier("1.1.0"))) {
-			pluginC_110 = thisPlugin;
-		} else if (thisPlugin.getVersionIdentifier().equals(new PluginVersionIdentifier("2.1.0"))) {
-			pluginC_210 = thisPlugin;
-		} else {
-			assertTrue ("5.1 Bad version number found" + thisPlugin.getVersionIdentifier().toString(), false);
-			badVersion = true;
-		}
-		// Check the common components of these plugins
-		if (thisPlugin != null && !badVersion) {
-			assertEquals("5.2", thisPlugin.getUniqueIdentifier(), "tests.c");
-		}
-	}
-	assertNotNull("5.3", pluginC_110);
-	assertNotNull("5.4", pluginC_210);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_7("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_8.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_8.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_8.java
deleted file mode 100644
index dac3b0a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_8.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_8 extends PluginResolveTest {
-public SoftPrereqTest_8() {
-	super(null);
-}
-public SoftPrereqTest_8(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.8/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 2);
-	
-	// look for tests.a - should not exist as it caused the conflict
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 0);
-	
-	// look for tests.b - there should be 1
-	// Because tests.a causes a conflict, it is removed/disabled.  This causes
-	// tests.b to be orphaned.  Therefore, tests.b gets considered a root node.
-	// We then pick up the latest version of tests.b and resolve for it.
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-	
-	// look for tests.c - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 1);
-	assertEquals("3.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	assertEquals("3.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_8("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_9.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_9.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_9.java
deleted file mode 100644
index 3b55f45..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/SoftPrereqTest_9.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-
-import java.net.URL;
-import junit.framework.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.InternalFactory;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.Policy;
-/**
- */
-public class SoftPrereqTest_9 extends PluginResolveTest {
-public SoftPrereqTest_9() {
-	super(null);
-}
-public SoftPrereqTest_9(String name) {
-	super(name);
-}
-public void baseTest() {
-	
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("softPrerequisiteTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	PluginDescriptor tempPlugin = (PluginDescriptor)Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.tests.runtime");
-	String pluginPath = tempPlugin.getLocation().concat("Plugin_Testing/softPrereq.9/");
-	URL pluginURLs[] = new URL[1];
-	URL pURL = null;
-	try {
-		pURL = new URL (pluginPath);
-	} catch (java.net.MalformedURLException e) {
-		assertTrue("Bad URL for " + pluginPath, true);
-	}
-	pluginURLs[0] = pURL;
-	IPluginRegistry registry = ParseHelper.doParsing (factory, pluginURLs, true);
-
-	IPluginDescriptor[] pluginDescriptors = registry.getPluginDescriptors();
-	assertEquals("0.0", pluginDescriptors.length, 5);
-	
-	// look for tests.a
-	pluginDescriptors = registry.getPluginDescriptors("tests.a");
-	assertEquals("1.0", pluginDescriptors.length, 1);
-	assertEquals("1.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.a");
-	assertEquals("1.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.2.0"));
-	
-	// look for tests.b - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.b");
-	assertEquals("2.0", pluginDescriptors.length, 1);
-	assertEquals("2.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.b");
-	assertEquals("2.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("1.1.0"));
-	
-	// look for tests.c - there should be 2
-	pluginDescriptors = registry.getPluginDescriptors("tests.c");
-	assertEquals("3.0", pluginDescriptors.length, 2);
-	IPluginDescriptor pluginC_110 = null;
-	IPluginDescriptor pluginC_210 = null;
-	for (int i = 0; i < pluginDescriptors.length; i++) {
-		boolean badVersion = false;
-		IPluginDescriptor thisPlugin = pluginDescriptors[i];
-		if (thisPlugin.getVersionIdentifier().equals(new PluginVersionIdentifier("1.1.0")))
-			pluginC_110 = thisPlugin;
-		else if (thisPlugin.getVersionIdentifier().equals(new PluginVersionIdentifier("2.1.0")))
-			pluginC_210 = thisPlugin;
-		else {
-			badVersion = true;
-			assertTrue("3.1 Bad version found" + thisPlugin.getVersionIdentifier().toString(), false);
-		}
-		if (!badVersion)
-			assertEquals("3.2", pluginDescriptors[0].getUniqueIdentifier(), "tests.c");
-	}
-	assertNotNull("3.3", pluginC_110);
-	assertNotNull("3.4", pluginC_210);
-
-	// look for tests.d - there should be 1
-	pluginDescriptors = registry.getPluginDescriptors("tests.d");
-	assertEquals("4.0", pluginDescriptors.length, 1);
-	assertEquals("4.1", pluginDescriptors[0].getUniqueIdentifier(), "tests.d");
-	assertEquals("4.2", pluginDescriptors[0].getVersionIdentifier(), new PluginVersionIdentifier("2.1.0"));
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SoftPrereqTest_9("baseTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/TestClass.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/TestClass.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/TestClass.java
deleted file mode 100644
index cc3cd70..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/plugins/TestClass.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.plugins;
-public class TestClass {
-
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/AllTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/AllTests.java
deleted file mode 100644
index 6f11569..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/AllTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.registrycache;
-
-import junit.framework.*;
-
-public class AllTests extends TestCase {
-public AllTests() {
-	super(null);
-}
-public AllTests(String name) {
-	super(name);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(SimpleCacheTests.suite());
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/CacheHelpers.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/CacheHelpers.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/CacheHelpers.java
deleted file mode 100644
index 91ffd45..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/CacheHelpers.java
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/SimpleCacheTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/SimpleCacheTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/SimpleCacheTests.java
deleted file mode 100644
index 743e0db..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/registrycache/SimpleCacheTests.java
+++ /dev/null
@@ -1,1407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.registrycache;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.*;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-import org.eclipse.core.tests.internal.registrycache.CacheHelpers.*;
-import java.io.*;
-import junit.framework.*;
-import org.xml.sax.*;
-
-public class SimpleCacheTests extends CacheHelpers {
-public SimpleCacheTests() {
-	super();
-}
-public SimpleCacheTests(String name) {
-	super(name);
-}
-public String[] extensionSetup() {
-	PluginDescriptorModel plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	Extension[] pluginExtensions = new Extension[3];
-	for (int i = 0; i < pluginExtensions.length; i++) {
-		pluginExtensions[i] = new Extension();
-		pluginExtensions[i].setParentPluginDescriptor(plugin);
-	}
-	pluginExtensions[0].setName("First Extension");
-	pluginExtensions[0].setId("first");
-	pluginExtensions[0].setExtensionPoint("First Extension Point");
-
-	pluginExtensions[1].setExtensionPoint("Second Extension Point");
-
-	pluginExtensions[2].setExtensionPoint("Third Extension Point");
-
-	// First group of properties
-	ConfigurationProperty[] propertyGroup1 = new ConfigurationProperty[2];
-	for (int i = 0; i < propertyGroup1.length; i++) {
-		propertyGroup1[i] = new ConfigurationProperty();
-	}
-	propertyGroup1[0].setName("id");
-	propertyGroup1[0].setValue("category_id");
-	propertyGroup1[1].setName("name");
-	propertyGroup1[1].setValue("category_name");
-	// Second group of properties
-	ConfigurationProperty[] propertyGroup2 = new ConfigurationProperty[3];
-	for (int i = 0; i < propertyGroup2.length; i++) {
-		propertyGroup2[i] = new ConfigurationProperty();
-	}
-	propertyGroup2[0].setName("id");
-	propertyGroup2[0].setValue("wizard_id");
-	propertyGroup2[1].setName("name");
-	propertyGroup2[1].setValue("wizard_name");
-	propertyGroup2[2].setName("class");
-	propertyGroup2[2].setValue("wizard_class");
-	// Third group of properties
-	ConfigurationProperty[] propertyGroup3 = new ConfigurationProperty[1];
-	for (int i = 0; i < propertyGroup3.length; i++) {
-		propertyGroup3[i] = new ConfigurationProperty();
-	}
-	propertyGroup3[0].setName("class");
-	propertyGroup3[0].setValue("a selection class");
-
-	// First subelement group
-	ConfigurationElement[] subElementGroup1 = new ConfigurationElement[2];
-	for (int i = 0; i < subElementGroup1.length; i++) {
-		subElementGroup1[i] = new ConfigurationElement();
-		subElementGroup1[i].setParent(pluginExtensions[2]);
-	}
-	subElementGroup1[0].setName("category");
-	subElementGroup1[0].setProperties(propertyGroup1);
-
-	subElementGroup1[1].setName("wizard");
-	subElementGroup1[1].setProperties(propertyGroup2);
-
-	// Second subelement group
-	ConfigurationElement[] subElementGroup2 = new ConfigurationElement[2];
-	for (int i = 0; i < subElementGroup2.length; i++) {
-		subElementGroup2[i] = new ConfigurationElement();
-		subElementGroup2[i].setParent(subElementGroup1[1]);
-	}
-	subElementGroup2[0].setName("description");
-	subElementGroup2[0].setValue("This is just a description");
-	subElementGroup2[1].setName("selection");
-	subElementGroup2[1].setProperties(propertyGroup3);
-
-	// Now link them together
-	subElementGroup1[1].setSubElements(subElementGroup2);
-	pluginExtensions[2].setSubElements(subElementGroup1);
-	plugin.setDeclaredExtensions(pluginExtensions);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  extensionTest
- *  Tests to ensure we cache extension entries correctly.
- */
-public void extensionTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = extensionSetup();
-	// Don't resolve this registry as we don't define all the extension
-	// points.
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, false);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] extExtPtLinkSetup() {
-	PluginDescriptor[] pluginList = new PluginDescriptor[2];
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("abc1");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	Extension[] pluginExtensions = new Extension[4];
-	for (int i = 0; i < pluginExtensions.length; i++) {
-		pluginExtensions[i] = new Extension();
-		pluginExtensions[i].setParentPluginDescriptor(plugin);
-	}
-	pluginExtensions[0].setName("First Extension");
-	pluginExtensions[0].setId("first");
-	pluginExtensions[0].setExtensionPoint("abc1.firstExtPt");
-	pluginExtensions[1].setName("Second Extension");
-	pluginExtensions[1].setId("second");
-	pluginExtensions[1].setExtensionPoint("abc1.secondExtPt");
-	pluginExtensions[2].setName("Third Extension");
-	pluginExtensions[2].setId("third");
-	pluginExtensions[2].setExtensionPoint("abc1.thirdExtPt");
-	pluginExtensions[3].setName("Fourth Extension");
-	pluginExtensions[3].setId("fourth");
-	pluginExtensions[3].setExtensionPoint("abc2.anotherExtPt");
-	plugin.setDeclaredExtensions(pluginExtensions);
-
-	ExtensionPoint[] pluginExtensionPoints = new ExtensionPoint[3];
-	for (int i = 0; i < pluginExtensionPoints.length; i++) {
-		pluginExtensionPoints[i] = new ExtensionPoint();
-	}
-	pluginExtensionPoints[0].setName("First Extension Point");
-	pluginExtensionPoints[0].setId("firstExtPt");
-	pluginExtensionPoints[1].setName("Second Extension Point");
-	pluginExtensionPoints[1].setId("secondExtPt");
-	pluginExtensionPoints[2].setName("Third Extension Point");
-	pluginExtensionPoints[2].setId("thirdExtPt");
-	plugin.setDeclaredExtensionPoints(pluginExtensionPoints);
-
-	pluginList[0] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test2");
-	plugin.setId("abc2");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginExtensionPoints = new ExtensionPoint[1];
-	for (int i = 0; i < pluginExtensionPoints.length; i++) {
-		pluginExtensionPoints[i] = new ExtensionPoint();
-	}
-	pluginExtensionPoints[0].setName("Another Extension Point");
-	pluginExtensionPoints[0].setId("anotherExtPt");
-	plugin.setDeclaredExtensionPoints(pluginExtensionPoints);
-
-	pluginList[1] = plugin;
-
-	ByteArrayOutputStream fs;
-	String[] localXMLFiles = new String[2];
-	for (int i = 0; i < pluginList.length; i++) {
-		fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginDescriptor(pluginList[i], w, 0);
-		w.flush();
-		w.close();
-
-		localXMLFiles[i] = fs.toString();
-	}
-	return localXMLFiles;
-}
-/*  extExtPtLinkTest
- *  Tests to ensure we cache cross links for extensions and extension
- *  points correctly.
- */
-public void extExtPtLinkTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = extExtPtLinkSetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] fragmentExtensionSetup() {
-	PluginDescriptorModel plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	
-	PluginFragmentModel fragment = new FragmentDescriptor();
-	fragment.setName("fragment name");
-	fragment.setPlugin("org.eclipse.webdav");
-	fragment.setPluginVersion("1.0");
-	fragment.setVersion("2.0");
-	fragment.setId("fragmentId");
-	
-	// XXX Remove this once the issue of extensions have fragments
-	// as parents is solved
-	PluginFragmentModel[] fragmentList = new PluginFragmentModel[1];
-	fragmentList[0] = fragment;
-	plugin.setFragments(fragmentList);
-	
-	Extension[] pluginExtensions = new Extension[3];
-	for (int i = 0; i < pluginExtensions.length; i++) {
-		pluginExtensions[i] = new Extension();
-		pluginExtensions[i].setParentPluginDescriptor(plugin);
-	}
-	pluginExtensions[0].setName("First Extension");
-	pluginExtensions[0].setId("first");
-	pluginExtensions[0].setExtensionPoint("First Extension Point");
-
-	pluginExtensions[1].setExtensionPoint("Second Extension Point");
-
-	pluginExtensions[2].setExtensionPoint("Third Extension Point");
-
-	// First group of properties
-	ConfigurationProperty[] propertyGroup1 = new ConfigurationProperty[2];
-	for (int i = 0; i < propertyGroup1.length; i++) {
-		propertyGroup1[i] = new ConfigurationProperty();
-	}
-	propertyGroup1[0].setName("id");
-	propertyGroup1[0].setValue("category_id");
-	propertyGroup1[1].setName("name");
-	propertyGroup1[1].setValue("category_name");
-	// Second group of properties
-	ConfigurationProperty[] propertyGroup2 = new ConfigurationProperty[3];
-	for (int i = 0; i < propertyGroup2.length; i++) {
-		propertyGroup2[i] = new ConfigurationProperty();
-	}
-	propertyGroup2[0].setName("id");
-	propertyGroup2[0].setValue("wizard_id");
-	propertyGroup2[1].setName("name");
-	propertyGroup2[1].setValue("wizard_name");
-	propertyGroup2[2].setName("class");
-	propertyGroup2[2].setValue("wizard_class");
-	// Third group of properties
-	ConfigurationProperty[] propertyGroup3 = new ConfigurationProperty[1];
-	for (int i = 0; i < propertyGroup3.length; i++) {
-		propertyGroup3[i] = new ConfigurationProperty();
-	}
-	propertyGroup3[0].setName("class");
-	propertyGroup3[0].setValue("a selection class");
-
-	// First subelement group
-	ConfigurationElement[] subElementGroup1 = new ConfigurationElement[2];
-	for (int i = 0; i < subElementGroup1.length; i++) {
-		subElementGroup1[i] = new ConfigurationElement();
-		subElementGroup1[i].setParent(pluginExtensions[2]);
-	}
-	subElementGroup1[0].setName("category");
-	subElementGroup1[0].setProperties(propertyGroup1);
-
-	subElementGroup1[1].setName("wizard");
-	subElementGroup1[1].setProperties(propertyGroup2);
-
-	// Second subelement group
-	ConfigurationElement[] subElementGroup2 = new ConfigurationElement[2];
-	for (int i = 0; i < subElementGroup2.length; i++) {
-		subElementGroup2[i] = new ConfigurationElement();
-		subElementGroup2[i].setParent(subElementGroup1[1]);
-	}
-	subElementGroup2[0].setName("description");
-	subElementGroup2[0].setValue("This is just a description");
-	subElementGroup2[1].setName("selection");
-	subElementGroup2[1].setProperties(propertyGroup3);
-
-	// Now link them together
-	subElementGroup1[1].setSubElements(subElementGroup2);
-	pluginExtensions[2].setSubElements(subElementGroup1);
-	fragment.setDeclaredExtensions(pluginExtensions);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-		
-	return localXMLFiles;
-}
-/*  fragmentExtensionTest
- *  Tests to ensure we cache extension entries off a fragment correctly.
- */
-public void fragmentExtensionTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = fragmentExtensionSetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, false);
-
-	// write to a cache file and read it back in
-	// Don't resolve this registry as we haven't put in all the extension
-	// points that are needed
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] fragmentExtExtPtLinkSetup() {
-	PluginDescriptor[] pluginList = new PluginDescriptor[2];
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("abc1");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	
-	FragmentDescriptor[] fragmentList = new FragmentDescriptor[2];
-	FragmentDescriptor fragment = new FragmentDescriptor();
-	fragment.setPlugin("abc1");
-	fragment.setPluginVersion("1.0");
-	fragment.setName("A fragment");
-	fragment.setProviderName("SomeoneElse");
-	fragment.setId("fragmentId1");
-	fragment.setVersion("1.1");
-	FragmentDescriptor[] pluginFragmentList = new FragmentDescriptor[1];
-	pluginFragmentList[0] = fragment;
-	plugin.setFragments(pluginFragmentList);
-
-	Extension[] pluginExtensions = new Extension[4];
-	for (int i = 0; i < pluginExtensions.length; i++) {
-		pluginExtensions[i] = new Extension();
-		pluginExtensions[i].setParentPluginDescriptor(plugin);
-	}
-	pluginExtensions[0].setName("First Extension");
-	pluginExtensions[0].setId("first");
-	pluginExtensions[0].setExtensionPoint("abc1.firstExtPt");
-	pluginExtensions[1].setName("Second Extension");
-	pluginExtensions[1].setId("second");
-	pluginExtensions[1].setExtensionPoint("abc1.secondExtPt");
-	pluginExtensions[2].setName("Third Extension");
-	pluginExtensions[2].setId("third");
-	pluginExtensions[2].setExtensionPoint("abc1.thirdExtPt");
-	pluginExtensions[3].setName("Fourth Extension");
-	pluginExtensions[3].setId("fourth");
-	pluginExtensions[3].setExtensionPoint("abc2.anotherExtPt");
-	fragment.setDeclaredExtensions(pluginExtensions);
-
-	ExtensionPoint[] pluginExtensionPoints = new ExtensionPoint[3];
-	for (int i = 0; i < pluginExtensionPoints.length; i++) {
-		pluginExtensionPoints[i] = new ExtensionPoint();
-	}
-	pluginExtensionPoints[0].setName("First Extension Point");
-	pluginExtensionPoints[0].setId("firstExtPt");
-	pluginExtensionPoints[1].setName("Second Extension Point");
-	pluginExtensionPoints[1].setId("secondExtPt");
-	pluginExtensionPoints[2].setName("Third Extension Point");
-	pluginExtensionPoints[2].setId("thirdExtPt");
-	fragment.setDeclaredExtensionPoints(pluginExtensionPoints);
-
-	pluginList[0] = plugin;
-	fragmentList[0] = fragment;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test2");
-	plugin.setId("abc2");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	fragment = new FragmentDescriptor();
-	fragment.setName("Second Fragment");
-	fragment.setPlugin("abc2");
-	fragment.setPluginVersion("1.0");
-	fragment.setVersion("3.4");
-	fragment.setId("fragmentId2");
-	pluginFragmentList = new FragmentDescriptor[1];
-	pluginFragmentList[0] = fragment;
-	plugin.setFragments(pluginFragmentList);
-	pluginExtensionPoints = new ExtensionPoint[1];
-	for (int i = 0; i < pluginExtensionPoints.length; i++) {
-		pluginExtensionPoints[i] = new ExtensionPoint();
-	}
-	pluginExtensionPoints[0].setName("Another Extension Point");
-	pluginExtensionPoints[0].setId("anotherExtPt");
-	fragment.setDeclaredExtensionPoints(pluginExtensionPoints);
-
-	pluginList[1] = plugin;
-	fragmentList[1] = fragment;
-
-	ByteArrayOutputStream fs;
-	String[] localXMLFiles = new String[4];
-	for (int i = 0; i < pluginList.length; i++) {
-		fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginDescriptor(pluginList[i], w, 0);
-		w.flush();
-		w.close();
-
-		localXMLFiles[i] = fs.toString();
-	}
-	for (int i = 0; i < fragmentList.length; i++) {
-		fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginFragment(fragmentList[i], w, 0);
-		w.flush();
-		w.close();
-
-		localXMLFiles[pluginList.length + i] = fs.toString();
-	}
-	return localXMLFiles;
-}
-/*  fragmentExtExtPtLinkTest
- *  Tests to ensure we cache cross links for extensions and extension
- *  points within fragments correctly.
- */
-public void fragmentExtExtPtLinkTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = fragmentExtExtPtLinkSetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-	// IStatus resolveStatus = registry.resolve(true, true);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] fragmentLibrarySetup() {
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	
-	FragmentDescriptor fragment = new FragmentDescriptor();
-	fragment.setName("A fragment name");
-	fragment.setVersion("2.2");
-	fragment.setPlugin("org.eclipse.webdav");
-	fragment.setPluginVersion("1.0");
-	fragment.setId("fragmentId");
-	FragmentDescriptor[] fragmentList = new FragmentDescriptor[1];
-	fragmentList[0] = fragment;
-	plugin.setFragments(fragmentList);
-
-	Library[] pluginRuntime = new Library[2];
-	for (int i = 0; i < pluginRuntime.length; i++) {
-		pluginRuntime[i] = new Library();
-	}
-	pluginRuntime[0].setName("runtime.jar");
-	String[] exportString = { "*" };
-	pluginRuntime[0].setExports(exportString);
-	pluginRuntime[0].setType("code");
-	pluginRuntime[1].setName("xerces.jar");
-	fragment.setRuntime(pluginRuntime);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  fragmentLibraryTest
- *  Tests to ensure we cache library entries off fragements correctly.
- */
-public void fragmentLibraryTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = fragmentLibrarySetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] fragmentReadOnlySetup() {
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	
-	FragmentDescriptor fragment = new FragmentDescriptor();
-	fragment.setName("fragment1");
-	fragment.setPlugin("org.eclipse.webdav");
-	fragment.setPluginVersion("1.0");
-	fragment.setVersion("1.4");
-	fragment.setId("newFragmentId");
-	FragmentDescriptor[] fragmentList = new FragmentDescriptor[1];
-	fragmentList[0] = fragment;
-	plugin.setFragments(fragmentList);
-
-	PluginPrerequisite[] pluginRequires = new PluginPrerequisite[1];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("org.eclipse.core.runtime");
-	fragment.setRequires(pluginRequires);
-
-	Library[] pluginRuntime = new Library[1];
-	for (int i = 0; i < pluginRuntime.length; i++) {
-		pluginRuntime[i] = new Library();
-	}
-	pluginRuntime[0].setName("runtime.jar");
-	fragment.setRuntime(pluginRuntime);
-
-	Extension[] pluginExtensions = new Extension[1];
-	for (int i = 0; i < pluginExtensions.length; i++) {
-		pluginExtensions[i] = new Extension();
-		pluginExtensions[i].setParentPluginDescriptor(plugin);
-	}
-	pluginExtensions[0].setName("First Extension");
-	fragment.setDeclaredExtensions(pluginExtensions);
-	ConfigurationElement[] subElements = new ConfigurationElement[1];
-	for (int i = 0; i < subElements.length; i++) {
-		subElements[i] = new ConfigurationElement();
-		subElements[i].setParent(pluginExtensions[0]);
-	}
-	subElements[0].setName("FirstSubelement");
-	ConfigurationProperty[] properties = new ConfigurationProperty[1];
-	for (int i = 0; i < properties.length; i++) {
-		properties[i] = new ConfigurationProperty();
-	}
-	properties[0].setName("FirstProperty");
-	properties[0].setValue("FirstValue");
-	subElements[0].setProperties(properties);
-	pluginExtensions[0].setSubElements(subElements);
-
-	ExtensionPoint[] pluginExtensionPoints = new ExtensionPoint[1];
-	for (int i = 0; i < pluginExtensionPoints.length; i++) {
-		pluginExtensionPoints[i] = new ExtensionPoint();
-	}
-	pluginExtensionPoints[0].setName("First Extension Point");
-	fragment.setDeclaredExtensionPoints(pluginExtensionPoints);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  fragmentReadOnlyTest
- *  This is a very basic test to make sure we are caching a very
- *  simple registry and reading it back in correctly.
- */
-public void fragmentReadOnlyTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = fragmentReadOnlySetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-	registry.markReadOnly();
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] fragmentSetup() {
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	
-	ByteArrayOutputStream fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	String[] localXMLFiles = new String[2];
-	localXMLFiles[0] = fs.toString();
-
-	FragmentDescriptor fragment = new FragmentDescriptor();
-	fragment.setPlugin("org.eclipse.webdav");
-	fragment.setPluginVersion("1.0");
-	fragment.setName("The fragment's name");
-	fragment.setId("fragmentId");
-	fragment.setVersion("1.9");
-	fragment.setMatch(PluginFragmentModel.FRAGMENT_MATCH_PERFECT);
-	regWriter.writePluginFragment(fragment, w, 0);
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginFragment(fragment, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[1] = fs.toString();
-
-	return localXMLFiles;
-}
-/*  fragmentTest
- *  This is a very basic test to make sure we are caching a very
- *  simple fragment (one plugin with attirbutes only and a fragment
- *  that causes the name to change) and reading
- *  it back in correctly.
- */
-public void fragmentTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = fragmentSetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "fragmentTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] fragmentPluginSetup() {
-	PluginDescriptor[] plugins = new PluginDescriptor[5];
-	
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("id1.0");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	plugins[0] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("id1.5");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.5");
-	plugins[1] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("id1.9");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.9");
-	plugins[2] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("id3.2");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("3.2");
-	plugins[3] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("id4.7");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("4.7");
-	plugins[4] = plugin;	
-
-	FragmentDescriptor[] fragmentList = new FragmentDescriptor[5];
-
-	FragmentDescriptor[] pluginFragmentList = new FragmentDescriptor[1];
-	FragmentDescriptor fragment = new FragmentDescriptor();
-	fragment.setPlugin("id1.0");
-	fragment.setPluginVersion("1.0");
-	fragment.setName("The fragment's name");
-	fragment.setId("frag1");
-	fragment.setVersion("1.1");
-	pluginFragmentList[0] = fragment;
-	plugins[0].setFragments(pluginFragmentList);
-	fragmentList[0] = fragment;
-
-	pluginFragmentList = new FragmentDescriptor[1];
-	fragment = new FragmentDescriptor();
-	fragment.setPlugin("id1.5");
-	fragment.setPluginVersion("1.5");
-	fragment.setName("The fragment's name");
-	fragment.setId("frag2");
-	fragment.setVersion("1.1");
-	fragment.setMatch(PluginFragmentModel.FRAGMENT_MATCH_PERFECT);
-	pluginFragmentList[0] = fragment;
-	plugins[1].setFragments(pluginFragmentList);
-	fragmentList[1] = fragment;
-
-	pluginFragmentList = new FragmentDescriptor[1];
-	fragment = new FragmentDescriptor();
-	fragment.setPlugin("id1.9");
-	fragment.setPluginVersion("1.9");
-	fragment.setName("The fragment's name");
-	fragment.setId("frag3");
-	fragment.setVersion("1.1");
-	fragment.setMatch(PluginFragmentModel.FRAGMENT_MATCH_EQUIVALENT);
-	pluginFragmentList[0] = fragment;
-	plugins[2].setFragments(pluginFragmentList);
-	fragmentList[2] = fragment;
-
-	pluginFragmentList = new FragmentDescriptor[1];
-	fragment = new FragmentDescriptor();
-	fragment.setPlugin("id3.2");
-	fragment.setPluginVersion("3.0");
-	fragment.setName("The fragment's name");
-	fragment.setId("frag4");
-	fragment.setVersion("1.1");
-	fragment.setMatch(PluginFragmentModel.FRAGMENT_MATCH_COMPATIBLE);
-	pluginFragmentList[0] = fragment;
-	plugins[3].setFragments(pluginFragmentList);
-	fragmentList[3] = fragment;
-
-	pluginFragmentList = new FragmentDescriptor[1];
-	fragment = new FragmentDescriptor();
-	fragment.setPlugin("id4.7");
-	fragment.setPluginVersion("1.5");
-	fragment.setName("The fragment's name");
-	fragment.setId("frag5");
-	fragment.setVersion("1.1");
-	fragment.setMatch(PluginFragmentModel.FRAGMENT_MATCH_GREATER_OR_EQUAL);
-	pluginFragmentList[0] = fragment;
-	plugins[4].setFragments(pluginFragmentList);
-	fragmentList[4] = fragment;
-
-	String[] localXMLFiles = new String[plugins.length + fragmentList.length];
-	for (int i = 0; i < plugins.length; i++) {
-		ByteArrayOutputStream fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginDescriptor(plugins[i], w, 0);
-		w.flush();
-		w.close();
-	
-		localXMLFiles[i] = fs.toString();
-	}
-	
-	for (int i = 0; i < fragmentList.length; i++) {
-		ByteArrayOutputStream fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginFragment(fragmentList[i], w, 0);
-		w.flush();
-		w.close();
-		localXMLFiles[plugins.length + i] = fs.toString();
-	}
-
-	return localXMLFiles;
-}
-/*  fragmentPluginTest
- *  This is a very basic test to make sure we are caching a plugin
- *  with one fragment and reading it back in correctly.
- */
-public void fragmentPluginTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = fragmentPluginSetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] fragmentRegistrySetup() {
-	PluginDescriptor[] pluginList = new PluginDescriptor[5];
-
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginList[0] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("3.0");
-	pluginList[1] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("2.0");
-	pluginList[2] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A Different Name");
-	plugin.setId("newId");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginList[3] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A third name");
-	plugin.setId("thirdId");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginList[4] = plugin;
-
-	FragmentDescriptor[] fragmentList = new FragmentDescriptor[5];
-	FragmentDescriptor fragment = new FragmentDescriptor();
-	fragment.setName("fragment");
-	fragment.setPlugin("org.eclipse.webdav");
-	fragment.setProviderName("Something");
-	fragment.setPluginVersion("1.0");
-	fragment.setId("fragmentId");
-	fragment.setVersion("3.3");
-	fragmentList[0] = fragment;
-
-	fragment = new FragmentDescriptor();
-	fragment.setName("fragment");
-	fragment.setPlugin("org.eclipse.webdav");
-	fragment.setVersion("1.1");
-	fragment.setPluginVersion("3.0");
-	fragment.setId("fragmentId");
-	fragmentList[1] = fragment;
-
-	fragment = new FragmentDescriptor();
-	fragment.setName("fragment");
-	fragment.setPlugin("org.eclipse.webdav");
-	fragment.setPluginVersion("2.0");
-	fragment.setId("fragmentId");
-	fragment.setVersion("2.2");
-	fragmentList[2] = fragment;
-
-	fragment = new FragmentDescriptor();
-	fragment.setName("A Different Name For a Fragment");
-	fragment.setPlugin("newId");
-	fragment.setProviderName("IBM");
-	fragment.setPluginVersion("1.0");
-	fragment.setId("newFragmentId");
-	fragment.setVersion("3.3");
-	fragmentList[3] = fragment;
-
-	fragment = new FragmentDescriptor();
-	fragment.setName("final fragment");
-	fragment.setPlugin("thirdId");
-	fragment.setId("weird");
-	fragment.setProviderName("IBM");
-	fragment.setPluginVersion("1.0");
-	fragment.setVersion("7");
-	fragmentList[4] = fragment;
-
-	String[] localXMLFiles = new String[pluginList.length + fragmentList.length];
-	for (int i = 0; i < pluginList.length; i++) {
-		ByteArrayOutputStream fs;
-		fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginDescriptor(pluginList[i], w, 0);
-		w.flush();
-		w.close();
-
-		localXMLFiles[i] = fs.toString();
-	}
-	for (int i = 0; i < fragmentList.length; i++) {
-		ByteArrayOutputStream fs;
-		fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginFragment(fragmentList[i], w, 0);
-		w.flush();
-		w.close();
-
-		localXMLFiles[i + pluginList.length] = fs.toString();
-	}
-
-	return localXMLFiles;
-}
-/*  fragmentRegistryTest
- *  Tests to ensure we cache a simple registry with fragments correctly.
- */
-public void fragmentRegistryTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = fragmentRegistrySetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] fragmentRequiresSetup() {
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	
-	FragmentDescriptor fragment = new FragmentDescriptor();
-	fragment.setName("fragment2");
-	fragment.setPlugin("org.eclipse.webdav");
-	fragment.setPluginVersion("1.0");
-	fragment.setVersion("1.0");
-	fragment.setId("fragmentId2");
-
-	PluginPrerequisite[] pluginRequires = new PluginPrerequisite[3];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("pluginId1");
-	pluginRequires[0].setVersion("4");
-	pluginRequires[0].setExport(true);
-	pluginRequires[0].setMatchByte(PluginPrerequisiteModel.PREREQ_MATCH_EQUIVALENT);
-	pluginRequires[1].setPlugin("pluginId2");
-	pluginRequires[1].setOptional(true);
-	pluginRequires[2].setPlugin("pluginId3");
-	pluginRequires[2].setVersion("3");
-	fragment.setRequires(pluginRequires);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[5];
-	localXMLFiles[0] = fs.toString();
-
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginFragment(fragment, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[1] = fs.toString();
-	
-	plugin = new PluginDescriptor();
-	plugin.setName("First Prerequisite");
-	plugin.setId("pluginId1");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("4");
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[2] = fs.toString();
-	
-	plugin = new PluginDescriptor();
-	plugin.setName("Second Prerequisite");
-	plugin.setId("pluginId2");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("4");
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[3] = fs.toString();
-	
-	plugin = new PluginDescriptor();
-	plugin.setName("Third Prerequisite");
-	plugin.setId("pluginId3");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("3");
-	fs = new ByteArrayOutputStream();
-	w = new PrintWriter(fs);
-	regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-	localXMLFiles[4] = fs.toString();
-	
-	return localXMLFiles;
-}
-/*  fragmentRequiresTest
- *  Tests to ensure we cache plugin prerequisite entries that hang
- *  off a fragment correctly.
- */
-public void fragmentRequiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = fragmentRequiresSetup();
-	// Don't resolve the registry.  All the prerequisites are not there.
-	// XXX - THIS SHOULD FAIL BUT DOES NOT
-	// 1GDU4UP: ITPCORE:ALL - fragments - don't check for existence of prereq's
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] librarySetup() {
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	Library[] pluginRuntime = new Library[2];
-	for (int i = 0; i < pluginRuntime.length; i++) {
-		pluginRuntime[i] = new Library();
-	}
-	pluginRuntime[0].setName("runtime.jar");
-	String[] exportString = { "*" };
-	pluginRuntime[0].setExports(exportString);
-	pluginRuntime[0].setType("code");
-	pluginRuntime[1].setName("xerces.jar");
-	plugin.setRuntime(pluginRuntime);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  libraryTest
- *  Tests to ensure we cache library entries correctly.
- */
-public void libraryTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = librarySetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] pluginSetup() {
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	ByteArrayOutputStream fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  pluginTest
- *  This is a very basic test to make sure we are caching a very
- *  simple registry (one plugin with attirbutes only) and reading
- *  it back in correctly.
- */
-public void pluginTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = pluginSetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] readOnlySetup() {
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	PluginPrerequisite[] pluginRequires = new PluginPrerequisite[1];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("org.eclipse.core.runtime");
-	plugin.setRequires(pluginRequires);
-
-	Library[] pluginRuntime = new Library[1];
-	for (int i = 0; i < pluginRuntime.length; i++) {
-		pluginRuntime[i] = new Library();
-	}
-	pluginRuntime[0].setName("runtime.jar");
-	plugin.setRuntime(pluginRuntime);
-
-	Extension[] pluginExtensions = new Extension[1];
-	for (int i = 0; i < pluginExtensions.length; i++) {
-		pluginExtensions[i] = new Extension();
-		pluginExtensions[i].setParentPluginDescriptor(plugin);
-	}
-	pluginExtensions[0].setName("First Extension");
-	plugin.setDeclaredExtensions(pluginExtensions);
-	ConfigurationElement[] subElements = new ConfigurationElement[1];
-	for (int i = 0; i < subElements.length; i++) {
-		subElements[i] = new ConfigurationElement();
-		subElements[i].setParent(pluginExtensions[0]);
-	}
-	subElements[0].setName("FirstSubelement");
-	ConfigurationProperty[] properties = new ConfigurationProperty[1];
-	for (int i = 0; i < properties.length; i++) {
-		properties[i] = new ConfigurationProperty();
-	}
-	properties[0].setName("FirstProperty");
-	properties[0].setValue("FirstValue");
-	subElements[0].setProperties(properties);
-	pluginExtensions[0].setSubElements(subElements);
-
-	ExtensionPoint[] pluginExtensionPoints = new ExtensionPoint[1];
-	for (int i = 0; i < pluginExtensionPoints.length; i++) {
-		pluginExtensionPoints[i] = new ExtensionPoint();
-	}
-	pluginExtensionPoints[0].setName("First Extension Point");
-	plugin.setDeclaredExtensionPoints(pluginExtensionPoints);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  readOnlyTest
- *  This is a very basic test to make sure we are caching a very
- *  simple registry and reading it back in correctly.
- */
-public void readOnlyTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = readOnlySetup();
-	// Don't resolve the registry as all the prerequisites aren't there
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, false);
-	registry.markReadOnly();
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-/*  realRegistryTest
- *  Tests to ensure we correctly cache the real plugin registry we are using.
- */
-public void realRegistryTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	PluginRegistryModel registry = (PluginRegistryModel) Platform.getPluginRegistry();
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] registrySetup() {
-	PluginDescriptor[] pluginList = new PluginDescriptor[5];
-
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginList[0] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("3.0");
-	pluginList[1] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("2.0");
-	pluginList[2] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A Different Name");
-	plugin.setId("newId");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginList[3] = plugin;
-
-	plugin = new PluginDescriptor();
-	plugin.setName("A third name");
-	plugin.setId("thirdId");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-	pluginList[4] = plugin;
-
-	String[] localXMLFiles = new String[pluginList.length];
-	for (int i = 0; i < pluginList.length; i++) {
-		ByteArrayOutputStream fs;
-		fs = new ByteArrayOutputStream();
-		PrintWriter w = new PrintWriter(fs);
-		RegistryWriter regWriter = new RegistryWriter();
-		regWriter.writePluginDescriptor(pluginList[i], w, 0);
-		w.flush();
-		w.close();
-
-		localXMLFiles[i] = fs.toString();
-	}
-
-	return localXMLFiles;
-}
-/*  registryTest
- *  Tests to ensure we cache a simple registry correctly.
- */
-public void registryTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = registrySetup();
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, true);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public String[] requiresSetup() {
-	PluginDescriptor plugin = new PluginDescriptor();
-	plugin.setName("A simple test");
-	plugin.setId("org.eclipse.webdav");
-	plugin.setProviderName("IBM");
-	plugin.setVersion("1.0");
-
-	PluginPrerequisite[] pluginRequires = new PluginPrerequisite[5];
-	for (int i = 0; i < pluginRequires.length; i++) {
-		pluginRequires[i] = new PluginPrerequisite();
-	}
-	pluginRequires[0].setPlugin("org.eclipse.core.runtime");
-	pluginRequires[0].setVersion("4");
-	pluginRequires[0].setExport(true);
-	pluginRequires[0].setMatchByte(PluginPrerequisiteModel.PREREQ_MATCH_PERFECT);
-	pluginRequires[1].setPlugin("org.apache.xerces");
-	pluginRequires[1].setOptional(true);
-	pluginRequires[1].setVersion("1.4");
-	pluginRequires[1].setMatchByte(PluginPrerequisiteModel.PREREQ_MATCH_EQUIVALENT);
-	pluginRequires[2].setPlugin("org.eclipse.core.resources");
-	pluginRequires[2].setVersion("3");
-	pluginRequires[2].setMatchByte(PluginPrerequisiteModel.PREREQ_MATCH_COMPATIBLE);
-	pluginRequires[3].setPlugin("anotherPrerequisite");
-	pluginRequires[3].setVersion("2.1.3");
-	pluginRequires[3].setMatchByte(PluginPrerequisiteModel.PREREQ_MATCH_GREATER_OR_EQUAL);
-	pluginRequires[4].setPlugin("finalPrerequisite");
-	plugin.setRequires(pluginRequires);
-
-	ByteArrayOutputStream fs;
-	fs = new ByteArrayOutputStream();
-	PrintWriter w = new PrintWriter(fs);
-	RegistryWriter regWriter = new RegistryWriter();
-	regWriter.writePluginDescriptor(plugin, w, 0);
-	w.flush();
-	w.close();
-
-	String[] localXMLFiles = new String[1];
-	localXMLFiles[0] = fs.toString();
-	return localXMLFiles;
-}
-/*  requiresTest
- *  Tests to ensure we cache plugin prerequisite entries correctly.
- */
-public void requiresTest() {
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-
-	String[] localXMLFiles = requiresSetup();
-	// Don't resolve the registry.  All the prerequisites aren't there
-	PluginRegistryModel registry = doInitialParsing(factory, localXMLFiles, false);
-
-	// write to a cache file and read it back in
-	PluginRegistryModel cachedRegistry = doCacheWriteAndRead(registry, "pluginTestCache", factory);
-
-	// Now compare the registries.  They should be the same
-	compareRegistries(registry, cachedRegistry);
-
-	registry = cachedRegistry = null;
-	factory = null;
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new SimpleCacheTests("pluginTest"));
-	suite.addTest(new SimpleCacheTests("requiresTest"));
-	suite.addTest(new SimpleCacheTests("libraryTest"));
-	suite.addTest(new SimpleCacheTests("extensionTest"));
-	suite.addTest(new SimpleCacheTests("readOnlyTest"));
-	suite.addTest(new SimpleCacheTests("registryTest"));
-	suite.addTest(new SimpleCacheTests("extExtPtLinkTest"));
-	suite.addTest(new SimpleCacheTests("realRegistryTest"));
-	suite.addTest(new SimpleCacheTests("fragmentTest"));
-	suite.addTest(new SimpleCacheTests("fragmentPluginTest"));
-	suite.addTest(new SimpleCacheTests("fragmentExtensionTest"));
-	suite.addTest(new SimpleCacheTests("fragmentExtExtPtLinkTest"));
-	suite.addTest(new SimpleCacheTests("fragmentLibraryTest"));
-	suite.addTest(new SimpleCacheTests("fragmentReadOnlyTest"));
-	suite.addTest(new SimpleCacheTests("fragmentRequiresTest"));
-	suite.addTest(new SimpleCacheTests("fragmentRegistryTest"));
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AllTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AllTests.java
deleted file mode 100644
index b59fa97..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AllTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtime;
-
-import junit.framework.*;
-
-public class AllTests extends TestCase {
-/**
- * AllTests constructor comment.
- * @param name java.lang.String
- */
-public AllTests() {
-	super(null);
-}
-/**
- * AllTests constructor comment.
- * @param name java.lang.String
- */
-public AllTests(String name) {
-	super(name);
-}
-	public static Test suite() {
-		TestSuite suite = new TestSuite();
-		suite.addTest(AuthorizationDatabaseTest.suite());
-		suite.addTest(CipherStreamsTest.suite());
-		suite.addTest(CipherTest.suite());
-		suite.addTest(LogSerializationTest.suite());
-		return suite;
-	}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AuthorizationDatabaseTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AuthorizationDatabaseTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AuthorizationDatabaseTest.java
deleted file mode 100644
index 789c71a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/AuthorizationDatabaseTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtime;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.internal.runtime.AuthorizationDatabase;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.tests.runtime.RuntimeTest;
-
-public class AuthorizationDatabaseTest extends RuntimeTest {
-public AuthorizationDatabaseTest() {
-	super(null);
-}
-public AuthorizationDatabaseTest(String name) {
-	super(name);
-}
-public static void main(String[] args) {
-	junit.textui.TestRunner.run(suite());
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new AuthorizationDatabaseTest("test1"));
-	suite.addTest(new AuthorizationDatabaseTest("test2"));
-	suite.addTest(new AuthorizationDatabaseTest("test3"));
-	return suite;
-}
-public void test1(){
-	File file = new File(Platform.getLocation().toFile(), Long.toString(System.currentTimeMillis()) + ".auth");
-	try {
-		String filename = file.getAbsolutePath();
-		String password = "testing";
-		if(file.exists()){
-			file.delete();
-		}
-	
-		AuthorizationDatabase db = new AuthorizationDatabase(filename, password);
-	
-		URL serverUrl = new URL("http://www.oti.com/");
-		URL resourceUrl = new URL("http://www.oti.com/folder/");
-		String realm = "WallyWorld";
-		String authScheme = "Basic";
-		Map info = new Hashtable(2);
-		info.put("username", "jonathan");
-		info.put("password", "testing");
-	
-		db.addAuthorizationInfo(serverUrl, realm, authScheme, info);
-		db.addProtectionSpace(resourceUrl, realm);
-	
-		db.save();
-	
-		db = new AuthorizationDatabase(filename, password);
-	
-		info = db.getAuthorizationInfo(serverUrl, realm, authScheme);
-		assertEquals("00", "jonathan", info.get("username"));
-		assertEquals("01", "testing", info.get("password"));
-	
-		assertEquals("02", realm, db.getProtectionSpace(resourceUrl));
-		assertEquals("03", realm, db.getProtectionSpace(new URL(resourceUrl.toString() + "file")));
-	} catch(Exception e){
-		assertTrue("04", false);
-	} finally {
-		file.delete();
-	}
-		
-}
-public void test2(){
-	AuthorizationDatabase db = new AuthorizationDatabase();
-
-	URL url1 = null;
-	URL url2 = null;
-	try {
-		url1 = new URL("http://www.oti.com/file1");
-		url2 = new URL("http://www.oti.com/folder1/");
-	} catch(MalformedURLException e){
-		assertTrue("00", false);
-	}
-
-	String realm1 = "realm1";
-	String realm2 = "realm2";
-
-	db.addProtectionSpace(url1, realm1);
-
-	assertEquals("00", realm1, db.getProtectionSpace(url1));
-	assertEquals("01", realm1, db.getProtectionSpace(url2));
-
-	db.addProtectionSpace(url2, realm1);
-
-	assertEquals("02", realm1, db.getProtectionSpace(url1));
-	assertEquals("03", realm1, db.getProtectionSpace(url2));
-
-	db.addProtectionSpace(url2, realm2);
-
-	assertTrue("04", db.getProtectionSpace(url1) == null);
-	assertEquals("05", realm2, db.getProtectionSpace(url2));
-
-	db.addProtectionSpace(url1, realm1);
-
-	assertEquals("05", realm1, db.getProtectionSpace(url1));
-	assertEquals("06", realm1, db.getProtectionSpace(url2));
-}
-public void test3(){
-	AuthorizationDatabase db = new AuthorizationDatabase();
-
-	URL url1 = null;
-	try {
-		url1 = new URL("http://www.oti.com");
-	} catch(MalformedURLException e){
-		assertTrue("00", false);
-	}
-
-	Hashtable info = new Hashtable(2);
-	db.addAuthorizationInfo(url1, "realm1", "Basic", info);
-
-	assertTrue("01", db.getAuthorizationInfo(url1, "realm1", "Basic") != null);
-	db.flushAuthorizationInfo(url1, "realm1", "Basic");
-	assertTrue("02", db.getAuthorizationInfo(url1, "realm1", "Basic") == null);
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/CipherStreamsTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/CipherStreamsTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/CipherStreamsTest.java
deleted file mode 100644
index cc5adb1..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/CipherStreamsTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtime;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.internal.runtime.CipherInputStream;
-import org.eclipse.core.internal.runtime.CipherOutputStream;
-import org.eclipse.core.tests.runtime.RuntimeTest;
-
-public class CipherStreamsTest extends RuntimeTest {
-public CipherStreamsTest() {
-	super(null);
-}
-public CipherStreamsTest(String name) {
-	super(name);
-}
-public static void main(String[] args) {
-	junit.textui.TestRunner.run(suite());
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new CipherStreamsTest("test1"));
-	return suite;
-}
-public void test1(){
-	try {
-
-	String password = "testing";
-	byte[] data = "This is a test!".getBytes("UTF8");
-
-	ByteArrayOutputStream baos = new ByteArrayOutputStream();
-	CipherOutputStream cos = new CipherOutputStream(baos, password);
-	cos.write(data);
-	cos.close();
-
-	byte[] encryptedData = baos.toByteArray();
-	assertEquals("00", data.length, encryptedData.length);
-	for(int i = 0; i < data.length; ++i){
-		assertTrue("01."+i, data[i] != encryptedData[i]);
-	}
-
-	ByteArrayInputStream bais = new ByteArrayInputStream(encryptedData);
-	CipherInputStream cis = new CipherInputStream(bais, password);
-	byte[] decryptedData = new byte[data.length];
-	cis.read(decryptedData);
-	cis.close();
-
-	assertEquals("02", data.length, decryptedData.length);
-	for(int i = 0; i < data.length; ++i){
-		assertEquals("03."+i, data[i], decryptedData[i]);
-	}
-
-	} catch(Exception e){
-		assertTrue("04", false);
-	}
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/CipherTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/CipherTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/CipherTest.java
deleted file mode 100644
index bc90c5c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/CipherTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtime;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.internal.runtime.Cipher;
-import org.eclipse.core.tests.runtime.RuntimeTest;
-
-public class CipherTest extends RuntimeTest {
-public CipherTest() {
-	super(null);
-}
-public CipherTest(String name) {
-	super(name);
-}
-public static void main(String[] args) {
-	junit.textui.TestRunner.run(suite());
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new CipherTest("test1"));
-	return suite;
-}
-public void test1(){
-	try {
-		String password = "testing";
-		byte[] data = "This is a test!".getBytes("UTF8");
-
-		Cipher cipher = new Cipher(Cipher.ENCRYPT_MODE, "testing");
-		byte[] encryptedData = cipher.cipher(data);
-		assertEquals("00", data.length, encryptedData.length);
-		for(int i = 0; i < data.length; ++i){
-			assertTrue("01."+i, data[i] != encryptedData[i]);
-		}
-	
-		cipher = new Cipher(cipher.DECRYPT_MODE, password);
-		byte[] decryptedData = cipher.cipher(encryptedData);
-		assertEquals("02", data.length, decryptedData.length);
-		for(int i = 0; i < data.length; ++i){
-			assertEquals("03."+i, data[i], decryptedData[i]);
-		}
-	} catch(Exception e){
-		assertTrue("04", false);
-	}
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java
deleted file mode 100644
index a721274..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/LogSerializationTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtime;
-
-import java.io.*;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.internal.runtime.PlatformLogWriter;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.runtime.RuntimeTest;
-
-public class LogSerializationTest extends RuntimeTest {
-	
-	protected File logFile = null;
-
-public LogSerializationTest(String name) {
-	super(name);
-}
-public LogSerializationTest() {
-	super("");
-}
-public static Test suite() {
-	return new TestSuite(LogSerializationTest.class);
-//	TestSuite suite = new TestSuite();
-//	suite.addTest(new LogSerializationTest("testDeepMultiStatus"));
-//	return suite;
-}
-protected void assertEquals(String msg, IStatus[] expected, IStatus[] actual) {
-	if (expected == null) {
-		assertNull(msg + " expected null but got: " + actual, actual);
-		return;
-	}
-	if (actual == null) {
-		assertNull(msg + " expected " + expected + " but got null", expected);
-		return;
-	}
-	assertEquals(msg + " different number of statuses", expected.length, actual.length);
-	for (int i = 0, imax = expected.length; i < imax; i++) {
-		assertEquals(msg + " differ at status " + i, expected[i], actual[i]);
-	}
-}
-protected void assertEquals(String msg, IStatus expected, IStatus actual) {
-	assertEquals(msg + " severity", expected.getSeverity(), actual.getSeverity());
-	assertEquals(msg + " plugin-id", expected.getPlugin(), actual.getPlugin());
-	assertEquals(msg + " code", expected.getCode(), actual.getCode());
-	assertEquals(msg + " message", expected.getMessage(), actual.getMessage());
-	assertEquals(msg + " exception", expected.getException(), actual.getException());
-	assertEquals(msg + " children", expected.getChildren(), actual.getChildren());
-}
-protected void assertEquals(String msg, Throwable expected, Throwable actual) {
-	if (expected == null) {
-		assertNull(msg + " expected null but got: " + actual, actual);
-		return;
-	}
-	if (actual == null) {
-		assertNull(msg + " expected " + expected + " but got null", expected);
-		return;
-	}
-	assertEquals(msg + " stack trace", encodeStackTrace(expected),encodeStackTrace(actual));
-	assertEquals(msg + " message", expected.getMessage(), actual.getMessage());
-}
-protected String encodeStackTrace(Throwable t) {
-	StringWriter sWriter = new StringWriter();
-	PrintWriter pWriter = new PrintWriter(sWriter);
-	pWriter.println();
-	t.printStackTrace(pWriter);
-	pWriter.flush();
-	return sWriter.toString();
-}
-protected IStatus[] getInterestingMultiStatuses() {
-	IStatus[] interesting = getInterestingStatuses();
-	int len = interesting.length;
-	IStatus[][] interestingChildren = new IStatus[len][];
-	for (int i = 0; i < len; i++) {
-		IStatus[] subArray = new IStatus[len];
-		System.arraycopy(interesting, 0, subArray, 0, len);
-		interestingChildren[i] = subArray;
-	}
-	int childOff = 0;
-	return new IStatus[] {
-		new MultiStatus("plugin-id", 1, interestingChildren[childOff++ % len], "message", null),
-		new MultiStatus("org.foo.bar", 5, interestingChildren[childOff++ % len], "message", new NullPointerException()),
-		new MultiStatus("plugin-id", 8, interestingChildren[childOff++ % len], "message", null),
-		new MultiStatus("plugin-id", 0, interestingChildren[childOff++ % len], "message", new IllegalStateException()),
-		new MultiStatus("plugin-id", 65756, interestingChildren[childOff++ % len], "message", null),
-		new MultiStatus(".", 1, interestingChildren[childOff++ % len], "message", null),
-		new MultiStatus("org.foo.blaz", 1, interestingChildren[childOff++ % len], "", null),
-		new MultiStatus("plugin-id", 1, interestingChildren[childOff++ % len], "%$(% 98%(%(*^", null),
-		new MultiStatus("plugin-id", 1, "message", null),
-		new MultiStatus("..", 87326, "", null),
-	};
-}
-protected IStatus[] getInterestingStatuses() {
-	return new IStatus[] {
-		new Status(IStatus.WARNING, "(#(*$%#", 1, "../\\\\\'\'\"", new NullPointerException()),
-		new Status(IStatus.WARNING, "org.foo", 1, "This is the message", null),
-		new Status(IStatus.ERROR, "org.foo", 1, "This is the message", new IllegalStateException()),
-		new Status(IStatus.OK, ".", 1, "This is the message", new NullPointerException()),
-		new Status(IStatus.INFO, "org.asdfhsfhsdf976dsf6sd0f6s", 1, "#*&^$(*&#@^$)(#&)(", null),
-	};
-}
-protected void doTest(String msg, IStatus[] oldStats) {
-	writeLog(oldStats);
-	IStatus[] newStats = readLog();
-	assertEquals(msg, oldStats, newStats);
-}
-protected void doTest(String msg, IStatus status) {
-	doTest(msg, new IStatus[] {status});
-}
-protected IStatus[] readLog() {
-	PlatformLogReader reader = new PlatformLogReader();
-	return reader.readLogFile(logFile.getAbsolutePath());
-}
-protected void setUp() throws Exception {
-	super.setUp();
-	//setup the log file
-	if (logFile == null) {
-		File parent = Platform.getLocation().toFile();
-		String logName = Long.toString(System.currentTimeMillis()) + ".log";
-		logFile = new File(parent, logName);
-	}
-}
-protected void tearDown() throws Exception {
-	super.tearDown();
-	logFile.delete();
-}
-public void testDeepMultiStatus() {
-	MultiStatus multi = new MultiStatus("id", 1, getInterestingMultiStatuses(), "ok", null);
-	for (int i = 0; i < 5; i++) {
-		multi = new MultiStatus("id", 1, new IStatus[] {multi}, "ok", null);
-		doTest("1." + i, multi);
-	}
-}
-public void testMultiMultiStatusSerialize() {
-	IStatus[] interesting = getInterestingMultiStatuses();
-	int len = interesting.length;
-	for (int i = 1; i < len; i++) {
-		IStatus[] subArray = new IStatus[len];
-		System.arraycopy(interesting, 0, subArray, 0, len);
-		doTest("1." + i, subArray);
-	}	
-}
-public void testMultiSerialize() {
-	IStatus[] interesting = getInterestingStatuses();
-	int len = interesting.length;
-	for (int i = 1; i < len; i++) {
-		IStatus[] subArray = new IStatus[len];
-		System.arraycopy(interesting, 0, subArray, 0, len);
-		doTest("1." + i, subArray);
-	}	
-}
-public void testMultiStatus() {
-	IStatus[] interesting = getInterestingMultiStatuses();
-	for (int i = 0; i < interesting.length; i++) {
-		doTest("1." + i, interesting[i]);
-	}
-}
-public void testSimpleSerialize() {
-	IStatus[] interesting = getInterestingStatuses();
-	for (int i = 0; i < interesting.length; i++) {
-		doTest("1." + i, interesting[i]);
-	}
-}
-
-protected void writeLog(IStatus status) {
-	writeLog(new IStatus[] {status});
-}
-protected void writeLog(IStatus[] statuses) {
-	if (logFile.exists())
-		logFile.delete();
-	PlatformLogWriter writer = new PlatformLogWriter(logFile);
-	for (int i = 0; i < statuses.length; i++) {
-		writer.logging(statuses[i], "org.eclipse.core.tests.runtime");
-	}
-	writer.shutdown();
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformLogReader.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformLogReader.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformLogReader.java
deleted file mode 100644
index 9c435aa..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtime/PlatformLogReader.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000,2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtime;
-
-import java.io.*;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-import org.eclipse.core.internal.runtime.*;
-import org.eclipse.core.runtime.*;
-
-/**
- * Reads a structured log from disk and reconstructs status and exception objects.
- * General strategy: log entries that are malformed in any way are skipped, and an extra
- * status is returned mentioned that there were problems.
- */
-public class PlatformLogReader {
-	private ArrayList list = null;
-	private String currentLine = "";
-	private BufferedReader reader;
-
-	// constants copied from the PlatformLogWriter (since they are private
-	// to that class and this class should be used only in test suites)
-	private static final String KEYWORD_SESSION = "!SESSION";
-	private static final String KEYWORD_ENTRY = "!ENTRY";
-	private static final String KEYWORD_SUBENTRY = "!SUBENTRY";
-	private static final String KEYWORD_MESSAGE = "!MESSAGE";
-	private static final String KEYWORD_STACK = "!STACK";
-
-	private static final int NULL = -2;
-	private static final int SESSION = 1;
-	private static final int ENTRY = 2;
-	private static final int SUBENTRY = 4;
-	private static final int MESSAGE = 8;
-	private static final int STACK = 16;
-	private static final int UNKNOWN = 32;
-
-/**
- * Given a stack trace without carriage returns, returns a pretty-printed stack.
- */
-protected String formatStack(String stack) {
-	StringWriter sWriter = new StringWriter();
-	PrintWriter writer = new PrintWriter(sWriter);
-	StringTokenizer tokenizer = new StringTokenizer(stack);
-	//first entry has no indentation
-	if (tokenizer.hasMoreTokens())
-		writer.print(tokenizer.nextToken());
-	while (tokenizer.hasMoreTokens()) {
-		String next = tokenizer.nextToken();
-		if (next != null && next.length() > 0) {
-			if (next.equals("at")) {
-				writer.println();
-				writer.print('\t');
-				writer.print(next);
-			} else {
-				writer.print(' ');
-				writer.print(next);
-			}
-		}
-	}
-	writer.flush();
-	writer.close();
-	return sWriter.toString();
-}
-protected void log(Exception ex) {
-	String msg = Policy.bind("meta.exceptionParsingLog", ex.getMessage());
-	list.add(new Status(IStatus.WARNING, Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, msg, ex));
-}
-protected Throwable readException(String message) throws IOException {
-	if (currentLine == null || getLineType() != STACK)
-		return null;
-	StringTokenizer tokenizer = new StringTokenizer(currentLine);
-	tokenizer.nextToken();
-	// FIXME: handle the code to read status objects which were
-	// nested inside of CoreExceptions in the log.
-	int hasStatus = Integer.parseInt(tokenizer.nextToken());
-	currentLine = reader.readLine();
-	return new FakeException(null, formatStack(readText()));
-}
-/**
- * Reads the given log file and returns the contained status objects. 
- * If the log file could not be read, a status object indicating this fact
- * is returned.
- */
-public synchronized IStatus[] readLogFile(String path) {
-	list = new ArrayList();
-	InputStream input = null;
-	try {
-		input = new FileInputStream(path);
-		reader = new BufferedReader(new InputStreamReader(input, "UTF-8"));//$NON-NLS-1$
-		currentLine = reader.readLine();
-		while (currentLine != null) {
-			switch (getLineType()) {
-				case ENTRY:
-					IStatus status = readEntry();
-					if (status != null)
-						list.add(status);
-					break;
-				case SESSION:
-					readSession();
-					break;
-				case SUBENTRY:
-				case MESSAGE:
-				case STACK:
-				case UNKNOWN:
-					currentLine = reader.readLine();
-					break;
-			}
-		}
-	} catch (IOException e) {
-		log(e);
-	} finally {
-		try {
-			if (input != null)
-				input.close();
-		} catch (IOException e) {
-			log(e);
-		}
-	}
-	return (IStatus[]) list.toArray(new IStatus[list.size()]);
-}
-protected int getLineType() {
-	if (currentLine == null) 
-		return NULL;
-	StringTokenizer tokenizer = new StringTokenizer(currentLine);
-	if (tokenizer.hasMoreTokens()) {
-		String token = tokenizer.nextToken();
-		if (token.equals(KEYWORD_SESSION))
-			return SESSION;
-		if (token.equals(KEYWORD_ENTRY))
-			return ENTRY;
-		if (token.equals(KEYWORD_SUBENTRY))
-			return SUBENTRY;
-		if (token.equals(KEYWORD_MESSAGE))
-			return MESSAGE;
-		if (token.equals(KEYWORD_STACK))
-			return STACK;
-	}
-	return UNKNOWN;
-}
-
-/**
- * A reconsituted exception that only contains a stack trace and a message.
- */
-class FakeException extends Throwable {
-	private String message;
-	private String stackTrace;
-	FakeException(String msg, String stack) {
-		this.message = msg;
-		this.stackTrace = stack;
-	}
-	public String getMessage() {
-		return message;
-	}
-	public void printStackTrace() {
-		printStackTrace(System.out);
-	}
-	public void printStackTrace(PrintWriter writer) {
-		writer.println(stackTrace);
-	}
-	public void printStackTrace(PrintStream stream) {
-		stream.println(stackTrace);
-	}		
-}
-protected IStatus readEntry() throws IOException {
-	if (currentLine == null || getLineType() != ENTRY)
-		return null;
-	StringTokenizer tokens = new StringTokenizer(currentLine);
-	// skip over the ENTRY keyword
-	tokens.nextToken();
-	String pluginID = tokens.nextToken();
-	int severity = Integer.parseInt(tokens.nextToken());
-	int code = Integer.parseInt(tokens.nextToken());
-	// ignore the rest of the line since its the date
-	currentLine = reader.readLine();
-	String message = readMessage();
-	Throwable exception = readException(message);
-	if (currentLine == null || getLineType() != SUBENTRY)
-		return new Status(severity, pluginID, code, message, exception);
-	MultiStatus parent = new MultiStatus(pluginID, code, message, exception);
-	readSubEntries(parent);
-	return parent;
-}
-protected void readSubEntries(MultiStatus parent) throws IOException {
-	while (getLineType() == SUBENTRY) {
-		StringTokenizer tokens = new StringTokenizer(currentLine);
-		// skip over the subentry keyword
-		tokens.nextToken();
-		int currentDepth = Integer.parseInt(tokens.nextToken());
-		String pluginID = tokens.nextToken();
-		int severity = Integer.parseInt(tokens.nextToken());
-		int code = Integer.parseInt(tokens.nextToken());
-		// ignore the rest of the line since its the date
-		currentLine = reader.readLine();
-		String message = readMessage();
-		Throwable exception = readException(message);
-	
-		IStatus current = new Status(severity, pluginID, code, message, exception);
-		if (currentLine == null || getLineType() != SUBENTRY) {
-			parent.add(current);
-			return;
-		}
-
-		tokens = new StringTokenizer(currentLine);
-		tokens.nextToken();
-		int depth = Integer.parseInt(tokens.nextToken());
-		if (currentDepth == depth) {
-			// next sub-entry is a sibling
-			parent.add(current);
-		} else if (currentDepth == (depth - 1)) {
-			// next sub-entry is a child
-			current = new MultiStatus(pluginID, code, message, exception);
-			readSubEntries((MultiStatus) current);
-			parent.add(current);
-		} else {
-			parent.add(current);
-			return;
-		}
-	}
-}
-protected int readDepth() throws IOException {
-	StringTokenizer tokens = new StringTokenizer(currentLine);
-	// skip the keyword
-	tokens.nextToken();
-	return Integer.parseInt(tokens.nextToken());
-}
-protected String readMessage() throws IOException {
-	if (currentLine == null || getLineType() != MESSAGE)
-		return "";
-	StringBuffer buffer = new StringBuffer();
-	buffer.append(currentLine.substring(KEYWORD_MESSAGE.length()+1, currentLine.length()));
-	currentLine = reader.readLine();
-	buffer.append(readText());
-	return buffer.toString();
-}
-protected String readSession() throws IOException {
-	if (currentLine == null || getLineType() != SESSION)
-		return "";
-	currentLine = reader.readLine();
-	return readText();
-}
-protected String readText() throws IOException {
-	StringBuffer buffer = new StringBuffer();
-	if (currentLine == null || getLineType() != UNKNOWN)
-		return "";
-	else buffer.append(currentLine);
-	boolean done = false;
-	while (!done) {
-		currentLine = reader.readLine();
-		if (currentLine == null) {
-			done = true;
-			continue;
-		}
-		if (getLineType() == UNKNOWN)
-			buffer.append(currentLine);
-		else
-			done = true;
-	}
-	return buffer.toString();
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleA.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleA.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleA.java
deleted file mode 100644
index a3b90e0..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleA.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleA extends Plugin {
-		
-public SampleA (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleA");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleB.java
deleted file mode 100644
index 39b38df..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleB extends Plugin {
-
-public SampleB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleCPB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleCPB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleCPB.java
deleted file mode 100644
index 95b224a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleCPB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleCPB extends Plugin {
-
-public SampleCPB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleCPB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleCPR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleCPR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleCPR.java
deleted file mode 100644
index f9e311f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleCPR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleCPR extends Plugin {
-
-public SampleCPR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleCPR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleD.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleD.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleD.java
deleted file mode 100644
index 7d65ff5..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleD.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleD extends Plugin {
-
-public SampleD (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleD");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleE.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleE.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleE.java
deleted file mode 100644
index a58fce0..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleE.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleE extends Plugin {
-
-public SampleE (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleE");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleFFB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleFFB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleFFB.java
deleted file mode 100644
index 7a7cc31..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleFFB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleFFB extends Plugin {
-
-public SampleFFB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleFFB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleFFR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleFFR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleFFR.java
deleted file mode 100644
index 79a88cd..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleFFR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleFFR extends Plugin {
-
-public SampleFFR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleFFR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleGFR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleGFR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleGFR.java
deleted file mode 100644
index 6081ac1..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleGFR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleGFR extends Plugin {
-		
-public SampleGFR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleGFR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleGPR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleGPR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleGPR.java
deleted file mode 100644
index e4715fd..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleGPR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleGPR extends Plugin {
-		
-public SampleGPR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleGPR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleHFB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleHFB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleHFB.java
deleted file mode 100644
index 1ea710f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleHFB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleHFB extends Plugin {
-		
-public SampleHFB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleHFB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleHPR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleHPR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleHPR.java
deleted file mode 100644
index 10476e8..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleHPR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleHPR extends Plugin {
-		
-public SampleHPR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleHPR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleIFR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleIFR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleIFR.java
deleted file mode 100644
index 1e9b627..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleIFR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleIFR extends Plugin {
-		
-public SampleIFR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleIFR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleIPB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleIPB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleIPB.java
deleted file mode 100644
index 1c579bb..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleIPB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleIPB extends Plugin {
-		
-public SampleIPB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleIPBS");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleJFB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleJFB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleJFB.java
deleted file mode 100644
index 8d4c5dc..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleJFB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleJFB extends Plugin {
-		
-public SampleJFB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleJFB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleJPB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleJPB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleJPB.java
deleted file mode 100644
index e5f5fd8..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleJPB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleJPB extends Plugin {
-		
-public SampleJPB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleJPB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKFR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKFR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKFR.java
deleted file mode 100644
index e569b8c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKFR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleKFR extends Plugin {
-		
-public SampleKFR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleKFR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKPB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKPB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKPB.java
deleted file mode 100644
index fa60ef9..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKPB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleKPB extends Plugin {
-		
-public SampleKPB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleKPB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKPR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKPR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKPR.java
deleted file mode 100644
index cabdff2..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleKPR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleKPR extends Plugin {
-		
-public SampleKPR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleKPR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLFB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLFB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLFB.java
deleted file mode 100644
index 968210b..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLFB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleLFB extends Plugin {
-		
-public SampleLFB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleLFB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLPB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLPB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLPB.java
deleted file mode 100644
index 7d79579..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLPB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleLPB extends Plugin {
-		
-public SampleLPB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleLPB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLPR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLPR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLPR.java
deleted file mode 100644
index f0b219e..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleLPR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleLPR extends Plugin {
-		
-public SampleLPR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleLPR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMFB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMFB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMFB.java
deleted file mode 100644
index a8afc3c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMFB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleMFB extends Plugin {
-		
-public SampleMFB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleMFB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMFR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMFR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMFR.java
deleted file mode 100644
index d22552a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMFR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleMFR extends Plugin {
-		
-public SampleMFR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleMFR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMPR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMPR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMPR.java
deleted file mode 100644
index 51d3f46..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleMPR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleMPR extends Plugin {
-		
-public SampleMPR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleMPR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNFB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNFB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNFB.java
deleted file mode 100644
index 80cf7a7..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNFB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleNFB extends Plugin {
-		
-public SampleNFB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleNFB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNFR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNFR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNFR.java
deleted file mode 100644
index 10bc763..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNFR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleNFR extends Plugin {
-		
-public SampleNFR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleNFR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNPB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNPB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNPB.java
deleted file mode 100644
index a3860d1..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleNPB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleNPB extends Plugin {
-		
-public SampleNPB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleNPB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOFB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOFB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOFB.java
deleted file mode 100644
index 8ccea8a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOFB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleOFB extends Plugin {
-		
-public SampleOFB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleOFB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOFR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOFR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOFR.java
deleted file mode 100644
index 8f98b4e..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOFR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleOFR extends Plugin {
-		
-public SampleOFR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleOFR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOPB.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOPB.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOPB.java
deleted file mode 100644
index 69d8fe9..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOPB.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleOPB extends Plugin {
-		
-public SampleOPB (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleOPB");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOPR.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOPR.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOPR.java
deleted file mode 100644
index 0b7b40a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/runtimetests/SampleOPR.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.internal.runtimetests;
-
-import org.eclipse.core.runtime.*;
-
-public class SampleOPR extends Plugin {
-		
-public SampleOPR (IPluginDescriptor descriptor) {
-	super(descriptor);
-}
-
-public String getSampleString() {
-	return ("A sample string from class sampleOPR");
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/AllTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/AllTests.java
deleted file mode 100644
index 3125d8c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/AllTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.plugintests;
-
-import junit.framework.*;
-
-public class AllTests extends TestCase {
-public AllTests() {
-	super(null);
-}
-public AllTests(String name) {
-	super(name);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(ApiTest.suite());
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/ApiTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/ApiTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/ApiTest.java
deleted file mode 100644
index daca20d..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/ApiTest.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.plugintests;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.internal.plugins.*;
-import org.eclipse.core.internal.runtime.Policy;
-import org.eclipse.core.tests.harness.*;
-import java.net.*;
-import junit.framework.*;
-
-public class ApiTest extends EclipseWorkspaceTest {
-public ApiTest() {
-	super(null);
-}
-public ApiTest(String name) {
-	super(name);
-}
-public void baseTest() {
-
-	String id = "com.ibm.eclipse.core.tests.plugins.parser.1";
-
-	String[] pid = { "com.ibm.eclipse.core.tests.plugins.parser.2", "com.ibm.eclipse.core.tests.plugins.parser.3" };
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL URLList[] = new URL[1];
-	try {
-		URLList[0] = new URL("vaLoader:/N:/Eclipse TOR Core Test/0.042b/project_resources/IBM Eclipse Core Tests Plugin/plugins-test-files/plugins.parser.1/");
-	} catch (java.net.MalformedURLException mfe) {
-		assertTrue("Malformed URL Exception encountered", true);
-	}
-	IPluginRegistry registry = doParsing(factory, URLList);
-	IPluginDescriptor plugin = registry.getPluginDescriptor(id);
-
-	// check descriptor
-	assertNotNull("0.0", plugin);
-	assertEquals("0.1", plugin.getUniqueIdentifier(), id);
-	assertEquals("0.2", plugin.getLabel(), "IBM Tooling Platform Core Tests");
-	assertEquals("0.3", plugin.getProviderName(), "IBM");
-	assertEquals("0.4", plugin.getVersionIdentifier(), new PluginVersionIdentifier("1.2"));
-	assertTrue("0.6", !plugin.isPluginActivated());
-	assertEquals("0.7", plugin.getInstallURL().toExternalForm(), "eclipse:/plugin/com.ibm.eclipse.core.tests.plugins.parser.1/");
-
-	// check prereqs
-	IPluginPrerequisite[] prereq = plugin.getPluginPrerequisites();
-	assertEquals("1.0", prereq.length, 2);
-
-	assertEquals("1.1.0", prereq[0].getUniqueIdentifier(), pid[0]);
-	assertEquals("1.1.1", prereq[0].getVersionIdentifier(), new PluginVersionIdentifier("3.7"));
-	assertTrue("1.1.2", prereq[0].isExported());
-	assertTrue("1.1.3", !prereq[0].isMatchedAsCompatible());
-	assertTrue("1.1.4", prereq[0].isMatchedAsExact());
-
-	assertEquals("1.2.0", prereq[1].getUniqueIdentifier(), pid[1]);
-	assertNull("1.2.1", prereq[1].getVersionIdentifier());
-	assertTrue("1.2.2", !prereq[1].isExported());
-	assertTrue("1.2.3", prereq[1].isMatchedAsCompatible());
-	assertTrue("1.2.4", !prereq[1].isMatchedAsExact());
-
-	// check runtime libs
-	ILibrary[] lib = plugin.getRuntimeLibraries();
-	assertTrue("2.0", lib.length == 3);
-
-	assertNull("2.1.0", lib[0].getContentFilters());
-	assertEquals("2.1.1", lib[0].getPath().toString(), "lib1.jar");
-	assertTrue("2.1.2", !lib[0].isExported());
-	assertTrue("2.1.3", !lib[0].isFullyExported());
-
-	assertNull("2.2.0", lib[1].getContentFilters()); // fully exported => no filter
-	assertEquals("2.2.1", lib[1].getPath().toString(), "lib2.jar");
-	assertTrue("2.2.2", lib[1].isExported());
-	assertTrue("2.2.3", lib[1].isFullyExported());
-
-	assertNotNull("2.3.0", lib[2].getContentFilters());
-	assertEquals("2.3.0.1", lib[2].getContentFilters().length, 1);
-	assertEquals("2.3.1", lib[2].getPath().toString(), "lib3.jar");
-	assertTrue("2.3.2", lib[2].isExported());
-	assertTrue("2.3.3", !lib[2].isFullyExported());
-
-	// check declared extension points
-	IExtensionPoint[] xpt;
-	xpt = plugin.getExtensionPoints();
-	assertEquals("3.0", xpt.length, 2);
-
-	assertEquals("3.1.0", xpt[0].getDeclaringPluginDescriptor(), plugin);
-	assertEquals("3.1.1", xpt[0].getUniqueIdentifier(), id + ".xpt1");
-	assertEquals("3.1.2", xpt[0].getSimpleIdentifier(), "xpt1");
-	assertEquals("3.1.3", xpt[0].getLabel(), "First extension point");
-
-	assertEquals("3.2.0", xpt[1].getDeclaringPluginDescriptor(), plugin);
-	assertEquals("3.2.1", xpt[1].getUniqueIdentifier(), id + ".xpt2");
-	assertEquals("3.2.2", xpt[1].getSimpleIdentifier(), "xpt2");
-	assertEquals("3.2.3", xpt[1].getLabel(), "");
-
-	// check declared extensions
-	IExtension[] ext;
-	ext = plugin.getExtensions();
-	assertTrue("4.0", ext.length == 2);
-
-	assertEquals("4.1.0", ext[0].getDeclaringPluginDescriptor(), plugin);
-	assertEquals("4.1.1", ext[0].getUniqueIdentifier(), id + ".ext1");
-	assertEquals("4.1.2", ext[0].getSimpleIdentifier(), "ext1");
-	assertEquals("4.1.3", ext[0].getLabel(), "First extension");
-	assertEquals("4.1.4", ext[0].getExtensionPointUniqueIdentifier(), id + ".xpt1");
-
-	assertEquals("4.2.0", ext[1].getDeclaringPluginDescriptor(), plugin);
-	assertNull("4.2.1", ext[1].getUniqueIdentifier());
-	assertNull("4.2.2", ext[1].getSimpleIdentifier());
-	assertEquals("4.2.3", ext[1].getLabel(), "");
-	assertEquals("4.2.4", ext[1].getExtensionPointUniqueIdentifier(), id + ".xpt1");
-
-	// check configured extensions (via extension point)
-	IExtensionPoint xpt1 = registry.getExtensionPoint(id + ".xpt1");
-	assertNotNull("5.0", xpt1);
-	ext = xpt1.getExtensions();
-	assertEquals("5.0.1", ext.length, 2);
-
-	assertEquals("5.1.0", ext[0].getDeclaringPluginDescriptor(), plugin);
-	assertEquals("5.1.1", ext[0].getUniqueIdentifier(), id + ".ext1");
-	assertEquals("5.1.2", ext[0].getSimpleIdentifier(), "ext1");
-	assertEquals("5.1.3", ext[0].getLabel(), "First extension");
-	assertEquals("5.1.4", ext[0].getExtensionPointUniqueIdentifier(), id + ".xpt1");
-
-	assertEquals("5.2.0", ext[1].getDeclaringPluginDescriptor(), plugin);
-	assertNull("5.2.1", ext[1].getUniqueIdentifier());
-	assertNull("5.2.2", ext[1].getSimpleIdentifier());
-	assertEquals("5.2.3", ext[1].getLabel(), "");
-	assertEquals("5.2.4", ext[1].getExtensionPointUniqueIdentifier(), id + ".xpt1");
-
-	// check configured extension (directly)
-	IExtension ext1 = registry.getExtension(id, "xpt1", id + ".ext1");
-	assertNotNull("6.0", ext1);
-
-	assertEquals("6.1.0", ext1.getDeclaringPluginDescriptor(), plugin);
-	assertEquals("6.1.1", ext1.getUniqueIdentifier(), id + ".ext1");
-	assertEquals("6.1.2", ext1.getSimpleIdentifier(), "ext1");
-	assertEquals("6.1.3", ext1.getLabel(), "First extension");
-	assertEquals("6.1.4", ext1.getExtensionPointUniqueIdentifier(), id + ".xpt1");
-}
-/* doParsing
- * This method will parse a series of XML files.  The input array should be
- * an array of string buffers where each string buffer is considered a complete 
- * XML file.  The returning array will have a corresponding plugin descriptor
- * for each of the XML files in the input array
- */
-public PluginRegistry doParsing(InternalFactory factory, URL[] pluginPath) {
-	PluginRegistry registry = (PluginRegistry) RegistryLoader.parseRegistry(pluginPath, factory, false);
-	registry.resolve(true, true);
-	registry.markReadOnly();
-	registry.startup(null);
-	return registry;
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(new ApiTest("baseTest"));
-	suite.addTest(new ApiTest("versionIdTest"));
-	return suite;
-}
-public void versionIdTest() {
-
-	MultiStatus problems = new MultiStatus(Platform.PI_RUNTIME, Platform.PARSE_PROBLEM, Policy.bind("registryTestProblems", new String[0]), null);
-	InternalFactory factory = new InternalFactory(problems);
-	URL URLList[] = new URL[1];
-	try {
-		URLList[0] = new URL("vaLoader:/N:/Eclipse TOR Core Test/0.042b/project_resources/IBM Eclipse Core Tests Plugin/plugins-test-files/plugins.parser.1/");
-	} catch (java.net.MalformedURLException mfe) {
-	}
-	IPluginRegistry registry = doParsing(factory, URLList);
-
-	PluginVersionIdentifier v1;
-	PluginVersionIdentifier v2;
-
-	v1 = null;
-	try {
-		v1 = new PluginVersionIdentifier("1");
-	} catch (Throwable e) {
-		Assert.fail("1.1.0 " + e);
-	}
-	assertTrue("1.1.1", v1 != null);
-	assertTrue("1.1.2", v1.getMajorComponent() == 1);
-	assertTrue("1.1.3", v1.getMinorComponent() == 0);
-	assertTrue("1.1.4", v1.getServiceComponent() == 0);
-	assertTrue("1.1.5", v1.equals(new PluginVersionIdentifier(v1.toString())));
-
-	v2 = null;
-	try {
-		v2 = new PluginVersionIdentifier("1.0");
-	} catch (Throwable e) {
-		Assert.fail("1.2.0 " + e);
-	}
-	assertTrue("1.2.1", v2 != null);
-	assertTrue("1.2.2", v2.getMajorComponent() == 1);
-	assertTrue("1.2.3", v2.getMinorComponent() == 0);
-	assertTrue("1.2.4", v2.getServiceComponent() == 0);
-	assertTrue("1.2.5", v2.equals(new PluginVersionIdentifier(v2.toString())));
-	assertTrue("1.2.6", v2.equals(v1));
-	assertTrue("1.2.7", v2.isCompatibleWith(v1));
-	assertTrue("1.2.8", v2.isEquivalentTo(v1));
-
-	v2 = null;
-	try {
-		v2 = new PluginVersionIdentifier("1.0.0");
-	} catch (Throwable e) {
-		Assert.fail("1.3.0 " + e);
-	}
-	assertTrue("1.3.1", v2 != null);
-	assertTrue("1.3.2", v2.getMajorComponent() == 1);
-	assertTrue("1.3.3", v2.getMinorComponent() == 0);
-	assertTrue("1.3.4", v2.getServiceComponent() == 0);
-	assertTrue("1.3.5", v2.equals(new PluginVersionIdentifier(v2.toString())));
-	assertTrue("1.3.6", v2.equals(v1));
-	assertTrue("1.3.7", v2.isCompatibleWith(v1));
-	assertTrue("1.3.8", v2.isEquivalentTo(v1));
-
-	v1 = null;
-	v2 = null;
-	try {
-		v1 = new PluginVersionIdentifier("1.2.3");
-	} catch (Throwable e) {
-		Assert.fail("1.4.0 " + e);
-	}
-	try {
-		v2 = new PluginVersionIdentifier("1.2.3");
-	} catch (Throwable e) {
-		Assert.fail("1.4.1 " + e);
-	}
-	assertTrue("1.4.2", v2.equals(v1));
-	assertTrue("1.4.3", v2.isCompatibleWith(v1));
-	assertTrue("1.4.4", v2.isEquivalentTo(v1));
-
-	v2 = null;
-	try {
-		v2 = new PluginVersionIdentifier("1.2.4");
-	} catch (Throwable e) {
-		Assert.fail("1.5.1 " + e);
-	}
-	assertTrue("1.5.2", !v2.equals(v1));
-	assertTrue("1.5.3", v2.isCompatibleWith(v1));
-	assertTrue("1.5.4", v2.isEquivalentTo(v1));
-
-	v2 = null;
-	try {
-		v2 = new PluginVersionIdentifier("1.2.2");
-	} catch (Throwable e) {
-		Assert.fail("1.6.1 " + e);
-	}
-	assertTrue("1.6.2", !v2.equals(v1));
-	assertTrue("1.6.3", !v2.isCompatibleWith(v1));
-	assertTrue("1.6.4", !v2.isEquivalentTo(v1));
-
-	v2 = null;
-	try {
-		v2 = new PluginVersionIdentifier("1.3.3");
-	} catch (Throwable e) {
-		Assert.fail("1.7.1 " + e);
-	}
-	assertTrue("1.7.2", !v2.equals(v1));
-	assertTrue("1.7.3", v2.isCompatibleWith(v1));
-	assertTrue("1.7.4", !v2.isEquivalentTo(v1));
-
-	v2 = null;
-	try {
-		v2 = new PluginVersionIdentifier("1.3.4");
-	} catch (Throwable e) {
-		Assert.fail("1.8.1 " + e);
-	}
-	assertTrue("1.8.2", !v2.equals(v1));
-	assertTrue("1.8.3", v2.isCompatibleWith(v1));
-	assertTrue("1.8.4", !v2.isEquivalentTo(v1));
-
-	v2 = null;
-	try {
-		v2 = new PluginVersionIdentifier("1.3.2");
-	} catch (Throwable e) {
-		Assert.fail("1.9.1 " + e);
-	}
-	assertTrue("1.9.2", !v2.equals(v1));
-	assertTrue("1.9.3", v2.isCompatibleWith(v1));
-	assertTrue("1.9.4", !v2.isEquivalentTo(v1));
-
-	v2 = null;
-	try {
-		v2 = new PluginVersionIdentifier("2.2.3");
-	} catch (Throwable e) {
-		Assert.fail("1.10.1 " + e);
-	}
-	assertTrue("1.10.2", !v2.equals(v1));
-	assertTrue("1.10.3", !v2.isCompatibleWith(v1));
-	assertTrue("1.10.4", !v2.isEquivalentTo(v1));
-
-	v2 = null;
-	try {
-		v2 = new PluginVersionIdentifier("2.2.4");
-	} catch (Throwable e) {
-		Assert.fail("1.11.1 " + e);
-	}
-	assertTrue("1.11.2", !v2.equals(v1));
-	assertTrue("1.11.3", !v2.isCompatibleWith(v1));
-	assertTrue("1.11.4", !v2.isEquivalentTo(v1));
-
-	v2 = null;
-	try {
-		v2 = new PluginVersionIdentifier("2.2.2");
-	} catch (Throwable e) {
-		Assert.fail("1.12.1 " + e);
-	}
-	assertTrue("1.12.2", !v2.equals(v1));
-	assertTrue("1.12.3", !v2.isCompatibleWith(v1));
-	assertTrue("1.12.4", !v2.isEquivalentTo(v1));
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPluginLocalAndPrimaryFeatureTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPluginLocalAndPrimaryFeatureTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPluginLocalAndPrimaryFeatureTest.java
deleted file mode 100644
index 63a6132..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPluginLocalAndPrimaryFeatureTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.eclipse.core.tests.plugintests;
-
-/*******************************************************************************
- * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-import java.io.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.internal.runtime.SafeFileOutputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class CmdLineAndPluginLocalAndPrimaryFeatureTest extends WorkspaceSessionTest {
-
-public CmdLineAndPluginLocalAndPrimaryFeatureTest() {
-	super(null);
-}
-public CmdLineAndPluginLocalAndPrimaryFeatureTest(String name) {
-	super(name);
-}
-
-public void testCmdLineAndPluginLocalAndPrimaryFeature() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	// Preferences in the file specified by -pluginCustomization
-	// command line parameter and in the plugin state area
-	IPluginDescriptor resPlugin = registry.getPluginDescriptor("cmdLineAndPluginLocalAndPrimaryFeature");
-	Preferences prefs = null;
-	String sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalplugin_customization.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	String primaryFeaturePluginId = BootLoader.getCurrentPlatformConfiguration().getPrimaryFeatureIdentifier();
-	IPluginDescriptor primaryFeatureDescriptor = registry.getPluginDescriptor(primaryFeaturePluginId);
-	String destName = ((PluginDescriptor)primaryFeatureDescriptor).getLocation() +
-		"plugin_customization.ini";
-	destName = destName.substring(destName.indexOf(':') + 1);
-	PreferencesRuntimeTests.copyFile(sourceName, destName);
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String[] defaultNames = prefs.defaultPropertyNames();
-	String[] prefNames = prefs.propertyNames();
-	assertTrue("1.0 Four default preferences", defaultNames.length == 4);
-	assertTrue("1.1 No explicit preferences", prefNames.length == 0);
-	// Do we have the right names for the default preferences?
-	boolean foundCommandLinePreference = false;
-	boolean foundPluginLocalPreference = false;
-	boolean foundPrimaryFeaturePreference = false;
-	boolean foundCommonPreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("CommandLinePreference"))
-			foundCommandLinePreference = true;
-		else if (defaultNames[i].equals("commonCmdLineAndPluginLocalAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-		else if (defaultNames[i].equals("PluginLocalPreference"))
-			foundPluginLocalPreference = true;
-		else if (defaultNames[i].equals("PrimaryFeaturePreference"))
-			foundPrimaryFeaturePreference = true;
-	}
-	assertTrue("1.2 Got right default preference names",
-		foundCommandLinePreference && foundCommonPreference && foundPluginLocalPreference && foundPrimaryFeaturePreference);
-	// Check preference values
-	assertTrue("1.3 CommandLinePreference value",
-		prefs.getString("CommandLinePreference").equals("From the command line specified file via the plugin cmdLineAndPluginLocalAndPrimaryFeature"));
-	assertTrue("1.4 commonCmdLineAndPluginLocalAndPrimaryFeaturePreference value",
-		prefs.getString("commonCmdLineAndPluginLocalAndPrimaryFeaturePreference").equals("Common preference from the command line via the plugin cmdLineAndPluginLocalAndPrimaryFeature"));
-	assertTrue("1.5 PluginLocalPreference value",
-		prefs.getString("PluginLocalPreference").equals("From the local plugin directory of the plugin cmdLineAndPluginLocalAndPrimaryFeature"));
-	assertTrue("1.6 PrimaryFeaturePreference value",
-		prefs.getString("PrimaryFeaturePreference").equals("From the primary feature plugin directory via the plugin cmdLineAndPluginLocalAndPrimaryFeature"));
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPluginLocalTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPluginLocalTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPluginLocalTest.java
deleted file mode 100644
index f60329c..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPluginLocalTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.core.tests.plugintests;
-
-/*******************************************************************************
- * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-import java.io.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.internal.runtime.SafeFileOutputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class CmdLineAndPluginLocalTest extends WorkspaceSessionTest {
-
-public CmdLineAndPluginLocalTest() {
-	super(null);
-}
-public CmdLineAndPluginLocalTest(String name) {
-	super(name);
-}
-
-public void testCmdLineAndPluginLocal() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	// Preferences in the file specified by -pluginCustomization
-	// command line parameter and in the plugin state area
-	IPluginDescriptor resPlugin = registry.getPluginDescriptor("cmdLineAndPluginLocal");
-	Preferences prefs = null;
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String[] defaultNames = prefs.defaultPropertyNames();
-	String[] prefNames = prefs.propertyNames();
-	assertTrue("1.0 Three default preferences", defaultNames.length == 3);
-	assertTrue("1.1 No explicit preferences", prefNames.length == 0);
-	// Do we have the right names for the default preferences?
-	boolean foundPluginLocalPreference = false;
-	boolean foundCommonPreference = false;
-	boolean foundCommandLinePreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("CommandLinePreference"))
-			foundCommandLinePreference = true;
-		else if (defaultNames[i].equals("commonCmdLineAndPluginLocalPreference"))
-			foundCommonPreference = true;
-		else if (defaultNames[i].equals("PluginLocalPreference"))
-			foundPluginLocalPreference = true;
-	}
-	assertTrue("1.2 Got right default preference names",
-		foundCommandLinePreference && foundCommonPreference && foundPluginLocalPreference);
-	// Check preference values
-	assertTrue("1.3 PluginLocalPreference value",
-		prefs.getString("PluginLocalPreference").equals("From the local plugin directory of the plugin cmdLineAndPluginLocal"));
-	assertTrue("1.4 CommandLinePreference value",
-		prefs.getString("CommandLinePreference").equals("From the command line specified file via the plugin cmdLineAndPluginLocal"));
-	assertTrue("1.5 commonCmdLineAndPluginLocalPreference value",
-		prefs.getString("commonCmdLineAndPluginLocalPreference").equals("Common preference from the command line via the plugin cmdLineAndPluginLocal"));
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPrimaryFeatureTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPrimaryFeatureTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPrimaryFeatureTest.java
deleted file mode 100644
index 50ce4f0..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndPrimaryFeatureTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.core.tests.plugintests;
-
-/*******************************************************************************
- * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-import java.io.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.internal.runtime.SafeFileOutputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class CmdLineAndPrimaryFeatureTest extends WorkspaceSessionTest {
-
-public CmdLineAndPrimaryFeatureTest() {
-	super(null);
-}
-public CmdLineAndPrimaryFeatureTest(String name) {
-	super(name);
-}
-
-public void testCmdLineAndPrimaryFeature() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	// Preferences in the file specified by -pluginCustomization
-	// command line parameter and in the plugin state area
-	IPluginDescriptor resPlugin = registry.getPluginDescriptor("cmdLineAndPrimaryFeature");
-	String sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalplugin_customization.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	String primaryFeaturePluginId = BootLoader.getCurrentPlatformConfiguration().getPrimaryFeatureIdentifier();
-	IPluginDescriptor primaryFeatureDescriptor = registry.getPluginDescriptor(primaryFeaturePluginId);
-	String destName = ((PluginDescriptor)primaryFeatureDescriptor).getLocation() +
-		"plugin_customization.ini";
-	destName = destName.substring(destName.indexOf(':') + 1);
-	PreferencesRuntimeTests.copyFile(sourceName, destName);
-	Preferences prefs = null;
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String[] defaultNames = prefs.defaultPropertyNames();
-	String[] prefNames = prefs.propertyNames();
-	assertTrue("1.0 Three default preferences", defaultNames.length == 3);
-	assertTrue("1.1 No explicit preferences", prefNames.length == 0);
-	// Do we have the right names for the default preferences?
-	boolean foundPrimaryFeaturePreference = false;
-	boolean foundCommonPreference = false;
-	boolean foundCommandLinePreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("CommandLinePreference"))
-			foundCommandLinePreference = true;
-		else if (defaultNames[i].equals("commonCmdLineAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-		else if (defaultNames[i].equals("PrimaryFeaturePreference"))
-			foundPrimaryFeaturePreference = true;
-	}
-	assertTrue("1.2 Got right default preference names",
-		foundCommandLinePreference && foundCommonPreference && foundPrimaryFeaturePreference);
-	// Check preference values
-	assertTrue("1.3 PrimaryFeaturePreference value",
-		prefs.getString("PrimaryFeaturePreference").equals("From the primary feature plugin directory via the plugin cmdLineAndPrimaryFeature"));
-	assertTrue("1.4 CommandLinePreference value",
-		prefs.getString("CommandLinePreference").equals("From the command line specified file via the plugin cmdLineAndPrimaryFeature"));
-	assertTrue("1.4 commonCmdLineAndPrimaryFeaturePreference value",
-		prefs.getString("commonCmdLineAndPrimaryFeaturePreference").equals("Common preference from the command line via the plugin cmdLineAndPrimaryFeature"));
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPluginLocalAndPrimaryFeatureTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPluginLocalAndPrimaryFeatureTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPluginLocalAndPrimaryFeatureTest.java
deleted file mode 100644
index d0a5f94..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPluginLocalAndPrimaryFeatureTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.core.tests.plugintests;
-
-/*******************************************************************************
- * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-import java.io.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.internal.runtime.SafeFileOutputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class CmdLineAndStateAndPluginLocalAndPrimaryFeatureTest extends WorkspaceSessionTest {
-
-public CmdLineAndStateAndPluginLocalAndPrimaryFeatureTest() {
-	super(null);
-}
-public CmdLineAndStateAndPluginLocalAndPrimaryFeatureTest(String name) {
-	super(name);
-}
-
-public void testCmdLineAndStateAndPluginLocalAndPrimaryFeature() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	IPluginDescriptor resPlugin = registry.getPluginDescriptor("cmdLineAndStateAndPluginLocalAndPrimaryFeature");
-	Preferences prefs = null;
-	Plugin runtimePlugin = null;
-	try {
-		runtimePlugin = resPlugin.getPlugin();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String destString = runtimePlugin.getStateLocation().append("pref_store.ini").toOSString();
-	// get rid of the protocol
-	String sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalpref_store.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	PreferencesRuntimeTests.copyFile(sourceName, destString);
-	sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalplugin_customization.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	String primaryFeaturePluginId = BootLoader.getCurrentPlatformConfiguration().getPrimaryFeatureIdentifier();
-	IPluginDescriptor primaryFeatureDescriptor = registry.getPluginDescriptor(primaryFeaturePluginId);
-	String destName = ((PluginDescriptor)primaryFeatureDescriptor).getLocation() +
-		"plugin_customization.ini";
-	destName = destName.substring(destName.indexOf(':') + 1);
-	PreferencesRuntimeTests.copyFile(sourceName, destName);
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String[] defaultNames = prefs.defaultPropertyNames();
-	String[] prefNames = prefs.propertyNames();
-	assertTrue("1.0 Four default preferences", defaultNames.length == 4);
-	assertTrue("1.1 Two explicit preferences", prefNames.length == 2);
-	// Do we have the right names for the default preferences?
-	boolean foundStatePreference = false;
-	boolean foundCommandLinePreference = false;
-	boolean foundPluginLocalPreference = false;
-	boolean foundPrimaryFeaturePreference = false;
-	boolean foundCommonPreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("CommandLinePreference"))
-			foundCommandLinePreference = true;
-		else if (defaultNames[i].equals("commonCmdLineAndStateAndPluginLocalAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-		else if (defaultNames[i].equals("PluginLocalPreference"))
-			foundPluginLocalPreference = true;
-		else if (defaultNames[i].equals("PrimaryFeaturePreference"))
-			foundPrimaryFeaturePreference = true;
-	}
-	assertTrue("1.2 Got right default preference names",
-		foundCommandLinePreference && foundCommonPreference && foundPluginLocalPreference && foundPrimaryFeaturePreference);
-	// Do we have the right names for the explicit preferences?
-	foundStatePreference = false;
-	foundCommandLinePreference = false;
-	foundPluginLocalPreference = false;
-	foundPrimaryFeaturePreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < prefNames.length; i++) {
-		if (prefNames[i].equals("StateLocalPreference"))
-			foundStatePreference = true;
-		else if (prefNames[i].equals("commonCmdLineAndStateAndPluginLocalAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("1.3 Got right explicit preference names",
-		foundStatePreference && foundCommonPreference);
-	// Check preference values
-	assertTrue("1.4 CommandLinePreference value",
-		prefs.getString("CommandLinePreference").equals("From the command line specified file via the plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature"));
-	assertTrue("1.5 commonCmdLineAndPluginLocalAndPrimaryFeaturePreference value",
-		prefs.getString("commonCmdLineAndStateAndPluginLocalAndPrimaryFeaturePreference").equals("Common preference from the plugin state area of plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature"));
-	assertTrue("1.6 PluginLocalPreference value",
-		prefs.getString("PluginLocalPreference").equals("From the local plugin directory of the plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature"));
-	assertTrue("1.7 PrimaryFeaturePreference value",
-		prefs.getString("PrimaryFeaturePreference").equals("From the primary feature plugin directory via the plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature"));
-	assertTrue("1.8 StatePreference value",
-		prefs.getString("StateLocalPreference").equals("From the plugin state area of plugin cmdLineAndStateAndPluginLocalAndPrimaryFeature"));
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPluginLocalTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPluginLocalTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPluginLocalTest.java
deleted file mode 100644
index 2019021..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPluginLocalTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.eclipse.core.tests.plugintests;
-
-/*******************************************************************************
- * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-import java.io.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.internal.runtime.SafeFileOutputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class CmdLineAndStateAndPluginLocalTest extends WorkspaceSessionTest {
-
-public CmdLineAndStateAndPluginLocalTest() {
-	super(null);
-}
-public CmdLineAndStateAndPluginLocalTest(String name) {
-	super(name);
-}
-
-public void testCmdLineAndStateAndPluginLocal() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	// Preferences in the file specified by -pluginCustomization
-	// command line parameter and in the plugin state area
-	IPluginDescriptor resPlugin = registry.getPluginDescriptor("cmdLineAndStateAndPluginLocal");
-	Plugin runtimePlugin = null;
-	try {
-		runtimePlugin = resPlugin.getPlugin();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String destString = runtimePlugin.getStateLocation().append("pref_store.ini").toOSString();
-	// get rid of the protocol
-	String sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalpref_store.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	PreferencesRuntimeTests.copyFile(sourceName, destString);
-	Preferences prefs = runtimePlugin.getPluginPreferences();
-	String[] defaultNames = prefs.defaultPropertyNames();
-	String[] prefNames = prefs.propertyNames();
-	assertTrue("1.0 Three default preferences", defaultNames.length == 3);
-	assertTrue("1.1 Two explicit preferences", prefNames.length == 2);
-	// Do we have the right names for the explicit preferences?
-	boolean foundStateLocalPreference = false;
-	boolean foundCommonPreference = false;
-	for (int i = 0; i < prefNames.length; i++) {
-		if (prefNames[i].equals("StateLocalPreference"))
-			foundStateLocalPreference = true;
-		else if (prefNames[i].equals("commonCommandLineAndStateAndPluginLocalPreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("1.2 Got right explicit preference names",
-		foundStateLocalPreference && foundCommonPreference);
-	// Do we have the right names for the default preferences?
-	boolean foundCommandLinePreference = false;
-	boolean foundPluginLocalPreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("CommandLinePreference"))
-			foundCommandLinePreference = true;
-		else if (defaultNames[i].equals("commonCommandLineAndStateAndPluginLocalPreference"))
-			foundCommonPreference = true;
-		else if (defaultNames[i].equals("PluginLocalPreference"))
-			foundPluginLocalPreference = true;
-	}
-	assertTrue("1.3 Got right default preference names",
-		foundCommandLinePreference && foundCommonPreference && foundPluginLocalPreference);
-	// Check preference values
-	assertTrue("1.4 StateLocalPreference value",
-		prefs.getString("StateLocalPreference").equals("From the plugin state area of plugin cmdLineAndStateAndPluginLocal"));
-	assertTrue("1.5 CommandLinePreference value",
-		prefs.getString("CommandLinePreference").equals("From the command line specified file via the plugin cmdLineAndStateAndPluginLocal"));
-	assertTrue("1.6 PluginLocalPreference value",
-		prefs.getString("PluginLocalPreference").equals("From the local plugin directory of the plugin cmdLineAndStateAndPluginLocal"));
-	assertTrue("1.7 commonCommandLineAndStateAndPluginLocalPreference value",
-		prefs.getString("commonCommandLineAndStateAndPluginLocalPreference").equals("Common preference from the plugin state area of plugin cmdLineAndStateAndPluginLocal"));
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPrimaryFeatureTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPrimaryFeatureTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPrimaryFeatureTest.java
deleted file mode 100644
index ddbba3d..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateAndPrimaryFeatureTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.eclipse.core.tests.plugintests;
-
-/*******************************************************************************
- * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-import java.io.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.internal.runtime.SafeFileOutputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class CmdLineAndStateAndPrimaryFeatureTest extends WorkspaceSessionTest {
-
-public CmdLineAndStateAndPrimaryFeatureTest() {
-	super(null);
-}
-public CmdLineAndStateAndPrimaryFeatureTest(String name) {
-	super(name);
-}
-
-public void testCmdLineAndStateAndPrimaryFeature() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	IPluginDescriptor resPlugin = registry.getPluginDescriptor("cmdLineAndStateAndPrimaryFeature");
-	Preferences prefs = null;
-	Plugin runtimePlugin = null;
-	try {
-		runtimePlugin = resPlugin.getPlugin();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String destString = runtimePlugin.getStateLocation().append("pref_store.ini").toOSString();
-	// get rid of the protocol
-	String sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalpref_store.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	PreferencesRuntimeTests.copyFile(sourceName, destString);
-	sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalplugin_customization.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	String primaryFeaturePluginId = BootLoader.getCurrentPlatformConfiguration().getPrimaryFeatureIdentifier();
-	IPluginDescriptor primaryFeatureDescriptor = registry.getPluginDescriptor(primaryFeaturePluginId);
-	String destName = ((PluginDescriptor)primaryFeatureDescriptor).getLocation() +
-		"plugin_customization.ini";
-	destName = destName.substring(destName.indexOf(':') + 1);
-	PreferencesRuntimeTests.copyFile(sourceName, destName);
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String[] defaultNames = prefs.defaultPropertyNames();
-	String[] prefNames = prefs.propertyNames();
-	assertTrue("1.0 Three default preferences", defaultNames.length == 3);
-	assertTrue("1.1 Two explicit preferences", prefNames.length == 2);
-	// Do we have the right names for the default preferences?
-	boolean foundStatePreference = false;
-	boolean foundCommandLinePreference = false;
-	boolean foundPrimaryFeaturePreference = false;
-	boolean foundCommonPreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("CommandLinePreference"))
-			foundCommandLinePreference = true;
-		else if (defaultNames[i].equals("commonCmdLineAndStateAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-		else if (defaultNames[i].equals("PrimaryFeaturePreference"))
-			foundPrimaryFeaturePreference = true;
-	}
-	assertTrue("1.2 Got right default preference names",
-		foundCommandLinePreference && foundCommonPreference && foundPrimaryFeaturePreference);
-	// Do we have the right names for the explicit preferences?
-	foundStatePreference = false;
-	foundCommandLinePreference = false;
-	foundPrimaryFeaturePreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < prefNames.length; i++) {
-		if (prefNames[i].equals("StateLocalPreference"))
-			foundStatePreference = true;
-		else if (prefNames[i].equals("commonCmdLineAndStateAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("1.3 Got right explicit preference names",
-		foundStatePreference && foundCommonPreference);
-	// Check preference values
-	assertTrue("1.4 CommandLinePreference value",
-		prefs.getString("CommandLinePreference").equals("From the command line specified file via the plugin cmdLineAndStateAndPrimaryFeature"));
-	assertTrue("1.5 commonCmdLineAndPrimaryFeaturePreference value",
-		prefs.getString("commonCmdLineAndStateAndPrimaryFeaturePreference").equals("Common preference from the plugin state area of plugin cmdLineAndStateAndPrimaryFeature"));
-	assertTrue("1.6 PrimaryFeaturePreference value",
-		prefs.getString("PrimaryFeaturePreference").equals("From the primary feature plugin directory via the plugin cmdLineAndStateAndPrimaryFeature"));
-	assertTrue("1.7 StatePreference value",
-		prefs.getString("StateLocalPreference").equals("From the plugin state area of plugin cmdLineAndStateAndPrimaryFeature"));
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateTest.java
deleted file mode 100644
index eb0abdf..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLineAndStateTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.eclipse.core.tests.plugintests;
-
-/*******************************************************************************
- * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-import java.io.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.internal.runtime.SafeFileOutputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class CmdLineAndStateTest extends WorkspaceSessionTest {
-
-public CmdLineAndStateTest() {
-	super(null);
-}
-public CmdLineAndStateTest(String name) {
-	super(name);
-}
-
-public void testCmdLineAndState() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	// Preferences in the file specified by -pluginCustomization
-	// command line parameter and in the plugin state area
-	IPluginDescriptor resPlugin = registry.getPluginDescriptor("cmdLineAndState");
-	Plugin runtimePlugin = null;
-	try {
-		runtimePlugin = resPlugin.getPlugin();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String destString = runtimePlugin.getStateLocation().append("pref_store.ini").toOSString();
-	// get rid of the protocol
-	String sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalpref_store.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	PreferencesRuntimeTests.copyFile(sourceName, destString);
-	Preferences prefs = runtimePlugin.getPluginPreferences();
-	String[] defaultNames = prefs.defaultPropertyNames();
-	String[] prefNames = prefs.propertyNames();
-	assertTrue("1.0 Two default preferences", defaultNames.length == 2);
-	assertTrue("1.1 Two explicit preferences", prefNames.length == 2);
-	// Do we have the right names for the explicit preferences?
-	boolean foundStateLocalPreference = false;
-	boolean foundCommonPreference = false;
-	for (int i = 0; i < prefNames.length; i++) {
-		if (prefNames[i].equals("StateLocalPreference"))
-			foundStateLocalPreference = true;
-		else if (prefNames[i].equals("commonCommandLineAndStatePreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("1.2 Got right explicit preference names",
-		foundStateLocalPreference && foundCommonPreference);
-	// Do we have the right names for the default preferences?
-	boolean foundCommandLinePreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("CommandLinePreference"))
-			foundCommandLinePreference = true;
-		else if (defaultNames[i].equals("commonCommandLineAndStatePreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("1.3 Got right default preference names",
-		foundCommandLinePreference && foundCommonPreference);
-	// Check preference values
-	assertTrue("1.4 StateLocalPreference value",
-		prefs.getString("StateLocalPreference").equals("From the plugin state area of plugin cmdLineAndState"));
-	assertTrue("1.5 CommandLinePreference value",
-		prefs.getString("CommandLinePreference").equals("From the command line specified file via the plugin cmdLineAndState"));
-	assertTrue("1.6 commonCommandLineAndStatePreference value",
-		prefs.getString("commonCommandLineAndStatePreference").equals("Common preference from the plugin state area of plugin cmdLineAndState"));
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLinePreferencesTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLinePreferencesTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLinePreferencesTest.java
deleted file mode 100644
index 8c01f83..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/CmdLinePreferencesTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.core.tests.plugintests;
-
-/*******************************************************************************
- * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-import java.io.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.internal.runtime.SafeFileOutputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class CmdLinePreferencesTest extends WorkspaceSessionTest {
-public CmdLinePreferencesTest() {
-	super(null);
-}
-public CmdLinePreferencesTest(String name) {
-	super(name);
-}
-
-public void testCmdLinePrefsOnly() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	// Check the case where the -pluginCustomization command line
-	// parameter has been used.
-	IPluginDescriptor resPlugin = registry.getPluginDescriptor("commandLinePluginPreferences");
-	Preferences prefs = null;
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String[] defaultNames = prefs.defaultPropertyNames();
-	String[] prefNames = prefs.propertyNames();
-	
-	assertTrue("1.1 One default preference", defaultNames.length == 1);
-	assertTrue("1.2 No explicit preferences", prefNames.length == 0);
-	assertTrue("1.3 Preference name", defaultNames[0].equals("CommandLinePreference"));
-	assertTrue("1.4 Preference value",
-		prefs.getString("CommandLinePreference").equals("From the command line specified file"));
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/LibraryLookupTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/LibraryLookupTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/LibraryLookupTests.java
deleted file mode 100644
index 439773e..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/LibraryLookupTests.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.plugintests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Locale;
-
-import org.eclipse.core.internal.boot.InternalBootLoader;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.internal.runtime.SafeFileOutputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-import org.eclipse.core.tests.internal.runtimetests.*;
-/**
- */
-public class LibraryLookupTests extends WorkspaceSessionTest {
-public LibraryLookupTests() {
-	super(null);
-}
-public LibraryLookupTests(String name) {
-	super(name);
-}
-
-public void resourceHelper(IPluginRegistry registry, String pluginName, String errorPrefix, String newKey) {
-	IPluginDescriptor plugin = registry.getPluginDescriptor(pluginName);
-	assertNotNull(errorPrefix + ".0.resource", plugin);
-	// check initial activation state
-	assertTrue(errorPrefix + ".1.resource", !plugin.isPluginActivated());
-	// Now try to get a resource string from this plugin.
-	// This should not cause the plugin to be activated.
-	String str = plugin.getResourceString("%key");
-	assertTrue(errorPrefix + ".2.resource", !plugin.isPluginActivated());
-	assertNotNull(errorPrefix + ".3.resource", str);
-	assertTrue(errorPrefix + ".4.resource", str.equals(newKey));
-}
-
-public void testResources() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	// PluginA has one plugin.properties file:
-	// 	<pluginRootDirectory>/plugin.properties
-	// This should be found and the "%key" translated to
-	// "Test string from pluginA root directory".
-	resourceHelper(registry, "plugina", "A", "Test string from pluginA root directory");
-
-
-	// PluginB has one plugin.properties file:
-	// 	<pluginRootDirectory>/bin/plugin.properties
-	// This should be found and the "%key" translated to 
-	// "Test string from pluginB bin directory".
-	resourceHelper(registry, "pluginb", "B", "Test string from pluginB bin directory");
-
-	// PluginC has two plugin.properties files:
-	// 	<pluginRootDirectory>/plugin.properties
-	// 	<pluginRootDirectory>/bin/plugin.properties
-	// The one in the bin directory should be found first and %key
-	// translated to
-	// "Test string from pluginC bin directory".
-
-	// DDW - We would like to find the bin version first but
-	// there is code in PluginDescriptor.ResourceBundle getResourceBundle(Locale)
-	// which deliberately puts the plugin root directory at the head
-	// of the classpath?!! FIXME
-//	resourceHelper(registry, "pluginc", "C", "Test string from pluginC bin directory");
-
-	// PluginD has one plugin.properties file:
-	// 	<fragmentRootDirectory>/plugin.properties
-	// This should be found and the "%key" translated to 
-	// "Test string from pluginD fragment root directory".
-	
-	// DDW FIXME
-//	resourceHelper(registry, "plugind", "D", "Test string from pluginD fragment root directory");
-
-	// PluginE has one plugin.properties file
-	// 	<fragmentRootDirectory>/bin/plugin.properties
-	// This should be found and the "%key" translated to 
-	// "Test string from pluginE fragment bin directory".
-	resourceHelper(registry, "plugine", "E", "Test string from pluginE fragment bin directory");
-
-	// PluginF has two plugin.properties files
-	// 	<fragmentRootDirectory>/plugin.properties
-	// 	<fragmentRootDirectory>/bin/plugin.properties
-	// The one in the bin directory should be found first and %key
-	// translated to
-	// "Test string from pluginF fragment bin directory".
-	resourceHelper(registry, "pluginf", "F", "Test string from pluginF fragment bin directory");
-
-	// PluginG has two plugin.properties files
-	// 	<pluginRootDirectory>/plugin.properties
-	// 	<fragmentRootDirectory>/plugin.properties
-	// The one in the root directory should be found first and %key
-	// translated to
-	// "Test string from pluginG root directory".
-	resourceHelper(registry, "pluging", "G", "Test string from pluginG root directory");
-
-	// PluginH has two plugin.properties files
-	// 	<pluginRootDirectory>/plugin.properties
-	// 	<fragmentRootDirectory>/bin/plugin.properties
-	// The one in the root directory should be found first and %key
-	// translated to
-	// "Test string from pluginH root directory".
-	resourceHelper(registry, "pluginh", "H", "Test string from pluginH root directory");
-
-	// PluginI has two plugin.properties files
-	// 	<pluginRootDirectory>/bin/plugin.properties
-	// 	<fragmentRootDirectory>/plugin.properties
-	// The one in the plugin bin directory should be found first and %key
-	// translated to
-	// "Test string from pluginI bin directory".
-	resourceHelper(registry, "plugini", "I", "Test string from pluginI bin directory");
-
-	// PluginJ has two plugin.properties files
-	// 	<pluginRootDirectory>/bin/plugin.properties
-	// 	<fragmentRootDirectory>/bin/plugin.properties
-	// The one in the plugin bin directory should be found first and %key
-	// translated to
-	// "Test string from pluginJ bin directory".
-	resourceHelper(registry, "pluginj", "J", "Test string from pluginJ bin directory");
-
-	// PluginK has three plugin.properties files
-	// 	<pluginRootDirectory>/plugin.properties
-	// 	<pluginRootDirectory>/bin/plugin.properties
-	// 	<fragmentRootDirectory>/plugin.properties
-	// The one in the plugin root directory should be found first and %key
-	// translated to
-	// "Test string from pluginK root directory".
-	resourceHelper(registry, "plugink", "K", "Test string from pluginK root directory");
-
-	// PluginL has three plugin.properties files
-	// 	<pluginRootDirectory>/plugin.properties
-	// 	<pluginRootDirectory>/bin/plugin.properties
-	// 	<fragmentRootDirectory>/bin/plugin.properties
-	// The one in the plugin root directory should be found first and %key
-	// translated to
-	// "Test string from pluginL root directory".
-	resourceHelper(registry, "pluginl", "L", "Test string from pluginL root directory");
-
-	// PluginM has three plugin.properties files
-	// 	<pluginRootDirectory>/plugin.properties
-	// 	<fragmentRootDirectory>/plugin.properties
-	// 	<fragmentRootDirectory>/bin/plugin.properties
-	// The one in the plugin root directory should be found first and %key
-	// translated to
-	// "Test string from pluginM root directory".
-	resourceHelper(registry, "pluginm", "M", "Test string from pluginM root directory");
-
-	// PluginN has three plugin.properties files
-	// 	<pluginRootDirectory>/bin/plugin.properties
-	// 	<fragmentRootDirectory>/plugin.properties
-	// 	<fragmentRootDirectory>/bin/plugin.properties
-	// The one in the plugin bin directory should be found first and %key
-	// translated to
-	// "Test string from pluginN bin directory".
-	resourceHelper(registry, "pluginn", "N", "Test string from pluginN bin directory");
-
-	// PluginH has four plugin.properties files
-	// 	<pluginRootDirectory>/plugin.properties
-	// 	<pluginRootDirectory>/bin/plugin.properties
-	// 	<fragmentRootDirectory>/plugin.properties
-	// 	<fragmentRootDirectory>/bin/plugin.properties
-	// The one in the plugin root directory should be found first and %key
-	// translated to
-	// "Test string from pluginO root directory".
-	resourceHelper(registry, "plugino", "O", "Test string from pluginO root directory");
-}
-
-public IPluginDescriptor codeHelper(IPluginRegistry registry, String pluginName, String errorPrefix, String className) {
-	IPluginDescriptor plugin = registry.getPluginDescriptor(pluginName);
-	assertNotNull(errorPrefix + ".0.code", plugin);
-	// check initial activation state
-	assertTrue(errorPrefix + ".1.code", !plugin.isPluginActivated());
-	// Now try to access the plugin class.  This should cause
-	// the plugin to be activated.
-	Plugin active = null;
-	try {
-		active = plugin.getPlugin();
-	} catch (CoreException ce) {
-		fail(errorPrefix + ".2.code Core exception encountered.",ce);
-	}
-	assertTrue (errorPrefix + ".3.code", active.getClass().getName().equals(className));
-	assertTrue(errorPrefix + ".4.code", plugin.isPluginActivated());
-	return plugin;
-}
-
-public void testCode() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-
-	String classNamePrefix = "org.eclipse.core.tests.internal.runtimetests.";
-	// codePluginA has one jar file
-	//	<pluginRootDirectory>/codePluginA.jar (with class SampleA).
-	IPluginDescriptor myPlugin = codeHelper(registry, "codePluginA", "A", classNamePrefix + "SampleA");
-
-	// codePluginB has one jar file
-	//	<pluginRootDirectory>/bin/codePluginB.jar (with class SampleB).
-	codeHelper(registry, "codePluginB", "B", classNamePrefix + "SampleB");
-
-	// codePluginC has two jar files
-	//	<pluginRootDirectory>/codePluginC.jar (with class SampleCPR)
-	//	<pluginRootDirectory>/bin/codePluginC.jar (with class SampleCPB).
-	codeHelper(registry, "codePluginC", "C", classNamePrefix + "SampleCPB");
-
-	// codePluginD has one jar file
-	//	<fragmentRootDirectory>/codePluginD.jar (with class SampleD).
-	codeHelper(registry, "codePluginD", "D", classNamePrefix + "SampleD");
-
-	// codePluginE has one jar file
-	//	<fragmentRootDirectory>/bin/codePluginE.jar (with class SampleE).
-	codeHelper(registry, "codePluginE", "E", classNamePrefix + "SampleE");
-
-	// codePluginF has two jar files
-	//	<fragmentRootDirectory>/codePluginF.jar (with class SampleFFR)
-	//	<fragmentRootDirectory>/bin/codePluginF.jar (with class SampleFFB).
-	codeHelper(registry, "codePluginF", "F", classNamePrefix + "SampleFFB");
-
-	// codePluginG has two jar files
-	//	<pluginRootDirectory>/codePluginG.jar (with class SampleGPR)
-	//	<fragmentRootDirectory>/codePluginG.jar (with class SampleGFR).
-	codeHelper(registry, "codePluginG", "G", classNamePrefix + "SampleGPR");
-
-	// codePluginH has two jar files
-	//	<pluginRootDirectory>/codePluginH.jar (with class SampleGHPR)
-	//	<fragmentRootDirectory>/bin/codePluginH.jar (with class SampleHFB).
-	codeHelper(registry, "codePluginH", "H", classNamePrefix + "SampleHFB");
-
-	// codePluginI has two jar files
-	//	<pluginRootDirectory>/bin/codePluginI.jar (with class SampleIPB)
-	//	<fragmentRootDirectory>/codePluginI.jar (with class SampleIFR).
-	codeHelper(registry, "codePluginI", "I", classNamePrefix + "SampleIPB");
-
-	// codePluginJ has two jar files
-	//	<pluginRootDirectory>/bin/codePluginJ.jar (with class SampleJPB)
-	//	<fragmentRootDirectory>/bin/codePluginJ.jar (with class SampleJFB).
-	codeHelper(registry, "codePluginJ", "J", classNamePrefix + "SampleJPB");
-
-	// codePluginK has three jar files
-	//	<pluginRootDirectory>/codePluginK.jar (with class SampleKPR)
-	//	<pluginRootDirectory>/bin/codePluginK.jar (with class SampleKPB)
-	//	<fragmentRootDirectory>/codePluginK.jar (with class SampleKFR).
-	codeHelper(registry, "codePluginK", "K", classNamePrefix + "SampleKPB");
-
-	// codePluginL has three jar files
-	//	<pluginRootDirectory>/codePluginL.jar (with class SampleLPR)
-	//	<pluginRootDirectory>/bin/codePluginL.jar (with class SampleLPB)
-	//	<fragmentRootDirectory>/bin/codePluginL.jar (with class SampleLFB).
-	codeHelper(registry, "codePluginL", "L", classNamePrefix + "SampleLPB");
-
-	// codePluginM has three jar files
-	//	<pluginRootDirectory>/codePluginM.jar (with class SampleMPR)
-	//	<fragmentRootDirectory>/codePluginM.jar (with class SampleMFR).
-	//	<fragmentRootDirectory>/bin/codePluginM.jar (with class SampleMFB).
-	codeHelper(registry, "codePluginM", "M", classNamePrefix + "SampleMFB");
-
-	// codePluginN has three jar files
-	//	<pluginRootDirectory>/bin/codePluginN.jar (with class SampleNPB)
-	//	<fragmentRootDirectory>/codePluginN.jar (with class SampleNFR).
-	//	<fragmentRootDirectory>/bin/codePluginN.jar (with class SampleNFB).
-	codeHelper(registry, "codePluginN", "N", classNamePrefix + "SampleNPB");
-
-	// codePluginO has four jar files
-	//	<pluginRootDirectory>/codePluginO.jar (with class SampleOPR)
-	//	<pluginRootDirectory>/bin/codePluginO.jar (with class SampleOPB)
-	//	<fragmentRootDirectory>/codePluginO.jar (with class SampleOFR).
-	//	<fragmentRootDirectory>/bin/codePluginO.jar (with class SampleOFB).
-	codeHelper(registry, "codePluginO", "O", classNamePrefix + "SampleOPB");
-}
-
-public static void copyFile (String sourceName, String destName) {
-	// A crude mechanism for creating a preference file
-	SafeFileInputStream sourceIn = null;
-	SafeFileOutputStream destOut = null;
-	try {
-		sourceIn = new SafeFileInputStream(sourceName);
-		destOut = new SafeFileOutputStream(destName);
-		int buffer = sourceIn.read();
-		while (buffer != -1) {
-			destOut.write(buffer);
-			buffer = sourceIn.read();
-		}
-	} catch (IOException ioe) {
-		fail("0.0 Trouble creating file " + destName + " from original file " + sourceName + ".");
-	} finally {
-		try {
-			sourceIn.close();
-			destOut.close();
-		} catch (IOException e) {
-			fail("0.1 Trouble closing file " + destName + " or " + sourceName + ".");
-		}
-	}
-}
-
-private void deleteDirectory (File directory) {
-	String[] files = directory.list();
-	if (files == null) {
-		directory.delete();
-		return;
-	}
-	for (int i = 0; i < files.length; i++) {
-		File newFile = new File(directory, files[i]);
-		if (newFile.isFile())
-			newFile.delete();
-		else if (newFile.isDirectory())
-			deleteDirectory(newFile);
-	}
-	directory.delete();
-}
-
-public void test3093 () {
-	/* A plugin/fragment entry like 
-	 * 		library name="$nl$/"
-	 * should result in a file: url added on the classpath.
-	 * The bug indicated that a jar: url was being added.
-	 */
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	IPluginDescriptor plugin = registry.getPluginDescriptor("test3093PluginA");
-	assertNotNull("1.0", plugin);
-	// build the right nl related directory and put the jar file there.
-	String nl = InternalBootLoader.getNL();
-	nl = nl.replace('_', '/');
-	URL pluginRoot = plugin.find(new Path("./"));
-	String fullNLDirectory = pluginRoot.getFile() + "nl/" + nl;
-	File file = new File(fullNLDirectory);
-	try {
-		file.mkdirs();
-		// Now copy the jar file to the right spot
-		String jarSource = null;
-		String jarDest = null;
-		try {
-			jarSource = new URL(pluginRoot, "../../").getFile() + "codePluginA.jar";
-			jarDest = new URL(new URL(pluginRoot, "nl/" + nl + "/"), "codePluginA.jar").getFile();
-		} catch (MalformedURLException badURL) {
-			// just ignore the exception
-		}
-		copyFile(jarSource, jarDest);
-		// Activate this plugin
-		Plugin active = null;
-		try {
-			active = plugin.getPlugin();
-		} catch (CoreException ce) {
-			fail("1.1 Core exception encountered.",ce);
-		}
-		URL[] cp = ((URLClassLoader)plugin.getPluginClassLoader()).getURLs();
-		assertTrue("1.2 One URL on class path", cp.length == 1);
-		String urlString = cp[0].toString();
-		// Make sure we have the right protocol (not jar: but file:)
-		assertEquals("1.3 Right protocol", cp[0].getProtocol(), "file");
-		// Make sure we really picked up the right directory.
-		assertEquals("1.4 Contains nl directory", fullNLDirectory + "/", cp[0].getFile());
-	} finally {	
-		// cleanup
-		try {
-			URL deleteURL = new URL(pluginRoot, "nl");
-			deleteDirectory(new File(deleteURL.getFile()));
-		} catch (MalformedURLException badURL) {
-			// just ignore the bad URL - means we won't cleanup
-		}
-	}
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PluginFindTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PluginFindTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PluginFindTests.java
deleted file mode 100644
index 92e306f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PluginFindTests.java
+++ /dev/null
@@ -1,721 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.plugintests;
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Locale;
-import java.util.Properties;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.boot.InternalBootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.model.PluginFragmentModel;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class PluginFindTests extends WorkspaceSessionTest {
-
-public PluginFindTests() {
-	super(null);
-}
-
-public PluginFindTests(String name) {
-	super(name);
-}
-
-private void findHelper(String pluginId, String fragmentId, String errorPrefix, String filePrefix, String pluginSubDir) {
-	// Look for a file called <filePrefix>/<pluginId>.txt
-	// Make sure this doesn't cause the plugin to be activated.
-	// Make sure the data in file looks like:
-	// "Test string from " + pluginId + " plugin " + pluginSubDir + " directory."
-	// Make sure the file was found in
-	//     <workspaceRoot>/Plugintests_Testing/FindTests/plugins/<pluginId>/<pluginSubDir>/<pluginId>.txt
-	IPluginDescriptor plugin = InternalPlatform.getPluginRegistry().getPluginDescriptor(pluginId);
-	assertNotNull(errorPrefix + ".0 Can't find plugin " + pluginId);
-	// Now make sure we can find the file
-	IPath path = null;
-	String whichId = pluginId;
-	if (fragmentId != null)
-		whichId = fragmentId;
-	path = new Path(filePrefix + "/" + whichId + ".txt");
-	URL result = plugin.find(path);
-	assertTrue(errorPrefix + ".1 Plugin should not be activated", !plugin.isPluginActivated());
-	assertNotNull(errorPrefix + ".2 Can't find text file, " + path.toString(), result);
-	// Make sure this is the right URL
-	String stringResult = result.getFile();
-	if (pluginSubDir != null) {
-		assertTrue(errorPrefix + ".3 Wrong url - " + stringResult,
-			stringResult.endsWith("Plugintests_Testing/FindTests/plugins/" + whichId + "/" + pluginSubDir + "/" + whichId + ".txt"));
-	} else {
-		assertTrue(errorPrefix + ".3 Wrong url - " + stringResult,
-			stringResult.endsWith("Plugintests_Testing/FindTests/plugins/" + whichId + "/" + whichId + ".txt"));
-	}
-	// And finally, read the file and make sure it is the right one.
-	InputStream in = null;
-	byte[] buffer = null;
-	try {
-		in = result.openStream();
-		buffer = new byte[in.available()];
-		in.read(buffer);
-		in.close();
-	} catch (IOException ioe) {
-		fail(errorPrefix + ".4 IOException reading " + stringResult);
-	}
-	String dataString = (new String(buffer)).trim();
-
-	if (fragmentId == null)
-		assertEquals(errorPrefix + ".5 Data string incorrect", "Test string from " + whichId + " plugin " + pluginSubDir + " directory.", dataString);
-	else
-		assertEquals(errorPrefix + ".5 Data string incorrect", "Test string from " + whichId + " fragment " + pluginSubDir + " directory.", dataString);
-}
-
-private void findFailsHelper(String pluginId, String fragmentId, String errorPrefix, String filePrefix) {
-	IPluginDescriptor plugin = InternalPlatform.getPluginRegistry().getPluginDescriptor(pluginId);
-	assertNotNull(errorPrefix + ".0 Can't find plugin " + pluginId);
-	String whichId = pluginId;
-	if (fragmentId != null)
-		whichId = fragmentId;
-	// Now make sure we can't find the file
-	IPath path = new Path(filePrefix + "/" + whichId + ".txt");
-	URL result = plugin.find(path);
-	assertNull(errorPrefix + ".1 Found text file, " + path.toString(), result);
-}
-
-private boolean buildPluginTestFile(String pluginId, String pluginSubDir) {
-	IPluginDescriptor plugin = InternalPlatform.getPluginRegistry().getPluginDescriptor(pluginId);
-	assertNotNull("0.1 Can't find plugin " + pluginId, plugin);
-	URL pluginRoot = plugin.find(new Path("./"));
-	File file = null;
-	if (pluginSubDir != null) {
-		file = new File(pluginRoot.getFile() + pluginSubDir);
-		file.mkdirs();
-	} else 
-		file = new File(pluginRoot.getFile());
-	// Now build up the file
-	File testFile = new File(file, pluginId + ".txt");
-	try {
-		FileOutputStream fs = new FileOutputStream(testFile);
-		PrintWriter w = new PrintWriter(fs);
-		try {
-			w.println("Test string from " + pluginId + " plugin " + pluginSubDir + " directory.");
-			w.flush();
-		} finally {
-			w.close();
-		}
-	} catch (IOException ioe) {
-		System.out.println ("Unable to write to test file " + testFile.getPath());
-		return false;
-	}
-	return true;
-}
-
-private boolean buildFragmentTestFile(String pluginId, String fragmentId, String pluginSubDir) {
-	IPluginDescriptor plugin = InternalPlatform.getPluginRegistry().getPluginDescriptor(pluginId);
-	assertNotNull("0.1 Can't find plugin " + pluginId, plugin);
-	PluginFragmentModel[] fragments = ((PluginDescriptor)plugin).getFragments();
-	// Should only be one fragment
-	assertEquals("0.2 Fragment mismatch", fragmentId, fragments[0].getId());
-	URL fragmentRoot = null;
-	try {
-		fragmentRoot = new URL(fragments[0].getLocation());
-	} catch (MalformedURLException badURL) {
-		return false;
-	}
-	File file = null;
-	if (pluginSubDir != null) {
-		file = new File(fragmentRoot.getFile() + pluginSubDir);
-		file.mkdirs();
-	} else 
-		file = new File(fragmentRoot.getFile());
-	// Now build up the file
-	File testFile = new File(file, fragmentId + ".txt");
-	try {
-		FileOutputStream fs = new FileOutputStream(testFile);
-		PrintWriter w = new PrintWriter(fs);
-		try {
-			w.println("Test string from " + fragmentId + " fragment " + pluginSubDir + " directory.");
-			w.flush();
-		} finally {
-			w.close();
-		}
-	} catch (IOException ioe) {
-		System.out.println ("Unable to write to test file " + testFile.getPath());
-		return false;
-	}
-	return true;
-}
-
-private String buildNLTestFile(String pluginId, String fragmentId, int chopSegment) {
-	// Build up nl related directories and test files
-	String nl = InternalBootLoader.getNL();
-	nl = nl.replace('_', '/');
-	// Chop off the number of segments stated
-	int i = chopSegment;
-	while (nl.length() > 0 && i > 0) {
-		i--;
-		int idx = nl.lastIndexOf('/');
-		if (idx != -1)
-			nl = nl.substring(0, idx);
-		else 
-			nl = "";
-	}
-	if ((nl.length() == 0) && (i > 0))
-		// We couldn't get rid of all the segments we wanted to
-		return null;
-	if (fragmentId == null) {
-		if (buildPluginTestFile(pluginId, "nl/" + nl))
-			return nl;
-	} else {
-		if (buildFragmentTestFile(pluginId, fragmentId, "nl/" + nl))
-			return nl;
-	}
-	return null;
-}
-
-private String buildOSTestFile(String pluginId, String fragmentId, int chopSegment) {
-	// Build up os related directories and test files
-	String fullOS = InternalBootLoader.getOS() + "/" + InternalBootLoader.getOSArch();
-	int i = chopSegment;
-	while (fullOS.length() > 0 && i > 0) {
-		i--;
-		int idx = fullOS.lastIndexOf('/');
-		if (idx != -1)
-			fullOS = fullOS.substring(0, idx);
-		else 
-			fullOS = "";
-	}
-	if ((fullOS.length() == 0) && (i > 0))
-		// We couldn't get rid of all the segments we wanted to
-		return null;
-	if (fragmentId == null) {
-		if (buildPluginTestFile(pluginId, "os/" + fullOS))
-			return fullOS;
-	} else {
-		if (buildFragmentTestFile(pluginId, fragmentId, "os/" + fullOS))
-			return fullOS;
-	}
-	return null;
-}
-
-private String buildWSTestFile(String pluginId, String fragmentId, int chopSegments) {
-	// Build up ws related directories and test files
-	String ws = InternalBootLoader.getWS();
-	if (chopSegments > 0)
-		ws = "";
-	if (fragmentId == null) {
-		if (buildPluginTestFile(pluginId, "ws/" + ws))
-			return ws;
-	} else {
-		if (buildFragmentTestFile(pluginId, fragmentId, "ws/" + ws))
-			return ws;
-	}
-	return null;
-}
-
-private void deleteDirectory (File directory) {
-	String[] files = directory.list();
-	if (files == null) {
-		directory.delete();
-		return;
-	}
-	for (int i = 0; i < files.length; i++) {
-		File newFile = new File(directory, files[i]);
-		if (newFile.isFile())
-			newFile.delete();
-		else if (newFile.isDirectory())
-			deleteDirectory(newFile);
-	}
-	directory.delete();
-}
-
-private void cleanupTestDirectory (String pluginId, String fragmentId, String testDirectory) {
-	IPluginDescriptor plugin = InternalPlatform.getPluginRegistry().getPluginDescriptor(pluginId);
-	URL rootDir = null;
-	if (fragmentId == null) {
-		rootDir = plugin.find(new Path("./"));
-	} else {
-		PluginFragmentModel[] fragments = ((PluginDescriptor)plugin).getFragments();
-		if (fragments.length != 1)
-			return;
-		try {
-			rootDir = new URL(fragments[0].getLocation());
-		} catch (MalformedURLException badURL) {
-			return;
-		}
-	}
-	if (rootDir == null)
-		return;
-	String rootString = rootDir.getFile();
-	deleteDirectory(new File(rootString + "/" + testDirectory));
-}
-
-public void testFindNothing () {
-	IPluginDescriptor plugin = InternalPlatform.getPluginRegistry().getPluginDescriptor("org.eclipse.core.runtime");
-	assertNotNull("1.0 can't find runtime plugin descriptor", plugin);
-	// Just make sure we handle this gracefully
-	URL result = plugin.find(null, null);
-	assertNull("1.1 non-null result from null path and override", result);
-	// And make sure we handle this one too
-	result = plugin.find(null);
-	assertNull("1.2 non-null result from null path", result);
-	// Bug 14224 indicates that for "" or "/" we gave a 
-	// NullPointerException.  The following tests ensure we catch
-	// this.
-	// The result should be the root directory for this plugin
-	String pluginRoot = ((PluginDescriptor)plugin).getInstallURLInternal().getFile();
-	result = plugin.find(new Path(""));
-	assertEquals("1.3 find(new Path(\"\")", pluginRoot, result.getFile());
-	result = plugin.find(new Path("/"));
-	assertEquals("1.4 find(new Path(\"/\")", pluginRoot, result.getFile());
-	result = plugin.find(new Path("./"));
-	assertEquals("1.5 find(new Path(\"./\")", pluginRoot, result.getFile());
-	result = plugin.find(new Path("."));
-	assertEquals("1.6 find(new Path(\".\")", pluginRoot, result.getFile());
-	result = plugin.find(new Path(".."));
-	assertNull("1.7 find(new Path(\"..\")", result);
-}
-
-public void testFindInteresting () {
-	IPluginDescriptor plugin = InternalPlatform.getPluginRegistry().getPluginDescriptor("interestingPluginFindTest");
-	assertNotNull("1.0 Can't find plugin, interestingPluginFindTest", plugin);
-	URL pluginRoot = plugin.find(new Path("./"));
-	PluginFragmentModel[] fragments = ((PluginDescriptor)plugin).getFragments();
-	assertEquals("1.1 Only one fragment", 1, fragments.length);
-	assertEquals("1.2 Fragment id is incorrect", "interestingFragmentFindTest", fragments[0].getId());
-	URL fragmentRoot = null;
-	try {
-		fragmentRoot = new URL(fragments[0].getLocation());
-	} catch (MalformedURLException badURL) {
-		// ignore bad url
-	}
-
-	File testFile = null;
-	File testDirs = null;
-	try {
-		// Check for a file in a directory above this plugin's root
-		File pluginRootFile = new File(pluginRoot.getFile());
-		testFile = new File(pluginRootFile, "../interestingPluginFindTest.txt");
-		try {
-			FileOutputStream fs = new FileOutputStream(testFile);
-			PrintWriter w = new PrintWriter(fs);
-			try {
-				w.println("Test string from interestingPluginFindTest plugin in the .. directory.");
-				w.flush();
-			} finally {
-				w.close();
-			}
-		} catch (IOException ioe) {
-			System.out.println ("Unable to write to test file " + testFile.getPath());
-		}
-		findFailsHelper("interestingPluginFindTest", null, "1", "..");
-		testFile.delete();
-		testFile = null;
-
-		// Check for a file in a directory above the fragment's root
-		File fragmentRootFile = new File(fragmentRoot.getFile());
-		testFile = new File(fragmentRootFile, "../interestingFragmentFindTest.txt");
-		try {
-			FileOutputStream fs = new FileOutputStream(testFile);
-			PrintWriter w = new PrintWriter(fs);
-			try {
-				w.println("Test string from interestingPluginFindTest fragment in the .. directory.");
-				w.flush();
-			} finally {
-				w.close();
-			}
-		} catch (IOException ioe) {
-			System.out.println ("Unable to write to test file " + testFile.getPath());
-		}
-		findFailsHelper("interestingPluginFindTest", "interestingFragmentFindTest", "2", "..");
-		testFile.delete();
-
-		// Check for a file in a sibling directory to this plugin
-		testDirs = new File(pluginRootFile, "../siblingTestDirectory/");
-		testDirs.mkdirs();
-		testFile = new File(pluginRootFile, "../siblingTestDirectory/interestingPluginFindTest.txt");
-		try {
-			FileOutputStream fs = new FileOutputStream(testFile);
-			PrintWriter w = new PrintWriter(fs);
-			try {
-				w.println("Test string from interestingPluginFindTest plugin in the ../siblingTestDirectory directory.");
-				w.flush();
-			} finally {
-				w.close();
-			}
-		} catch (IOException ioe) {
-			System.out.println ("Unable to write to test file " + testFile.getPath());
-		}
-		findFailsHelper("interestingPluginFindTest", null, "3", "../siblingTestDirectory");
-		deleteDirectory(testDirs);
-
-		// Check for a file in a sibling directory to this fragment
-		testDirs = new File(pluginRootFile, "../siblingFragmentTestDirectory/");
-		testDirs.mkdirs();
-		testFile = new File(pluginRootFile, "../siblingFragmentTestDirectory/interestingFragmentFindTest.txt");
-		try {
-			FileOutputStream fs = new FileOutputStream(testFile);
-			PrintWriter w = new PrintWriter(fs);
-			try {
-				w.println("Test string from interestingPluginFindTest fragment in the ../siblingFragmentTestDirectory directory.");
-				w.flush();
-			} finally {
-				w.close();
-			}
-		} catch (IOException ioe) {
-			System.out.println ("Unable to write to test file " + testFile.getPath());
-		}
-		findFailsHelper("interestingPluginFindTest", "interestingFragmentFindTest", "4", "../siblingFragmentTestDirectory");
-		deleteDirectory(testDirs);
-	} finally {
-		if (testFile != null)
-			testFile.delete();
-		if (testDirs != null)
-			deleteDirectory(testDirs);
-	}
-
-	// Check for /namelessDirectory
-//	findHelper("interestingPluginFindTest", "1", "/namelessDirectory/namelessPluginFind.txt", "Test string from interestingPluginFind plugin namelessDirectory directory.", "interestingPluginFind/namelessDirectory");
-}
-
-public void testRootFind () {
-	// Do a find for something in the plugin root directory
-	try {
-		if (buildPluginTestFile("rootPluginFindTest", null))
-			findHelper("rootPluginFindTest", null, "1", ".", null);
-	} finally {
-		cleanupTestDirectory("rootPluginFindTest", null, "rootPluginFindTest.txt");
-	}
-	// Do a find for something in the fragment root directory
-	try {
-		if (buildFragmentTestFile("rootPluginFindTest", "rootFragmentFindTest", null))
-			findHelper("rootPluginFindTest", "rootFragmentFindTest", "2", ".", null);
-	} finally {
-		cleanupTestDirectory("rootPluginFindTest", "rootFragmentFindTest", "rootFragmentFindTest.txt");
-	}
-}
-
-public void testNLFind() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	// How many segments in the default locale?
-	String nl = InternalBootLoader.getNL();
-	// there is at least one segment
-	int localeSegments = 1;
-	int i = nl.indexOf('_');
-	while (i != -1) {
-		localeSegments++;
-		nl = nl.substring(i+1);
-		i = nl.indexOf('_');
-	}
-	// Build up nl related directories and test files
-	try {
-		String subDirectory = buildNLTestFile("nlPluginFindTest", null, 0);
-		if (subDirectory != null)
-			findHelper("nlPluginFindTest", null, "1", "$nl$", "nl/" + subDirectory);
-		else
-			// We don't expect this one to fail
-			fail ("0.1 Could not build first nl test data for nlPluginFindTest");
-	} finally {
-		cleanupTestDirectory("nlPluginFindTest", null, "nl");
-	}
-	
-	if (localeSegments > 1) {
-		try {
-			String subDirectory = buildNLTestFile("nlPluginFindTest", null, 1);
-			if (subDirectory != null)
-				findHelper("nlPluginFindTest", null, "2", "$nl$", "nl/" + subDirectory);
-			else
-				// We don't expect this one to fail
-				fail ("0.2 Could not build first nl test data for nlPluginFindTest");
-		} finally {
-			cleanupTestDirectory("nlPluginFindTest", null, "nl");
-		}
-	}
-
-	// Do a find for something in the plugin nl directory
-	try {
-		String subDirectory = buildNLTestFile("nlPluginFindTest", null, localeSegments);
-		if (subDirectory != null)
-			findFailsHelper("nlPluginFindTest", null, "3", "$nl$");
-		else
-			// We don't expect this one to fail
-			fail ("0.3 Could not build first nl test data for nlPluginFindTest");
-	} finally {
-		cleanupTestDirectory("nlPluginFindTest", null, "nl");
-	}
-	
-	// Do a find for something in the plugin root directory
-	try {
-		if (buildPluginTestFile("nlPluginFindTest", null))
-			findHelper("nlPluginFindTest", null, "4", "$nl$", null);
-	} finally {
-		cleanupTestDirectory("nlPluginFindTest", null, "nlPluginFindTest.txt");
-	}
-		
-	// Do a find for something in the plugin ja/CA directory which is a nonsense locale
-	try {
-		if (buildPluginTestFile("nlPluginFindTest", "nl/ja/CA"))
-			findFailsHelper("nlPluginFindTest", null, "5", "$nl$");
-	} finally {
-		cleanupTestDirectory("nlPluginFindTest", null, "nl");
-	}
-
-	// Do a find for something in the fragment directory
-	try {
-		String subDirectory = buildNLTestFile("nlPluginFindTest", "nlFragmentFindTest", 0);
-		if (subDirectory != null)
-			findHelper("nlPluginFindTest", "nlFragmentFindTest", "6", "$nl$", "nl/" + subDirectory);
-		else
-			// We don't expect this one to fail
-			fail ("0.4 Could not build first nl test data for nlPluginFindTest");
-	} finally {
-		cleanupTestDirectory("nlPluginFindTest", "nlFragmentFindTest", "nl");
-	}
-
-	if (localeSegments > 1) {
-		try {
-			String subDirectory = buildNLTestFile("nlPluginFindTest", "nlFragmentFindTest", 1);
-			if (subDirectory != null)
-				findHelper("nlPluginFindTest", "nlFragmentFindTest", "7", "$nl$", "nl/" + subDirectory);
-			else
-				// We don't expect this one to fail
-				fail ("0.5 Could not build first nl test data for nlPluginFindTest");
-		} finally {
-			cleanupTestDirectory("nlPluginFindTest", "nlFragmentFindTest", "nl");
-		}
-	}
-
-	// Do a find for something in the fragment nl directory
-	try {
-		String subDirectory = buildNLTestFile("nlPluginFindTest", "nlFragmentFindTest", localeSegments);
-		if (subDirectory != null)
-			findFailsHelper("nlPluginFindTest", "nlFragmentFindTest", "8", "$nl$");
-		else
-			// We don't expect this one to fail
-			fail ("0.6 Could not build first nl test data for nlPluginFindTest");
-	} finally {
-		cleanupTestDirectory("nlPluginFindTest", "nlFragmentFindTest", "nl");
-	}
-
-	// Do a find for something in the fragment root directory
-	try {
-		if (buildFragmentTestFile("nlPluginFindTest", "nlFragmentFindTest", null))
-			findHelper("nlPluginFindTest", "nlFragmentFindTest", "9", "$nl$", null);
-	} finally {
-		cleanupTestDirectory("nlPluginFindTest", "nlFragmentFindTest", "nlFragmentFindTest.txt");
-	}
-
-	// Do a find for something in the fragment ja/CA directory which is a nonsense locale
-	try {
-		if (buildFragmentTestFile("nlPluginFindTest", "nlFragmentFindTest", "nl/ja/CA"))
-			findFailsHelper("nlPluginFindTest", "nlFragmentFindTest", "10", "$nl$");
-	} finally {
-		cleanupTestDirectory("nlPluginFindTest", "nlFragmentFindTest", "nl");
-	}
-}
-
-public void testOSFind() {
-	String subDirectory = null;
-	// Do a find for something in the plugin os/* directory
-	try {
-		subDirectory = buildOSTestFile("osPluginFindTest", null, 0);
-		if (subDirectory != null)
-			findHelper("osPluginFindTest", null, "1", "$os$", "os/" + subDirectory);
-		else
-			// We don't expect this one to fail
-			fail ("0.1 Could not build os test data");
-	} finally {
-		cleanupTestDirectory("osPluginFindTest", null, "os");
-	}
-
-	// Now chop off a segment
-	try {
-		subDirectory = buildOSTestFile("osPluginFindTest", null, 1);
-		if (subDirectory != null)
-			findHelper("osPluginFindTest", null, "2", "$os$", "os/" + subDirectory);
-		else
-			// We don't expect this one to fail
-			fail ("0.2 Could not build os test data");
-	} finally {
-		cleanupTestDirectory("osPluginFindTest", null, "os");
-	}
-	
-	// Do a find for something in the plugin os directory
-	try {
-		subDirectory = buildOSTestFile("osPluginFindTest", null, 2);
-		if (subDirectory != null)
-			findFailsHelper("osPluginFindTest", null, "3", "$os$");
-		else
-			// We don't expect this one to fail
-			fail ("0.3 Could not build os test data");
-	} finally {
-		cleanupTestDirectory("osPluginFindTest", null, "os");
-	}
-
-	// Do a find for something in the plugin root directory
-	try {
-		if (buildPluginTestFile("osPluginFindTest", null))
-			findHelper("osPluginFindTest", null, "4", "$os$", null);
-	} finally {
-		cleanupTestDirectory("osPluginFindTest", null, "osPluginFindTest.txt");
-	}
-
-	// Do a find for something in the plugin os/badOS directory which is a 
-	// nonsense os
-	try {
-		if (buildPluginTestFile("osPluginFindTest", "os/badOS"))
-			findFailsHelper("osPluginFindTest", null, "5", "$os$");
-	} finally {
-		cleanupTestDirectory("osPluginFindTest", null, "os");
-	}
-
-	// Do a find for something in the fragment os/* directory
-	try {
-		subDirectory = buildOSTestFile("osPluginFindTest", "osFragmentFindTest", 0);
-		if (subDirectory != null)
-			findHelper("osPluginFindTest", "osFragmentFindTest", "6", "$os$", "os/" + subDirectory);
-		else
-			// We don't expect this one to fail
-			fail ("0.4 Could not build os test data");
-	} finally {
-		cleanupTestDirectory("osPluginFindTest", "osFragmentFindTest", "os");
-	}
-
-	// Get rid of one segment (the osArch portion)
-	try {
-		subDirectory = buildOSTestFile("osPluginFindTest", "osFragmentFindTest", 1);
-		if (subDirectory != null)
-			findHelper("osPluginFindTest", "osFragmentFindTest", "7", "$os$", "os/" + subDirectory);
-		else
-			// We don't expect this one to fail
-			fail ("0.5 Could not build os test data");
-	} finally {
-		cleanupTestDirectory("osPluginFindTest", "osFragmentFindTest", "os");
-	}
-	
-	// Do a find for something in the fragment os directory
-	try {
-		subDirectory = buildOSTestFile("osPluginFindTest", "osFragmentFindTest", 2);
-		if (subDirectory != null)
-			findFailsHelper("osPluginFindTest", "osFragmentFindTest", "8", "$os$");
-		else
-			// We don't expect this one to fail
-			fail ("0.6 Could not build os test data");
-	} finally {
-		cleanupTestDirectory("osPluginFindTest", "osFragmentFindTest", "os");
-	}
-
-	// Do a find for something in the fragment root directory
-	try {
-		if (buildFragmentTestFile("osPluginFindTest", "osFragmentFindTest", null))
-			findHelper("osPluginFindTest", "osFragmentFindTest", "9", "$os$", null);
-	} finally {
-		cleanupTestDirectory("osPluginFindTest", "osFragmentFindTest", "osFragmentFindTest.txt");
-	}
-
-	// Do a find for something in the fragment os/badOS directory which is a 
-	// nonsense os
-	try {
-		if (buildFragmentTestFile("osPluginFindTest", "osFragmentFindTest", "os/badOS"))
-			findFailsHelper("osPluginFindTest", "osFragmentFindTest", "10", "$os$");
-	} finally {
-		cleanupTestDirectory("osPluginFindTest", "osFragmentFindTest", "os");
-	}
-}
-
-public void testWSFind() {
-	String subDirectory = null;
-	// Do a find for something in the plugin ws/* directory
-	try {
-		subDirectory = buildWSTestFile("wsPluginFindTest", null, 0);
-		if (subDirectory != null)
-			findHelper("wsPluginFindTest", null, "1", "$ws$", "ws/" + subDirectory);
-		else
-			// We don't expect this one to fail
-			fail ("0.1 Could not build ws test data");
-	} finally {
-		cleanupTestDirectory("wsPluginFindTest", null, "ws");
-	}
-
-	// Do a find for something in the plugin ws directory
-	try {
-		subDirectory = buildWSTestFile("wsPluginFindTest", null, 1);
-		if (subDirectory != null)
-			findFailsHelper("wsPluginFindTest", null, "2", "$ws$");
-		else
-			// We don't expect this one to fail
-			fail ("0.2 Could not build ws test data");
-	} finally {
-		cleanupTestDirectory("wsPluginFindTest", null, "ws");
-	}
-
-	// Do a find for something in the plugin root directory
-	try {
-		if (buildPluginTestFile("wsPluginFindTest", null))
-			findHelper("wsPluginFindTest", null, "3", "$ws$", null);
-	} finally {
-		cleanupTestDirectory("wsPluginFindTest", null, "wsPluginFindTest.txt");
-	}
-
-	// Do a find for something in the plugin ws/badWS directory which is a 
-	// nonsense ws
-	try {
-		if (buildPluginTestFile("wsPluginFindTest", "ws/badWS"))
-			findFailsHelper("wsPluginFindTest", null, "4", "$ws$");
-	} finally {
-		cleanupTestDirectory("wsPluginFindTest", null, "ws");
-	}
-
-	// Do a find for something in the fragment ws/* directory
-	try {
-		subDirectory = buildWSTestFile("wsPluginFindTest", "wsFragmentFindTest", 0);
-		if (subDirectory != null)
-			findHelper("wsPluginFindTest", "wsFragmentFindTest", "5", "$ws$", "ws/" + subDirectory);
-		else
-			// We don't expect this one to fail
-			fail ("0.3 Could not build ws test data");
-	} finally {
-		cleanupTestDirectory("wsPluginFindTest", "wsFragmentFindTest", "ws");
-	}
-
-	// Do a find for something in the fragment ws directory
-	try {
-		subDirectory = buildWSTestFile("wsPluginFindTest", "wsFragmentFindTest", 1);
-		if (subDirectory != null)
-			findFailsHelper("wsPluginFindTest", "wsFragmentFindTest", "6", "$ws$");
-		else
-			// We don't expect this one to fail
-			fail ("0.4 Could not build ws test data");
-	} finally {
-		cleanupTestDirectory("wsPluginFindTest", "wsFragmentFindTest", "ws");
-	}
-
-	// Do a find for something in the fragment root directory
-	try {
-		if (buildFragmentTestFile("wsPluginFindTest", "wsFragmentFindTest", null))
-			findHelper("wsPluginFindTest", "wsFragmentFindTest", "7", "$ws$", null);
-	} finally {
-		cleanupTestDirectory("wsPluginFindTest", "wsFragmentFindTest", "wsFragmentFindTest.txt");
-	}
-
-	// Do a find for something in the fragment ws/badWS directory which is a 
-	// nonsense ws
-	try {
-		if (buildFragmentTestFile("wsPluginFindTest", "wsFragmentFindTest", "ws/badWS"))
-			findFailsHelper("wsPluginFindTest", "wsFragmentFindTest", "8", "$ws$");
-	} finally {
-		cleanupTestDirectory("wsPluginFindTest", "wsFragmentFindTest", "ws");
-	}
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PluginTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PluginTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PluginTests.java
deleted file mode 100644
index 0069fbf..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PluginTests.java
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PreferencesRuntimeTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PreferencesRuntimeTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PreferencesRuntimeTests.java
deleted file mode 100644
index dcbe92d..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/plugintests/PreferencesRuntimeTests.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-package org.eclipse.core.tests.plugintests;
-
-import java.io.*;
-
-import org.eclipse.core.boot.BootLoader;
-import org.eclipse.core.internal.plugins.PluginDescriptor;
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.internal.runtime.SafeFileInputStream;
-import org.eclipse.core.internal.runtime.SafeFileOutputStream;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.tests.harness.WorkspaceSessionTest;
-
-public class PreferencesRuntimeTests extends WorkspaceSessionTest {
-public PreferencesRuntimeTests() {
-	super(null);
-}
-public PreferencesRuntimeTests(String name) {
-	super(name);
-}
-
-public static void copyFile (String sourceName, String destName) {
-	// A crude mechanism for creating a preference file
-	SafeFileInputStream sourceIn = null;
-	SafeFileOutputStream destOut = null;
-	try {
-		sourceIn = new SafeFileInputStream(sourceName);
-		destOut = new SafeFileOutputStream(destName);
-		int buffer = sourceIn.read();
-		while (buffer != -1) {
-			destOut.write(buffer);
-			buffer = sourceIn.read();
-		}
-	} catch (IOException ioe) {
-		fail("0.0 Trouble creating file " + destName + " from original file " + sourceName + ".");
-	} finally {
-		try {
-			sourceIn.close();
-			destOut.close();
-		} catch (IOException e) {
-			fail("0.1 Trouble closing file " + destName + " or " + sourceName + ".");
-		}
-	}
-}
-
-public void testPluginPrefs() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	// No preferences for this plugin
-	IPluginDescriptor resPlugin = registry.getPluginDescriptor("noPreferencesPlugin");
-	Preferences prefs = null;
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String[] defaultNames = prefs.defaultPropertyNames();
-	String[] prefNames = prefs.propertyNames();
-	assertTrue("1.0 No default preferences", defaultNames.length == 0);
-	assertTrue("1.1 No explicit preferences", prefNames.length == 0);
-
-	//-----------------------------------------------------------	
-	// Preferences in the plugin state area
-	resPlugin = registry.getPluginDescriptor("stateLocalPreferences");
-	// Move the preferences file into position
-	Plugin runtimePlugin = null;
-	try {
-		runtimePlugin = resPlugin.getPlugin();
-	} catch (CoreException ce) {
-		fail("0.2 core exception from getPlugin");
-	}
-	String destString = runtimePlugin.getStateLocation().append("pref_store.ini").toOSString();
-	// get rid of the protocol
-	String sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalpref_store.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	copyFile(sourceName, destString);
-	prefs = runtimePlugin.getPluginPreferences();
-	defaultNames = prefs.defaultPropertyNames();
-	prefNames = prefs.propertyNames();
-	assertTrue("2.0 No default preferences", defaultNames.length == 0);
-	assertTrue("2.1 One explicit preference", prefNames.length == 1);
-	assertTrue("2.2 Preference name", prefNames[0].equals("StateLocalPreference"));
-	assertTrue("2.3 Preference value",
-		prefs.getString("StateLocalPreference").equals("From the plugin state area"));
-
-	//-----------------------------------------------------------	
-	// Preferences in the local plugin area
-	resPlugin = registry.getPluginDescriptor("pluginLocalPreferences");
-	prefs = null;
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.3 core exception from getPlugin");
-	}
-	defaultNames = prefs.defaultPropertyNames();
-	prefNames = prefs.propertyNames();
-	assertTrue("3.0 One default preferences", defaultNames.length == 1);
-	assertTrue("3.1 No explicit preferences", prefNames.length == 0);
-	assertTrue("3.2 Default preference name", defaultNames[0].equals("PluginLocalPreference"));
-	assertTrue("3.3 Default preference value",
-		prefs.getString("PluginLocalPreference").equals("From the local plugin directory"));
-	
-	//-----------------------------------------------------------	
-	// Preferences in the primary feature plugin.
-	// There are are preferences related to this particular plugin
-	// and other plugins
-	resPlugin = registry.getPluginDescriptor("primaryFeaturePluginPreferences");
-	sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalplugin_customization.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	String primaryFeaturePluginId = BootLoader.getCurrentPlatformConfiguration().getPrimaryFeatureIdentifier();
-	IPluginDescriptor primaryFeatureDescriptor = registry.getPluginDescriptor(primaryFeaturePluginId);
-	String destName = ((PluginDescriptor)primaryFeatureDescriptor).getLocation() +
-		"plugin_customization.ini";
-	destName = destName.substring(destName.indexOf(':') + 1);
-	copyFile(sourceName, destName);
-	prefs = null;
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.4 core exception from getPlugin");
-	}
-	defaultNames = prefs.defaultPropertyNames();
-	prefNames = prefs.propertyNames();
-	assertTrue("4.0 One default preference", defaultNames.length == 1);
-	assertTrue("4.1 No explicit preferences", prefNames.length == 0);
-	assertTrue("4.2 Default preference name", defaultNames[0].equals("PrimaryFeaturePreference"));
-	assertTrue("4.3 Default preference value",
-		prefs.getString("PrimaryFeaturePreference").equals("From the primary feature plugin directory"));
-		
-	//-----------------------------------------------------------	
-	// Preferences in the plugin state area and in the local
-	// plugin area
-	resPlugin = registry.getPluginDescriptor("stateAndPluginLocal");
-	runtimePlugin = null;
-	try {
-		runtimePlugin = resPlugin.getPlugin();
-	} catch (CoreException ce) {
-		fail("0.5 core exception from getPlugin");
-	}
-	destString = runtimePlugin.getStateLocation().append("pref_store.ini").toOSString();
-	// get rid of the protocol
-	sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalpref_store.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	copyFile(sourceName, destString);
-	prefs = null;
-	prefs = runtimePlugin.getPluginPreferences();
-	defaultNames = prefs.defaultPropertyNames();
-	prefNames = prefs.propertyNames();
-	assertTrue("5.0 Two default preferences", defaultNames.length == 2);
-	assertTrue("5.1 Two explicit preferences", prefNames.length == 2);
-	// Do we have the right names for the explicit preferences?
-	boolean foundStateLocalPreference = false;
-	boolean foundCommonPreference = false;
-	for (int i = 0; i < prefNames.length; i++) {
-		if (prefNames[i].equals("StateLocalPreference"))
-			foundStateLocalPreference = true;
-		else if (prefNames[i].equals("commonStateAndPluginLocalPreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("5.2 Got right default preference names",
-		foundStateLocalPreference && foundCommonPreference);
-	// Do we have the right names for the default preferences?
-	boolean foundPluginLocalPreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("PluginLocalPreference"))
-			foundPluginLocalPreference = true;
-		else if (defaultNames[i].equals("commonStateAndPluginLocalPreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("5.3 Got right explicit preference names",
-		foundPluginLocalPreference && foundCommonPreference);
-	// Check preference values
-	assertTrue("5.4 StateLocalPreference value",
-		prefs.getString("StateLocalPreference").equals("From the plugin state area of plugin stateAndPluginLocal"));
-	assertTrue("5.5 PluginLocalPreference value",
-		prefs.getString("PluginLocalPreference").equals("From the local plugin directory of plugin stateAndPluginLocal"));
-	assertTrue("5.6 commonStateAndPluginLocalPreference value",
-		prefs.getString("commonStateAndPluginLocalPreference").equals("Common preference from the plugin state area of plugin stateAndPluginLocal"));
-
-	//-----------------------------------------------------------
-	// Preferences in the plugin state area and the primary 
-	// feature plugin
-	resPlugin = registry.getPluginDescriptor("stateAndPrimaryFeature");
-	runtimePlugin = null;
-	try {
-		runtimePlugin = resPlugin.getPlugin();
-	} catch (CoreException ce) {
-		fail("0.6 core exception from getPlugin");
-	}
-	destString = runtimePlugin.getStateLocation().append("pref_store.ini").toOSString();
-	// get rid of the protocol
-	sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalpref_store.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	copyFile(sourceName, destString);
-	sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalplugin_customization.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	destName = ((PluginDescriptor)primaryFeatureDescriptor).getLocation() +
-		"plugin_customization.ini";
-	destName = destName.substring(destName.indexOf(':') + 1);
-	copyFile(sourceName, destName);
-	prefs = null;
-	prefs = runtimePlugin.getPluginPreferences();
-	defaultNames = prefs.defaultPropertyNames();
-	prefNames = prefs.propertyNames();
-	assertTrue("6.0 Two default preferences", defaultNames.length == 2);
-	assertTrue("6.1 Two explicit preferences", prefNames.length == 2);
-	// Do we have the right names for the explicit preferences?
-	foundStateLocalPreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < prefNames.length; i++) {
-		if (prefNames[i].equals("StateLocalPreference"))
-			foundStateLocalPreference = true;
-		else if (prefNames[i].equals("commonStateAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("6.2 Got right default preference names",
-		foundStateLocalPreference && foundCommonPreference);
-	// Do we have the right names for the default preferences?
-	boolean foundPrimaryFeaturePreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("PrimaryFeaturePreference"))
-			foundPrimaryFeaturePreference = true;
-		else if (defaultNames[i].equals("commonStateAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("6.3 Got right explicit preference names",
-		foundPrimaryFeaturePreference && foundCommonPreference);
-	// Check preference values
-	assertTrue("6.4 StateLocalPreference value",
-		prefs.getString("StateLocalPreference").equals("From the plugin state area of plugin stateAndPrimaryFeature"));
-	assertTrue("6.5 PrimaryFeaturePreference value",
-		prefs.getString("PrimaryFeaturePreference").equals("From the primary feature plugin directory via the plugin stateAndPrimaryFeature"));
-	assertTrue("6.6 commonStateAndPluginLocalPreference value",
-		prefs.getString("commonStateAndPrimaryFeaturePreference").equals("Common preference from the plugin state area of plugin stateAndPrimaryFeature"));
-		
-	//-----------------------------------------------------------	
-	// Preferences in the local plugin area and the primary feature
-	// plugin
-	resPlugin = registry.getPluginDescriptor("pluginLocalAndPrimaryFeaturePreferences");
-	sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalplugin_customization.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	destName = ((PluginDescriptor)primaryFeatureDescriptor).getLocation() +
-		"plugin_customization.ini";
-	destName = destName.substring(destName.indexOf(':') + 1);
-	copyFile(sourceName, destName);
-	prefs = null;
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.7 core exception from getPlugin");
-	}
-	defaultNames = prefs.defaultPropertyNames();
-	prefNames = prefs.propertyNames();
-	assertTrue("7.0 Three default preferences", defaultNames.length == 3);
-	assertTrue("7.1 No explicit preferences", prefNames.length == 0);
-	// Do we have the right names for the default preferences?
-	foundPluginLocalPreference = false;
-	foundCommonPreference = false;
-	foundPrimaryFeaturePreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("PluginLocalPreference"))
-			foundPluginLocalPreference = true;
-		else if (defaultNames[i].equals("commonPluginLocalAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-		else if (defaultNames[i].equals("PrimaryFeaturePreference"))
-			foundPrimaryFeaturePreference = true;
-	}
-	assertTrue("7.2 Got right default preference names",
-		foundPluginLocalPreference && foundCommonPreference && foundPrimaryFeaturePreference);
-	// Check preference values
-	assertTrue("7.3 PluginLocalPreference value",
-		prefs.getString("PluginLocalPreference").equals("From the local plugin directory of the plugin pluginLocalAndPrimaryFeaturePreferences"));
-	assertTrue("7.4 PrimaryFeaturePreference value",
-		prefs.getString("PrimaryFeaturePreference").equals("From the primary feature plugin directory via the plugin pluginLocalAndPrimaryFeaturePreferences"));
-	assertTrue("7.5 commonPluginLocalAndPrimaryFeaturePreference value",
-		prefs.getString("commonPluginLocalAndPrimaryFeaturePreference").equals("Common preference from the primary feature of plugin pluginLocalAndPrimaryFeaturePreferences"));
-	
-	//-----------------------------------------------------------	
-	// Preferences in the plugin state area, the local plugin area
-	// and the primary feature plugin
-	resPlugin = registry.getPluginDescriptor("stateAndPluginLocalAndPrimaryFeature");
-	runtimePlugin = null;
-	try {
-		runtimePlugin = resPlugin.getPlugin();
-	} catch (CoreException ce) {
-		fail("0.8 core exception from getPlugin");
-	}
-	destString = runtimePlugin.getStateLocation().append("pref_store.ini").toOSString();
-	// get rid of the protocol
-	sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalpref_store.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	copyFile(sourceName, destString);
-	sourceName = ((PluginDescriptor)resPlugin).getLocation() + "/originalplugin_customization.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	destName = ((PluginDescriptor)primaryFeatureDescriptor).getLocation() +
-		"plugin_customization.ini";
-	destName = destName.substring(destName.indexOf(':') + 1);
-	copyFile(sourceName, destName);
-	prefs = null;
-	prefs = runtimePlugin.getPluginPreferences();
-	defaultNames = prefs.defaultPropertyNames();
-	prefNames = prefs.propertyNames();
-	assertTrue("8.0 Three default preferences", defaultNames.length == 3);
-	assertTrue("8.1 Two explicit preferences", prefNames.length == 2);
-	// Do we have the right names for the explicit preferences?
-	foundStateLocalPreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < prefNames.length; i++) {
-		if (prefNames[i].equals("StateLocalPreference"))
-			foundStateLocalPreference = true;
-		else if (prefNames[i].equals("commonStateAndPluginLocalAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("8.2 Got right default preference names",
-		foundStateLocalPreference && foundCommonPreference);
-	// Do we have the right names for the default preferences?
-	foundPluginLocalPreference = false;
-	foundCommonPreference = false;
-	foundPrimaryFeaturePreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("PluginLocalPreference"))
-			foundPluginLocalPreference = true;
-		else if (defaultNames[i].equals("commonStateAndPluginLocalAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-		else if (defaultNames[i].equals("PrimaryFeaturePreference"))
-			foundPrimaryFeaturePreference = true;
-	}
-	assertTrue("8.3 Got right default preference names",
-		foundPluginLocalPreference && foundCommonPreference && foundPrimaryFeaturePreference);
-	// Check preference values
-	assertTrue("8.3 StateLocalPreference value",
-		prefs.getString("StateLocalPreference").equals("From the plugin state area of plugin stateAndPluginLocalAndPrimaryFeature"));
-	assertTrue("8.4 PluginLocalPreference value",
-		prefs.getString("PluginLocalPreference").equals("From the local plugin directory of plugin stateAndPluginLocalAndPrimaryFeature"));
-	assertTrue("8.5 PrimaryFeaturePreference value",
-		prefs.getString("PrimaryFeaturePreference").equals("From the primary feature plugin directory via the plugin stateAndPluginLocalAndPrimaryFeature"));
-	assertTrue("8.6 commonStateAndPluginLocalAndPrimaryFeaturePreference value",
-		prefs.getString("commonStateAndPluginLocalAndPrimaryFeaturePreference").equals("Common preference from the plugin state area of plugin stateAndPluginLocalAndPrimaryFeature"));
-}
-
-public void testFragmentPrefs() {
-	IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-	
-	//-----------------------------------------------------------	
-	// Preferences in the local area for a fragment of this 
-	// plugin
-	IPluginDescriptor resPlugin = registry.getPluginDescriptor("fragmentLocalPreferencesPlugin");
-	Preferences prefs = null;
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.1 core exception from getPlugin");
-	}
-	String[] defaultNames = prefs.defaultPropertyNames();
-	String[] prefNames = prefs.propertyNames();
-	assertTrue("1.0 One default preferences", defaultNames.length == 1);
-	assertTrue("1.1 No explicit preferences", prefNames.length == 0);
-	assertTrue("1.2 Default preference name", defaultNames[0].equals("FragmentLocalPreference"));
-	assertTrue("1.3 Default preference value",
-		prefs.getString("FragmentLocalPreference").equals("From the local fragment directory"));
-	
-		
-	//-----------------------------------------------------------	
-	// Preferences in the plugin state area and in the local
-	// area for a fragment of this plugin
-	resPlugin = registry.getPluginDescriptor("stateAndFragmentLocalPlugin");
-	Plugin runtimePlugin = null;
-	try {
-		runtimePlugin = resPlugin.getPlugin();
-	} catch (CoreException ce) {
-		fail("0.2 core exception from getPlugin");
-	}
-	String destString = runtimePlugin.getStateLocation().append("pref_store.ini").toOSString();
-	// get rid of the protocol
-	String sourceName = ((PluginDescriptor)resPlugin).getFragments()[0].getLocation() + "originalpref_store.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	copyFile(sourceName, destString);
-	prefs = null;
-	prefs = runtimePlugin.getPluginPreferences();
-	defaultNames = prefs.defaultPropertyNames();
-	prefNames = prefs.propertyNames();
-	assertTrue("2.0 Two default preferences", defaultNames.length == 2);
-	assertTrue("2.1 Two explicit preferences", prefNames.length == 2);
-	// Do we have the right names for the explicit preferences?
-	boolean foundStateLocalPreference = false;
-	boolean foundCommonPreference = false;
-	for (int i = 0; i < prefNames.length; i++) {
-		if (prefNames[i].equals("StateLocalPreference"))
-			foundStateLocalPreference = true;
-		else if (prefNames[i].equals("commonStateAndFragmentLocalPreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("2.2 Got right default preference names",
-		foundStateLocalPreference && foundCommonPreference);
-	// Do we have the right names for the default preferences?
-	boolean foundPluginLocalPreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("FragmentLocalPreference"))
-			foundPluginLocalPreference = true;
-		else if (defaultNames[i].equals("commonStateAndFragmentLocalPreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("2.3 Got right explicit preference names",
-		foundPluginLocalPreference && foundCommonPreference);
-	// Check preference values
-	assertTrue("2.4 StateLocalPreference value",
-		prefs.getString("StateLocalPreference").equals("From the plugin state area of the fragment for stateAndFragmentLocal"));
-	assertTrue("2.5 FragmentLocalPreference value",
-		prefs.getString("FragmentLocalPreference").equals("From the local fragment directory of stateAndFragmentLocal"));
-	assertTrue("2.6 commonStateAndFragmentLocalPreference value",
-		prefs.getString("commonStateAndFragmentLocalPreference").equals("Common preference from the plugin state area for stateAndFragmentLocal"));
-
-	//-----------------------------------------------------------	
-	// Preferences in the local area for a fragment of this plugin
-	// and the primary feature
-	resPlugin = registry.getPluginDescriptor("fragmentLocalAndPrimaryFeaturePlugin");
-	sourceName = ((PluginDescriptor)resPlugin).getFragments()[0].getLocation() + "/originalplugin_customization.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	String primaryFeaturePluginId = BootLoader.getCurrentPlatformConfiguration().getPrimaryFeatureIdentifier();
-	IPluginDescriptor primaryFeatureDescriptor = registry.getPluginDescriptor(primaryFeaturePluginId);
-	destString = ((PluginDescriptor)primaryFeatureDescriptor).getLocation() +
-		"plugin_customization.ini";
-	destString = destString.substring(destString.indexOf(':') + 1);
-	copyFile(sourceName, destString);
-	prefs = null;
-	try {
-		prefs = resPlugin.getPlugin().getPluginPreferences();
-	} catch (CoreException ce) {
-		fail("0.3 core exception from getPlugin");
-	}
-	defaultNames = prefs.defaultPropertyNames();
-	prefNames = prefs.propertyNames();
-	assertTrue("3.0 Three default preferences", defaultNames.length == 3);
-	assertTrue("3.1 No explicit preferences", prefNames.length == 0);
-	// Do we have the right names for the default preferences?
-	foundPluginLocalPreference = false;
-	foundCommonPreference = false;
-	boolean foundPrimaryFeaturePreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("FragmentLocalPreference"))
-			foundPluginLocalPreference = true;
-		else if (defaultNames[i].equals("commonFragmentLocalAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-		else if (defaultNames[i].equals("PrimaryFeaturePreference"))
-			foundPrimaryFeaturePreference = true;
-	}
-	assertTrue("3.2 Got right default preference names",
-		foundPluginLocalPreference && foundCommonPreference && foundPrimaryFeaturePreference);
-	// Check preference values
-	assertTrue("3.3 FragmentLocalPreference value",
-		prefs.getString("FragmentLocalPreference").equals("From the local fragment directory of the plugin fragmentLocalAndPrimaryFeaturePlugin"));
-	assertTrue("3.4 PrimaryFeaturePreference value",
-		prefs.getString("PrimaryFeaturePreference").equals("From the primary feature plugin directory via the plugin fragmentLocalAndPrimaryFeaturePlugin"));
-	assertTrue("3.5 commonFragmentLocalAndPrimaryFeaturePreference value",
-		prefs.getString("commonFragmentLocalAndPrimaryFeaturePreference").equals("Common preference from the primary feature of plugin fragmentLocalAndPrimaryFeaturePlugin"));
-	
-	//-----------------------------------------------------------	
-	// Preferences in the plugin state area, the local area for a
-	// fragment of this plugin and the primary feature 
-	resPlugin = registry.getPluginDescriptor("stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin");
-	runtimePlugin = null;
-	try {
-		runtimePlugin = resPlugin.getPlugin();
-	} catch (CoreException ce) {
-		fail("0.4 core exception from getPlugin");
-	}
-	destString = runtimePlugin.getStateLocation().append("pref_store.ini").toOSString();
-	// get rid of the protocol
-	sourceName = ((PluginDescriptor)resPlugin).getFragments()[0].getLocation() + "/originalpref_store.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	copyFile(sourceName, destString);
-	sourceName = ((PluginDescriptor)resPlugin).getFragments()[0].getLocation() + "/originalplugin_customization.ini";
-	sourceName = sourceName.substring(sourceName.indexOf(':') + 1);
-	destString = ((PluginDescriptor)primaryFeatureDescriptor).getLocation() +
-		"plugin_customization.ini";
-	destString = destString.substring(destString.indexOf(':') + 1);
-	copyFile(sourceName, destString);
-	prefs = null;
-	prefs = runtimePlugin.getPluginPreferences();
-	defaultNames = prefs.defaultPropertyNames();
-	prefNames = prefs.propertyNames();
-	assertTrue("4.0 Three default preferences", defaultNames.length == 3);
-	assertTrue("4.1 Two explicit preferences", prefNames.length == 2);
-	// Do we have the right names for the explicit preferences?
-	foundStateLocalPreference = false;
-	foundCommonPreference = false;
-	for (int i = 0; i < prefNames.length; i++) {
-		if (prefNames[i].equals("StateLocalPreference"))
-			foundStateLocalPreference = true;
-		else if (prefNames[i].equals("commonStateAndFragmentLocalAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-	}
-	assertTrue("4.2 Got right default preference names",
-		foundStateLocalPreference && foundCommonPreference);
-	// Do we have the right names for the default preferences?
-	foundPluginLocalPreference = false;
-	foundCommonPreference = false;
-	foundPrimaryFeaturePreference = false;
-	for (int i = 0; i < defaultNames.length; i++) {
-		if (defaultNames[i].equals("FragmentLocalPreference"))
-			foundPluginLocalPreference = true;
-		else if (defaultNames[i].equals("commonStateAndFragmentLocalAndPrimaryFeaturePreference"))
-			foundCommonPreference = true;
-		else if (defaultNames[i].equals("PrimaryFeaturePreference"))
-			foundPrimaryFeaturePreference = true;
-	}
-	assertTrue("4.3 Got right default preference names",
-		foundPluginLocalPreference && foundCommonPreference && foundPrimaryFeaturePreference);
-	// Check preference values
-	assertTrue("4.3 StateLocalPreference value",
-		prefs.getString("StateLocalPreference").equals("From the plugin state area of plugin stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin"));
-	assertTrue("4.4 FragmentLocalPreference value",
-		prefs.getString("FragmentLocalPreference").equals("From the local fragment directory of plugin stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin"));
-	assertTrue("4.5 PrimaryFeaturePreference value",
-		prefs.getString("PrimaryFeaturePreference").equals("From the primary feature plugin directory via the plugin stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin"));
-	assertTrue("4.6 commonStateAndFragmentLocalAndPrimaryFeaturePreference value",
-		prefs.getString("commonStateAndFragmentLocalAndPrimaryFeaturePreference").equals("Common preference from the plugin state area of plugin stateAndFragmentLocalAndPrimaryFeaturePreferencesPlugin"));
-}
-	
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
deleted file mode 100644
index c01353a..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AllTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import junit.framework.*;
-import org.eclipse.core.tests.runtime.model.ConfigurationElementModelTest;
-
-
-public class AllTests extends TestCase {
-/**
- * AllTests constructor comment.
- * @param name java.lang.String
- */
-public AllTests() {
-	super(null);
-}
-/**
- * AllTests constructor comment.
- * @param name java.lang.String
- */
-public AllTests(String name) {
-	super(name);
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(PathTest.suite());
-	suite.addTest(PlatformTest.suite());
-	suite.addTest(PreferencesTest.suite());
-	suite.addTest(org.eclipse.core.tests.internal.runtime.AllTests.suite());
-	suite.addTest(ConfigurationElementModelTest.suite());
-	suite.addTest(org.eclipse.core.tests.internal.plugins.AllTests.suite());
-	suite.addTest(org.eclipse.core.tests.internal.registrycache.AllTests.suite());
-	return suite;
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AutomatedTests.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AutomatedTests.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AutomatedTests.java
deleted file mode 100644
index b2e8036..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/AutomatedTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import junit.framework.*;
-/**
- * Runs the sniff tests for the build. All tests listed here should
- * be automated.
- */
-public class AutomatedTests extends TestCase {
-
-public AutomatedTests() {
-	super(null);
-}
-
-public AutomatedTests(String name) {
-	super(name);
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	suite.addTest(org.eclipse.core.tests.runtime.AllTests.suite());
-	return suite;
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/BenchPath.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/BenchPath.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/BenchPath.java
deleted file mode 100644
index 0541da1..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/BenchPath.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import java.util.HashMap;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.tests.harness.CorePerformanceTest;
-
-public class BenchPath extends CorePerformanceTest {
-public BenchPath() {
-}
-public BenchPath(String testName) {
-	super(testName);
-}
-public static Test suite() { 
-	TestSuite suite= new TestSuite();
-
-	suite.addTest(new BenchPath("benchHash"));
-
- 	return suite;
-}
-/**
- * Tests performance of equals and hashCode by using paths
- * as keys in a hash map.
- */
-public void benchHash() {
-	final int REPEAT = 2000000;
-	IPath[] paths = generateVariousPaths();
-	HashMap map = new HashMap(32);
-	for (int i = 0; i < paths.length; i++) {
-		map.put(paths[i], "");
-	}
-	int numPaths = paths.length;
-	startBench();
-	for (int i = 0; i < REPEAT; i++) {
-		for (int p = 0; p < numPaths; p++) {
-			map.get(paths[p]);
-		}
-	}
-	stopBench("benchHash", REPEAT * numPaths);
-}
-/**
- * Tests the performance of path creation
- */
-public void benchPathCreation() {
-
-	final int repeat = 100000;
-	final int count = repeat * 20;
-
-	startBench();
-
-	for (int rep = repeat; --rep >= 0;) {
-		//folders (5)
-		new Path("/");
-		new Path("/Foo");
-		new Path("/Foo/bar");
-		new Path("/Foo/bar/baz");
-		new Path("/Foo/bar/baz/blap");			
-		
-		//files (15)
-		new Path("/Foo/abc.txt");
-		new Path("/Foo/bar/abc.txt");
-		new Path("/Foo/bar/baz/abc.txt");
-		new Path("/Foo/bar/baz/blap/abc.txt");			
-		new Path("/Foo/bar/abc.txt");
-		new Path("/Foo/bar/baz/abc.txt");
-		new Path("/Foo/bar/baz/blap/abc.txt");			
-		new Path("/Foo/bar/baz/abc.txt");
-		new Path("/Foo/bar/baz/blap/abc.txt");			
-		new Path("/Foo/bar/baz/abc.txt");
-		new Path("/Foo/bar/baz/blap/abc.txt");			
-		new Path("/Foo/bar/baz/abc.txt");
-		new Path("/Foo/bar/baz/blap/abc.txt");	
-		new Path("/Foo/bar/baz/blap/blam/abc.txt");	
-		new Path("/Foo/bar/baz/blap/blam/blip/boop/abc.txt");	
-
-	}
-
-	stopBench("benchPathCreation", count);
-}
-/**
- * Tests the performance of Path.toOSString
- */
-public void benchToOSString() {
-	final int repeat = 500000;
-	
-	IPath[] paths = generateVariousPaths();
-	final int count = repeat * paths.length;
-
-	startBench();
-	for (int rep = repeat; --rep >= 0;) {
-		for (int p = paths.length; --p >= 0;) {
-			paths[p].toOSString();
-		}
-	}	
-	stopBench("benchToOSString", count);
-}
-
-/**
- * Returns an array containing various paths.
- */
-private IPath[] generateVariousPaths() {
-	IPath[] paths = new IPath[20];
-	int i = 0;
-	paths[i++] = new Path("/");
-	paths[i++] = new Path("/Foo");
-	paths[i++] = new Path("/Foo/bar");
-	paths[i++] = new Path("/Foo/bar/baz");
-	paths[i++] = new Path("/Foo/bar/baz/blap");			
-		
-		//files (15)
-	paths[i++] = new Path("/Foo/abc.txt");
-	paths[i++] = new Path("/Foo/bar/abc.txt");
-	paths[i++] = new Path("/Foo/bar/baz/abc.txt");
-	paths[i++] = new Path("/Foo/bar/baz/blap/abc.txt");			
-	paths[i++] = new Path("/Foo/bar/abc.txt");
-	paths[i++] = new Path("/Foo/bar/baz/abc.txt");
-	paths[i++] = new Path("/Foo/bar/baz/blap/abc.txt");			
-	paths[i++] = new Path("/Foo/bar/baz/abc.txt");
-	paths[i++] = new Path("/Foo/bar/baz/blap/abc.txt");			
-	paths[i++] = new Path("/Foo/bar/baz/abc.txt");
-	paths[i++] = new Path("/Foo/bar/baz/blap/abc.txt");			
-	paths[i++] = new Path("/Foo/bar/baz/abc.txt");
-	paths[i++] = new Path("/Foo/bar/baz/blap/abc.txt");	
-	paths[i++] = new Path("/Foo/bar/baz/blap/blam/abc.txt");	
-	paths[i++] = new Path("/Foo/bar/baz/blap/blam/blip/boop/abc.txt");	
-	
-	return paths;
-}
-}
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/CoreExceptionTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/CoreExceptionTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/CoreExceptionTest.java
deleted file mode 100644
index fc088b5..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/CoreExceptionTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import org.eclipse.core.runtime.*;
-import junit.framework.*;
-
-/**
- * Test cases for the Path class.
- */
-public class CoreExceptionTest extends RuntimeTest {
-/**
- * Need a zero argument constructor to satisfy the test harness.
- * This constructor should not do any real work nor should it be
- * called by user code.
- */
-public CoreExceptionTest() {
-	super(null);
-}
-public CoreExceptionTest(String name) {
-	super(name);
-}
-public static Test suite() {
-	return new TestSuite(CoreExceptionTest.class);
-}
-public void testCoreException() {
-	final String MESSAGE_STRING = "An exception has occurred";
-	IStatus status = new Status(
-		IStatus.ERROR,
-		"org.eclipse.core.tests.runtime",
-		31415,
-		MESSAGE_STRING,
-		new NumberFormatException());
-		
-	CoreException e = new CoreException(status);
-	
-	assertEquals("1.0",status,e.getStatus());
-	assertEquals("1.1",MESSAGE_STRING,e.getMessage());
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/OperationCanceledExceptionTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/OperationCanceledExceptionTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/OperationCanceledExceptionTest.java
deleted file mode 100644
index ea85cde..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/OperationCanceledExceptionTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import org.eclipse.core.runtime.*;
-import junit.framework.*;
-
-/**
- * Test cases for the Path class.
- */
-public class OperationCanceledExceptionTest extends RuntimeTest {
-/**
- * Need a zero argument constructor to satisfy the test harness.
- * This constructor should not do any real work nor should it be
- * called by user code.
- */
-public OperationCanceledExceptionTest() {
-	super(null);
-}
-public OperationCanceledExceptionTest(String name) {
-	super(name);
-}
-public static Test suite() {
-	return new TestSuite(OperationCanceledExceptionTest.class);
-}
-public void testCoreException() {
-	final String MESSAGE_STRING = "An exception has occurred";
-	OperationCanceledException e = new OperationCanceledException(MESSAGE_STRING);
-	
-	assertEquals("1.0",MESSAGE_STRING,e.getMessage());
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PathTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PathTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PathTest.java
deleted file mode 100644
index a047574..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PathTest.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import org.eclipse.core.runtime.*;
-import junit.framework.*;
-import java.util.ArrayList;
-
-/**
- * Test cases for the Path class.
- */
-public class PathTest extends RuntimeTest {
-/**
- * Need a zero argument constructor to satisfy the test harness.
- * This constructor should not do any real work nor should it be
- * called by user code.
- */
-public PathTest() {
-	super(null);
-}
-public PathTest(String name) {
-	super(name);
-}
-public static Test suite() {
-
-	return new TestSuite(PathTest.class);
-
-	//TestSuite suite= new TestSuite();
-	//suite.addTest(new PathTest("testConstructors"));
-	//return suite;
-}
-public void testAddTrailingSeparator() {
-
-	IPath with = new Path("/first/second/third/");
-	IPath without = new Path("/first/second/third");
-
-	assertSame("1.0", with, with.addTrailingSeparator());
-	assertEquals("1.1", with, without.addTrailingSeparator());
-	assertTrue("1.2", without.equals(without.addTrailingSeparator()));
-
-	assertSame("2.0", Path.ROOT, Path.ROOT.addTrailingSeparator());
-	assertEquals("2.1", Path.ROOT, Path.EMPTY.addTrailingSeparator());
-
-	with = new Path("//first/second/third/");
-	without = new Path("//first/second/third");
-
-	assertSame("3.0", with, with.addTrailingSeparator());
-	assertEquals("3.1", with, without.addTrailingSeparator());
-	assertTrue("3.2", without.equals(without.addTrailingSeparator()));
-
-	assertSame("4.0", Path.ROOT, Path.ROOT.addTrailingSeparator());
-	assertEquals("4.1", Path.ROOT, Path.EMPTY.addTrailingSeparator());
-
-	with = new Path("c:/first/second/third/");
-	without = new Path("c:/first/second/third");
-
-	assertSame("5.0", with, with.addTrailingSeparator());
-	assertEquals("5.1", with, without.addTrailingSeparator());
-	assertTrue("5.2", without.equals(without.addTrailingSeparator()));
-
-	assertSame("6.0", Path.ROOT, Path.ROOT.addTrailingSeparator());
-	assertEquals("6.1", Path.ROOT, Path.EMPTY.addTrailingSeparator());
-}
-public void testAppend() {
-
-	IPath fore = new Path("/first/second/third/");
-	String aftString = "/fourth/fifth";
-	IPath aft = new Path(aftString);
-	IPath combo = new Path("/first/second/third/fourth/fifth");
-
-	assertEquals("1.0", combo, fore.append(aft));
-	assertEquals("1.1", combo, fore.removeTrailingSeparator().append(aft));
-	assertEquals("1.2", combo, Path.ROOT.append(fore).append(aft));
-	assertTrue("1.3", !fore.append(aft).hasTrailingSeparator());
-	assertTrue("1.4", !Path.ROOT.append(fore).append(aft).hasTrailingSeparator());
-	assertTrue("1.5", !fore.removeTrailingSeparator().append(aft).hasTrailingSeparator());
-
-	assertEquals("2.0", combo, fore.append(aftString));
-	assertEquals("2.1", combo, fore.removeTrailingSeparator().append(aftString));
-	assertEquals("2.2", combo, Path.ROOT.append(fore).append(aftString));
-	assertTrue("2.3", !fore.append(aftString).hasTrailingSeparator());
-	assertTrue("2.4", !Path.ROOT.append(fore).append(aftString).hasTrailingSeparator());
-	assertTrue("2.5", !fore.removeTrailingSeparator().append(aftString).hasTrailingSeparator());
-	
-	//ensure append preserves correct trailing separator
-	assertTrue("3.0", !fore.append("aft").hasTrailingSeparator());
-	assertTrue("3.1", fore.append("aft/").hasTrailingSeparator());
-	assertTrue("3.2", !fore.append("/aft").hasTrailingSeparator());
-	assertTrue("3.3", fore.append("/aft/").hasTrailingSeparator());
-	assertTrue("3.4", !fore.append("\\aft").hasTrailingSeparator());
-	assertTrue("3.5", fore.append("aft\\").hasTrailingSeparator());
-	assertTrue("3.6", !fore.append("fourth/fifth").hasTrailingSeparator());
-	assertTrue("3.7", fore.append("fourth/fifth/").hasTrailingSeparator());
-	assertTrue("3.8", !fore.append(new Path("aft")).hasTrailingSeparator());
-	assertTrue("3.9", fore.append(new Path("aft/")).hasTrailingSeparator());
-	assertTrue("3.10", !fore.append(new Path("fourth/fifth")).hasTrailingSeparator());
-	assertTrue("3.11", fore.append(new Path("fourth/fifth/")).hasTrailingSeparator());
-	
-	//make sure append converts slashes appropriately
-	aftString = "fourth\\fifth";
-	assertEquals("4.0", combo, fore.append(aftString));
-	assertEquals("4.1", combo, fore.removeTrailingSeparator().append(aftString));
-	assertEquals("4.2", combo, Path.ROOT.append(fore).append(aftString));
-
-	assertEquals("5.0", new Path("/foo"), Path.ROOT.append("../foo"));
-	assertEquals("5.1", new Path("/foo"), Path.ROOT.append("./foo"));
-	assertEquals("5.2", new Path("c:/foo/xyz"), new Path("c:/foo/bar").append("../xyz"));
-	assertEquals("5.3", new Path("c:/foo/bar/xyz"), new Path("c:/foo/bar").append("./xyz"));
-	
-	//append preserves device and leading separator of receiver
-	assertEquals("6.1", new Path("c:foo/bar"), new Path("c:").append("/foo/bar"));
-	assertEquals("6.2", new Path("c:foo/bar"), new Path("c:").append("foo/bar"));
-	assertEquals("6.3", new Path("c:/foo/bar"), new Path("c:/").append("/foo/bar"));
-	assertEquals("6.4", new Path("c:/foo/bar"), new Path("c:/").append("foo/bar"));
-	
-	assertEquals("6.5", new Path("c:foo/bar"), new Path("c:").append("z:/foo/bar"));
-	assertEquals("6.6", new Path("c:foo/bar"), new Path("c:").append("z:foo/bar"));
-	assertEquals("6.7", new Path("c:/foo/bar"), new Path("c:/").append("z:/foo/bar"));
-	assertEquals("6.8", new Path("c:/foo/bar"), new Path("c:/").append("z:foo/bar"));
-
-	assertEquals("6.9", new Path("c:foo/bar"), new Path("c:").append(new Path("/foo/bar")));
-	assertEquals("6.10", new Path("c:foo/bar"), new Path("c:").append(new Path("foo/bar")));
-	assertEquals("6.11", new Path("c:/foo/bar"), new Path("c:/").append(new Path("/foo/bar")));
-	assertEquals("6.12", new Path("c:/foo/bar"), new Path("c:/").append(new Path("foo/bar")));
-	
-	assertEquals("6.13", new Path("c:foo/bar"), new Path("c:").append(new Path("z:/foo/bar")));
-	assertEquals("6.14", new Path("c:foo/bar"), new Path("c:").append(new Path("z:foo/bar")));
-	assertEquals("6.15", new Path("c:/foo/bar"), new Path("c:/").append(new Path("z:/foo/bar")));
-	assertEquals("6.16", new Path("c:/foo/bar"), new Path("c:/").append(new Path("z:foo/bar")));
-
-
-	//append preserves isUNC of receiver
-	assertEquals("7.0", new Path("/foo/bar"), new Path("/foo").append("//bar"));
-	assertEquals("7.1", new Path("/foo/bar/test"), new Path("/foo").append("bar//test"));
-	assertEquals("7.2", new Path("//foo/bar"), new Path("//foo").append("bar"));
-}
-public void testSegmentCount() {
-
-	assertEquals("1.0", 0, Path.ROOT.segmentCount());
-	assertEquals("1.1", 0, Path.EMPTY.segmentCount());
-
-	assertEquals("2.0", 1, new Path("/first").segmentCount());
-	assertEquals("2.1", 1, new Path("/first/").segmentCount());
-	assertEquals("2.2", 3, new Path("/first/second/third/").segmentCount());
-	assertEquals("2.3", 3, new Path("/first/second/third").segmentCount());
-	assertEquals("2.4", 5, new Path("/first/second/third/fourth/fifth").segmentCount());
-
-	assertEquals("3.0", 0, new Path("//").segmentCount());
-	assertEquals("3.1", 1, new Path("//first").segmentCount());
-	assertEquals("3.2", 1, new Path("//first/").segmentCount());
-	assertEquals("3.3", 2, new Path("//first/second").segmentCount());
-	assertEquals("3.4", 2, new Path("//first/second/").segmentCount());
-}
-public void testCanonicalize() {
-	// Test collapsing multiple separators
-	// double slashes at the beginning of a path
-	// are left and assumed to be a UNC path
-	assertEquals("//", new Path("///////").toString());
-	assertEquals("/a/b/c", new Path("/a/b//c").toString());
-	assertEquals("//a/b/c", new Path("//a/b//c").toString());
-	assertEquals("a/b/c/", new Path("a/b//c//").toString());
-
-	// Test collapsing single dots
-	assertEquals("2.0", "/", new Path("/./././.").toString());
-	assertEquals("2.1", "/a/b/c", new Path("/a/./././b/c").toString());
-	assertEquals("2.2", "/a/b/c", new Path("/a/./b/c/.").toString());
-	assertEquals("2.3", "a/b/c", new Path("a/./b/./c").toString());
-
-	// Test collapsing double dots
-	assertEquals("3.0", "/a/b", new Path("/a/b/c/..").toString());
-	assertEquals("3.1", "/", new Path("/a/./b/../..").toString());
-}
-public void testClone() {
-
-	IPath anyPath = new Path("/a/b/c");
-	assertEquals("1.0", anyPath, anyPath.clone());
-	anyPath = new Path("//a/b/c");
-	assertEquals("1.1", anyPath, anyPath.clone());
-	anyPath = new Path("c:/a/b/c");
-	assertEquals("1.2", anyPath, anyPath.clone());
-
-	assertEquals("1.3", Path.ROOT, Path.ROOT.clone());
-}
-public void testConstructors() {
-
-	assertEquals("1.0", "", new Path("").toString());
-	assertEquals("1.1", "/", new Path("/").toString());
-	assertEquals("1.2", "a", new Path("a").toString());
-	assertEquals("1.3", "/a", new Path("/a").toString());
-	assertEquals("1.4", "//", new Path("//").toString());
-	assertEquals("1.5", "/a/", new Path("/a/").toString());
-	assertEquals("1.6", "/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z", new Path("/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z").toString());
-	assertEquals("1.7", "...", new Path("...").toString());
-	assertEquals("1.8", "/a/b/.../c", new Path("/a/b/.../c").toString());
-
-	IPath anyPath = new Path("/first/second/third");
-
-	assertEquals("2.0", Path.EMPTY, new Path(""));
-	assertEquals("2.1", Path.ROOT, new Path("/"));
-	assertEquals("2.2", anyPath, anyPath);
-}
-public void testFirstSegment() {
-
-	assertNull("1.0", Path.ROOT.segment(0));
-	assertNull("1.1", Path.EMPTY.segment(0));
-
-	assertEquals("2.0", "a", new Path("/a/b/c").segment(0));
-	assertEquals("2.1", "a", new Path("a").segment(0));
-	assertEquals("2.2", "a", new Path("/a").segment(0));
-	assertEquals("2.3", "a", new Path("a/b").segment(0));
-	assertEquals("2.4", "a", new Path("//a/b").segment(0));
-	assertEquals("2.5", "a", new Path("c:a/b").segment(0));
-	assertEquals("2.6", "a", new Path("c:/a/b").segment(0));
-
-}
-public void testGetFileExtension() {
-
-	IPath anyPath = new Path("index.html");
-	assertEquals("1.0", anyPath.getFileExtension(), "html");
-
-	assertNull("2.0", Path.ROOT.getFileExtension());
-	assertNull("2.1", Path.EMPTY.getFileExtension());
-	assertNull("2.2", new Path("index").getFileExtension());
-	assertNull("2.3", new Path("/a/b/c.txt/").getFileExtension());
-
-	assertEquals("3.0", "txt", new Path("/a/b/c.txt").getFileExtension());
-	assertEquals("3.1", "txt", new Path("/a/b/c.foo.txt").getFileExtension());
-	assertEquals("3.2", "txt", new Path("//a/b/c.foo.txt").getFileExtension());
-	assertEquals("3.3", "txt", new Path("c:/a/b/c.foo.txt").getFileExtension());
-	assertEquals("3.4", "txt", new Path("c:a/b/c.foo.txt").getFileExtension());
-
-}
-public void testHasTrailingSeparator() {
-
-	// positive
-	assertTrue("1.0", new Path("/first/second/third/").hasTrailingSeparator());
-	assertTrue("1.1", new Path("//first/second/third/").hasTrailingSeparator());
-	assertTrue("1.2", new Path("c:/first/second/third/").hasTrailingSeparator());
-	assertTrue("1.3", new Path("c:first/second/third/").hasTrailingSeparator());
-
-	// negative
-	assertTrue("2.0", !new Path("first/second/third").hasTrailingSeparator());
-	assertTrue("2.1", !Path.ROOT.hasTrailingSeparator());
-	assertTrue("2.2", !Path.EMPTY.hasTrailingSeparator());
-	assertTrue("2.3", !new Path("//first/second/third").hasTrailingSeparator());
-	assertTrue("2.4", !new Path("c:/first/second/third").hasTrailingSeparator());
-	assertTrue("2.5", !new Path("c:first/second/third").hasTrailingSeparator());
-	
-	//paths of length 0 never have a trailing separator
-	assertTrue("3.0", !new Path("/first/").removeLastSegments(1).hasTrailingSeparator());
-	assertTrue("3.1", !new Path("/first/").removeFirstSegments(1).hasTrailingSeparator());
-	assertTrue("3.2", !new Path("/").hasTrailingSeparator());
-	assertTrue("3.3", !new Path("/first/").append("..").hasTrailingSeparator());
-	assertTrue("3.4", !new Path("/first/").append(new Path("..")).hasTrailingSeparator());
-	assertTrue("3.5", !new Path("/first/../").hasTrailingSeparator());
-	assertTrue("3.6", !Path.ROOT.addTrailingSeparator().hasTrailingSeparator());
-	assertTrue("3.7", !Path.EMPTY.addTrailingSeparator().hasTrailingSeparator());
-	
-}
-public void testIsAbsolute() {
-	
-	// positive
-	assertTrue("1.0", new Path("/first/second/third").isAbsolute());
-	assertTrue("1.1", Path.ROOT.isAbsolute());
-	assertTrue("1.2", new Path("//first/second/third").isAbsolute());
-	assertTrue("1.3", new Path("c:/first/second/third").isAbsolute());
-	
-	// negative
-	assertTrue("2.0", !new Path("first/second/third").isAbsolute());
-	assertTrue("2.1", !Path.EMPTY.isAbsolute());
-	assertTrue("2.2", !new Path("c:first/second/third").isAbsolute());
-}
-public void testIsEmpty() {
-
-	// positive
-	assertTrue("1.0", Path.EMPTY.isEmpty());
-	
-	// negative
-	assertTrue("1.1", !new Path("first/second/third").isEmpty());
-	assertTrue("1.2", !Path.ROOT.isEmpty());
-}
-public void testIsPrefixOf() {
-
-	IPath prefix = new Path("/first/second");
-	IPath path = new Path("/first/second/third/fourth");
-
-	assertTrue("1.0", prefix.isPrefixOf(path));
-	// test the case where the arg is longer than the receiver.
-	assertTrue("1.1", !path.isPrefixOf(prefix));
-	assertTrue("1.2", !new Path("fifth/sixth").isPrefixOf(path));
-
-	assertTrue("2.0", prefix.addTrailingSeparator().isPrefixOf(path));
-
-	assertTrue("3.0", Path.ROOT.isPrefixOf(path));
-	assertTrue("3.1", Path.EMPTY.isPrefixOf(path));
-	assertTrue("3.2", !path.isPrefixOf(Path.ROOT));
-	assertTrue("3.3", !path.isPrefixOf(Path.EMPTY));
-}
-public void testIsRoot() {
-
-	// negative
-	assertTrue("1.0", !new Path("/first/second").isRoot());
-	assertTrue("1.1", !Path.EMPTY.isRoot());
-	assertTrue("1.2", !new Path("//").isRoot());
-
-	// positive
-	assertTrue("2.0", Path.ROOT.isRoot());
-	assertTrue("2.1", new Path("/").isRoot());
-}
-public void testIsUNC() {
-	
-	// negative
-	assertTrue("1.0", !Path.ROOT.isUNC());
-	assertTrue("1.1", !Path.EMPTY.isUNC());
-	
-	assertTrue("2.0", !new Path("a").isUNC());
-	assertTrue("2.1", !new Path("a/b").isUNC());
-	assertTrue("2.2", !new Path("/a").isUNC());
-	assertTrue("2.3", !new Path("/a/b").isUNC());
-	
-	assertTrue("3.0", !new Path("c:/a/b").isUNC());
-	assertTrue("3.1", !new Path("c:a/b").isUNC());
-	assertTrue("3.2", !new Path("/F/../").isUNC());
-
-	assertTrue("4.0", !new Path("c://a/").isUNC());
-	assertTrue("4.1", !new Path("c:\\/a/b").isUNC());
-	assertTrue("4.2", !new Path("c:\\\\").isUNC());
-		
-	// positive
-	assertTrue("5.0", new Path("//").isUNC());
-	assertTrue("5.1", new Path("//a").isUNC());
-	assertTrue("5.2", new Path("//a/b").isUNC());
-	assertTrue("5.3", new Path("\\\\ThisMachine\\HOME\\foo.jar").isUNC());
-	
-	assertTrue("6.0", new Path("c://a/").setDevice(null).isUNC());
-	assertTrue("6.1", new Path("c:\\/a/b").setDevice(null).isUNC());
-	assertTrue("6.2", new Path("c:\\\\").setDevice(null).isUNC());
-
-}
-public void testLastSegment() {
-
-	assertEquals("1.0", "second", new Path("/first/second").lastSegment());
-
-	assertEquals("2.0", "first", new Path("first").lastSegment());
-	assertEquals("2.1", "first", new Path("/first/").lastSegment());
-	assertEquals("2.2", "second", new Path("first/second").lastSegment());
-	assertEquals("2.3", "second", new Path("first/second/").lastSegment());
-
-	assertNull("3.0", Path.EMPTY.lastSegment());
-	assertNull("3.1", Path.ROOT.lastSegment());
-	assertNull("3.2", new Path("//").lastSegment());
-
-	assertEquals("4.0", "second", new Path("//first/second/").lastSegment());
-	assertEquals("4.1", "second", new Path("//first/second").lastSegment());
-	assertEquals("4.2", "second", new Path("c:/first/second/").lastSegment());
-	assertEquals("4.3", "second", new Path("c:first/second/").lastSegment());
-	
-	assertEquals("5.0", "first", new Path("//first").lastSegment());
-	assertEquals("5.1", "first", new Path("//first/").lastSegment());
-}
-public void testMakeAbsolute() {
-	IPath anyPath = new Path("first/second/third").makeAbsolute();
-	assertTrue("1.0", anyPath.isAbsolute());
-	assertEquals("1.1", new Path("/first/second/third"), anyPath);
-
-	anyPath = new Path("").makeAbsolute();
-	assertTrue("2.0", anyPath.isAbsolute());
-	assertEquals("2.1", Path.ROOT, anyPath);
-}
-public void testMakeRelative() {
-	IPath anyPath = new Path("/first/second/third").makeRelative();
-	assertTrue("1.0", !anyPath.isAbsolute());
-	assertEquals("1.1", new Path("first/second/third"), anyPath);
-
-	anyPath = Path.ROOT.makeRelative();
-	assertTrue("2.0", !anyPath.isAbsolute());
-	assertEquals("2.1", new Path(""), anyPath);
-}
-public void testMakeUNC() {
-
-	ArrayList inputs = new ArrayList();
-	ArrayList expected = new ArrayList();
-	ArrayList expectedNon = new ArrayList();
-	
-	inputs.add(Path.ROOT);
-	expected.add("//");
-	expectedNon.add("/");
-
-	inputs.add(Path.EMPTY);
-	expected.add("//");
-	expectedNon.add("");
-	
-	inputs.add(new Path("a"));
-	expected.add("//a");
-	expectedNon.add("a");
-	
-	inputs.add(new Path("a/b"));
-	expected.add("//a/b");
-	expectedNon.add("a/b");
-
-	inputs.add(new Path("/a/b/"));
-	expected.add("//a/b/");
-	expectedNon.add("/a/b/");
-	
-	inputs.add(new Path("//"));
-	expected.add("//");
-	expectedNon.add("/");
-	
-	inputs.add(new Path("//a"));
-	expected.add("//a");
-	expectedNon.add("/a");
-	
-	inputs.add(new Path("//a/b"));
-	expected.add("//a/b");
-	expectedNon.add("/a/b");
-	
-	inputs.add(new Path("//a/b/"));
-	expected.add("//a/b/");
-	expectedNon.add("/a/b/");
-	
-	inputs.add(new Path("c:", "/"));
-	expected.add("//");
-	expectedNon.add("c:/");
-	
-	inputs.add(new Path("c:", ""));
-	expected.add("//");
-	expectedNon.add("c:");
-	
-	inputs.add(new Path("c:", "a"));
-	expected.add("//a");
-	expectedNon.add("c:a");
-	
-	inputs.add(new Path("c:", "a/b"));
-	expected.add("//a/b");
-	expectedNon.add("c:a/b");
-	
-	inputs.add(new Path("c:", "/a"));
-	expected.add("//a");
-	expectedNon.add("c:/a");
-	
-	inputs.add(new Path("c:", "/a/b"));
-	expected.add("//a/b");
-	expectedNon.add("c:/a/b");
-
-	assertEquals("0.0", inputs.size(), expected.size());
-	assertEquals("0.1", inputs.size(), expectedNon.size());
-
-	for (int i = 0; i < inputs.size(); i++) {
-		IPath path = (IPath) inputs.get(i);
-		IPath result = path.makeUNC(true);
-		assertTrue("1.0." + path + " (" + result + ")", result.isUNC());
-		assertEquals("1.1." + path, (String) expected.get(i), result.toString());
-		result = path.makeUNC(false);
-		assertTrue("1.3." + path, !result.isUNC());
-		assertEquals("1.4." + path, (String) expectedNon.get(i), result.toString());
-	}
-}
-/**
- * This test is for bizarre cases that previously caused errors.
- */
-public void testRegression() {
-	try {
-		new Path("C:\\/eclipse");
-	} catch (Exception e) {
-		fail("1.0", e);
-	}
-	try {
-		IPath path = new Path("d:\\\\ive");
-		assertTrue("2.0", !path.isUNC());
-		assertEquals("2.1", 1, path.segmentCount());
-		assertEquals("2.2", "ive", path.segment(0));
-	} catch (Exception e) {
-		fail("2.99", e);
-	}
-
-}
-public void testRemoveFirstSegments() {
-	assertEquals("1.0", new Path("second"), new Path("/first/second").removeFirstSegments(1));
-	assertEquals("1.1", new Path("second/third/"), new Path("/first/second/third/").removeFirstSegments(1));
-	assertEquals("1.2", Path.EMPTY, new Path("first").removeFirstSegments(1));
-	assertEquals("1.3", Path.EMPTY, new Path("/first/").removeFirstSegments(1));
-	assertEquals("1.4", new Path("second"), new Path("first/second").removeFirstSegments(1));
-	assertEquals("1.5", Path.EMPTY, new Path("").removeFirstSegments(1));
-	assertEquals("1.6", Path.EMPTY, Path.ROOT.removeFirstSegments(1));
-	assertEquals("1.7", Path.EMPTY, new Path("/first/second/").removeFirstSegments(2));
-	assertEquals("1.8", Path.EMPTY, new Path("/first/second/").removeFirstSegments(3));
-	assertEquals("1.9", new Path("third/fourth"), new Path("/first/second/third/fourth").removeFirstSegments(2));
-
-	assertEquals("2.0", new Path("c:second"), new Path("c:/first/second").removeFirstSegments(1));
-	assertEquals("2.1", new Path("c:second/third/"), new Path("c:/first/second/third/").removeFirstSegments(1));
-	assertEquals("2.2", new Path("c:"), new Path("c:first").removeFirstSegments(1));
-	assertEquals("2.3", new Path("c:"), new Path("c:/first/").removeFirstSegments(1));
-	assertEquals("2.4", new Path("c:second"), new Path("c:first/second").removeFirstSegments(1));
-	assertEquals("2.5", new Path("c:"), new Path("c:").removeFirstSegments(1));
-	assertEquals("2.6", new Path("c:"), new Path("c:/").removeFirstSegments(1));
-	assertEquals("2.7", new Path("c:"), new Path("c:/first/second/").removeFirstSegments(2));
-	assertEquals("2.8", new Path("c:"), new Path("c:/first/second/").removeFirstSegments(3));
-	assertEquals("2.9", new Path("c:third/fourth"), new Path("c:/first/second/third/fourth").removeFirstSegments(2));
-
-	assertEquals("3.0", new Path("second"), new Path("//first/second").removeFirstSegments(1));
-	assertEquals("3.1", new Path("second/third/"), new Path("//first/second/third/").removeFirstSegments(1));
-	assertEquals("3.2", Path.EMPTY, new Path("//first/").removeFirstSegments(1));
-	assertEquals("3.3", Path.EMPTY, new Path("//").removeFirstSegments(1));
-	assertEquals("3.4", Path.EMPTY, new Path("//first/second/").removeFirstSegments(2));
-	assertEquals("3.5", Path.EMPTY, new Path("//first/second/").removeFirstSegments(3));
-	assertEquals("3.6", new Path("third/fourth"), new Path("//first/second/third/fourth").removeFirstSegments(2));
-}
-public void testRemoveLastSegments() {
-
-	assertEquals("1.0", new Path("/first"), new Path("/first/second").removeLastSegments(1));
-	assertEquals("1.1", new Path("//first"), new Path("//first/second").removeLastSegments(1));
-	assertEquals("1.2", new Path("c:/first"), new Path("c:/first/second").removeLastSegments(1));
-	assertEquals("1.3", new Path("c:first"), new Path("c:first/second").removeLastSegments(1));
-
-	assertEquals("2.0", new Path("/first/second/"), new Path("/first/second/third/").removeLastSegments(1));
-	assertEquals("2.1", new Path("//first/second/"), new Path("//first/second/third/").removeLastSegments(1));
-	assertEquals("2.2", new Path("c:/first/second/"), new Path("c:/first/second/third/").removeLastSegments(1));
-	assertEquals("2.3", new Path("c:first/second/"), new Path("c:first/second/third/").removeLastSegments(1));
-
-	assertEquals("3.0", Path.EMPTY, new Path("first").removeLastSegments(1));
-	assertEquals("3.1", Path.ROOT, new Path("/first/").removeLastSegments(1));
-	assertEquals("3.2", new Path("first"), new Path("first/second").removeLastSegments(1));
-
-	assertEquals("4.0", Path.EMPTY, new Path("").removeLastSegments(1));
-	assertEquals("4.1", Path.ROOT, Path.ROOT.removeLastSegments(1));
-	assertEquals("4.2", new Path("//"), new Path("//").removeLastSegments(1));
-}
-public void testRemoveTrailingSeparator() {
-
-	IPath with = new Path("/first/second/third/");
-	IPath without = new Path("/first/second/third");
-
-	assertSame("1.0", without, without.removeTrailingSeparator());
-	assertEquals("1.1", without, with.removeTrailingSeparator());
-	// trailing separators have no bearing on path equality so check via
-	// other means....
-	assertTrue("1.2", !with.removeTrailingSeparator().hasTrailingSeparator());
-	assertTrue("1.3", !without.hasTrailingSeparator());
-	assertEquals("1.4", without.toString(), with.removeTrailingSeparator().toString());
-
-	assertSame("2.0", Path.ROOT, Path.ROOT.removeTrailingSeparator());
-	assertEquals("2.1", Path.EMPTY, new Path("").removeTrailingSeparator());
-	
-	assertEquals("3.0", new Path("//"), new Path("//").removeTrailingSeparator());
-	assertEquals("3.1", new Path("//a"), new Path("//a").removeTrailingSeparator());
-	assertEquals("3.2", new Path("//a"), new Path("//a/").removeTrailingSeparator());
-	assertEquals("3.3", new Path("//a/b"), new Path("//a/b").removeTrailingSeparator());
-	assertEquals("3.4", new Path("//a/b"), new Path("//a/b/").removeTrailingSeparator());
-	
-	assertEquals("4.0", new Path("c:"), new Path("c:").removeTrailingSeparator());
-	assertEquals("4.1", new Path("c:/"), new Path("c:/").removeTrailingSeparator());
-	assertEquals("4.2", new Path("c:/a"), new Path("c:/a/").removeTrailingSeparator());
-	assertEquals("4.3", new Path("c:/a/b"), new Path("c:/a/b").removeTrailingSeparator());
-	assertEquals("4.4", new Path("c:/a/b"), new Path("c:/a/b/").removeTrailingSeparator());
-	
-	assertEquals("5.0", new Path("c:a"), new Path("c:a/").removeTrailingSeparator());
-	assertEquals("5.1", new Path("c:a/b"), new Path("c:a/b").removeTrailingSeparator());
-	assertEquals("5.2", new Path("c:a/b"), new Path("c:a/b/").removeTrailingSeparator());
-}
-public void testSegments() {
-
-	IPath anyPath = null;
-	String[] segs = null;
-
-	// Case One: typical case
-	anyPath = new Path("/first/second/third/fourth");
-	segs = anyPath.segments();
-
-	assertEquals("1.0", 4, segs.length);
-	assertEquals("1.1", "first", segs[0]);
-	assertEquals("1.2", "second", segs[1]);
-	assertEquals("1.3", "third", segs[2]);
-	assertEquals("1.4", "fourth", segs[3]);
-
-	// Case Two: trailing separator
-	anyPath = new Path("/first/second/");
-	segs = anyPath.segments();
-
-	assertEquals("2.0", 2, segs.length);
-	assertEquals("2.1", "first", segs[0]);
-	assertEquals("2.2", "second", segs[1]);
-
-	// Case Three: no leading or trailing separators
-	anyPath = new Path("first/second");
-	segs = anyPath.segments();
-
-	assertEquals("3.0", 2, segs.length);
-	assertEquals("3.1", "first", segs[0]);
-	assertEquals("3.2", "second", segs[1]);
-
-	// Case Four: single segment
-	anyPath = new Path("first");
-	segs = anyPath.segments();
-
-	assertEquals("4.0", 1, segs.length);
-	assertEquals("4.1", "first", segs[0]);
-
-	// Case Five(a): no segments
-	anyPath = Path.EMPTY;
-	segs = anyPath.segments();
-
-	assertEquals("5.0", 0, segs.length);
-
-	// Case Five(b): no segments
-	anyPath = Path.ROOT;
-	segs = anyPath.segments();
-
-	assertEquals("6.0", 0, segs.length);
-	
-	// Case Six: UNC path
-	anyPath = new Path("//server/volume/a/b/c");
-	segs = anyPath.segments();
-	assertEquals("7.0", 5, segs.length);
-	assertEquals("7.1", "server", segs[0]);
-	assertEquals("7.2", "volume", segs[1]);
-	assertEquals("7.3", "a", segs[2]);
-	assertEquals("7.4", "b", segs[3]);
-	assertEquals("7.5", "c", segs[4]);
-}
-public void testToString() {
-
-	IPath anyPath = new Path("/first/second/third");
-	assertEquals("1.0", "/first/second/third", anyPath.toString());
-
-	assertEquals("1.1", "/", Path.ROOT.toString());
-	assertEquals("1.2", "", Path.EMPTY.toString());
-}
-public void testUptoSegment() {
-
-	//Case 1, absolute path with no trailing separator
-	IPath anyPath = new Path("/first/second/third");
-
-	assertEquals("1.0", Path.EMPTY, anyPath.uptoSegment(0));
-	assertEquals("1.1", new Path("/first"), anyPath.uptoSegment(1));
-	assertEquals("1.2", new Path("/first/second"), anyPath.uptoSegment(2));
-	assertEquals("1.3", new Path("/first/second/third"), anyPath.uptoSegment(3));
-	assertEquals("1.4", new Path("/first/second/third"), anyPath.uptoSegment(4));
-
-	//Case 2, absolute path with trailing separator
-	anyPath = new Path("/first/second/third/");
-
-	assertEquals("2.0", Path.EMPTY, anyPath.uptoSegment(0));
-	assertEquals("2.1", new Path("/first/"), anyPath.uptoSegment(1));
-	assertEquals("2.2", new Path("/first/second/"), anyPath.uptoSegment(2));
-	assertEquals("2.3", new Path("/first/second/third/"), anyPath.uptoSegment(3));
-	assertEquals("2.4", new Path("/first/second/third/"), anyPath.uptoSegment(4));
-}
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java
deleted file mode 100644
index bb34248..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PlatformTest.java
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PluginVersionIdentifierTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PluginVersionIdentifierTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PluginVersionIdentifierTest.java
deleted file mode 100644
index b57a9d3..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PluginVersionIdentifierTest.java
+++ /dev/null
Binary files differ

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java
deleted file mode 100644
index 293bf40..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/PreferencesTest.java
+++ /dev/null
@@ -1,755 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- *     IBM Corporation - initial test suite
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.internal.runtime.InternalPlatform;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Preferences;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * Test suite for API class org.eclipse.core.runtime.Preferences
- */
-public class PreferencesTest extends RuntimeTest {
-
-	public PreferencesTest(String name) {
-		super(name);
-	}
-
-	public static Test suite() {
-		// all test methods are named "test..."
-		TestSuite suite= new TestSuite(PreferencesTest.class);
-		return suite;
-	}
-
-	/*
-	 * @see TestCase#setUp()
-	 */
-	protected void setUp() {
-	}
-
-	/*
-	 * @see TestCase#tearDown()
-	 */
-	protected void tearDown() {
-	}
-
-	public void testConstants() {
-		// make sure that the preference store constants are defined properly
-		assertTrue(Preferences.BOOLEAN_DEFAULT_DEFAULT == false);
-		assertTrue(Preferences.INT_DEFAULT_DEFAULT == 0);
-		assertTrue(Preferences.LONG_DEFAULT_DEFAULT == 0L);
-		assertTrue(Preferences.FLOAT_DEFAULT_DEFAULT == 0.0f);
-		assertTrue(Preferences.DOUBLE_DEFAULT_DEFAULT == 0.0);
-		assertTrue(Preferences.STRING_DEFAULT_DEFAULT.equals(""));
-	}
-
-	public void testBasics() {
-		
-		Preferences ps = new Preferences();
-		final String k1 = "key1";
-		final String k2 = "key2";
-		final String v1 = "1";
-		final String v2 = "2";
-		final String v3 = "3";
-
-		// check that a random property in a newly created store
-		// appearchs to have default-default values of whatever type asked for
-		assertTrue("1.0", ps.isDefault(k1) == true);
-		assertTrue("1.1", ps.getBoolean(k1) == Preferences.BOOLEAN_DEFAULT_DEFAULT);
-		assertTrue("1.2", ps.getInt(k1) == Preferences.INT_DEFAULT_DEFAULT);
-		assertTrue("1.3", ps.getLong(k1) == Preferences.LONG_DEFAULT_DEFAULT);
-		assertTrue("1.4", ps.getFloat(k1) == Preferences.FLOAT_DEFAULT_DEFAULT);
-		assertTrue("1.5", ps.getDouble(k1) == Preferences.DOUBLE_DEFAULT_DEFAULT);
-		assertTrue("1.6", ps.getString(k1).equals(Preferences.STRING_DEFAULT_DEFAULT));
-
-		assertTrue("1.7", ps.getDefaultBoolean(k1) == Preferences.BOOLEAN_DEFAULT_DEFAULT);
-		assertTrue("1.8", ps.getDefaultInt(k1) == Preferences.INT_DEFAULT_DEFAULT);
-		assertTrue("1.9", ps.getDefaultLong(k1) == Preferences.LONG_DEFAULT_DEFAULT);
-		assertTrue("1.10", ps.getDefaultFloat(k1) == Preferences.FLOAT_DEFAULT_DEFAULT);
-		assertTrue("1.11", ps.getDefaultDouble(k1) == Preferences.DOUBLE_DEFAULT_DEFAULT);
-		assertTrue("1.12", ps.getDefaultString(k1).equals(Preferences.STRING_DEFAULT_DEFAULT));
-		
-		
-		// test set/getString
-		// give it a value
-		ps.setValue(k1, v1);
-		assertTrue("2.0", ps.isDefault(k1) == false);
-		assertTrue("2.1", ps.getString(k1).equals(v1));
-		assertTrue("2.2", ps.getDefaultString(k1).equals(Preferences.STRING_DEFAULT_DEFAULT));
-		// change the value
-		ps.setValue(k1, v2);
-		assertTrue("2.3", ps.isDefault(k1) == false);
-		assertTrue("2.4", ps.getString(k1).equals(v2));
-		assertTrue("2.5", ps.getDefaultString(k1).equals(Preferences.STRING_DEFAULT_DEFAULT));
-		// change to same value as default
-		ps.setValue(k1, ps.getDefaultString(k1));
-		assertTrue("2.6", ps.isDefault(k1) == true);
-		assertTrue("2.7", ps.getString(k1).equals(ps.getDefaultString(k1)));
-		assertTrue("2.8", ps.getDefaultString(k1).equals(Preferences.STRING_DEFAULT_DEFAULT));
-		// reset to default
-		ps.setValue(k1, v2);
-		ps.setToDefault(k1);
-		assertTrue("2.9", ps.isDefault(k1) == true);
-		assertTrue("2.10", ps.getString(k1).equals(Preferences.STRING_DEFAULT_DEFAULT));
-		assertTrue("2.11", ps.getDefaultString(k1).equals(Preferences.STRING_DEFAULT_DEFAULT));
-		// change default
-		ps.setDefault(k1, v1);
-		assertTrue("2.12", ps.isDefault(k1) == true);
-		assertTrue("2.13", ps.getString(k1).equals(v1));
-		assertTrue("2.14", ps.getDefaultString(k1).equals(v1));
-		// set the value
-		ps.setValue(k1, v2);
-		assertTrue("2.15", ps.isDefault(k1) == false);
-		assertTrue("2.16", ps.getString(k1).equals(v2));
-		assertTrue("2.17", ps.getDefaultString(k1).equals(v1));
-		// change to same value as default
-		ps.setValue(k1, ps.getDefaultString(k1));
-		assertTrue("2.18", ps.isDefault(k1) == true);
-		assertTrue("2.19", ps.getString(k1).equals(ps.getDefaultString(k1)));
-		assertTrue("2.20", ps.getDefaultString(k1).equals(v1));
-		// reset to default
-		ps.setValue(k1, v2);
-		ps.setToDefault(k1);
-		assertTrue("2.21", ps.isDefault(k1) == true);
-		assertTrue("2.22", ps.getString(k1).equals(v1));
-		assertTrue("2.23", ps.getDefaultString(k1).equals(v1));
-		// change default
-		ps.setDefault(k1, v3);
-		assertTrue("2.24", ps.isDefault(k1) == true);
-		assertTrue("2.25", ps.getString(k1).equals(v3));
-		assertTrue("2.26", ps.getDefaultString(k1).equals(v3));
-								
-	}
-	
-	public void testBoolean() {
-		
-		Preferences ps = new Preferences();
-		final String k1 = "key1";
-
-		assertEquals("1.0", false, Preferences.BOOLEAN_DEFAULT_DEFAULT);
-		assertEquals("1.1", Preferences.BOOLEAN_DEFAULT_DEFAULT, ps.getBoolean(k1));
-
-		ps.setValue(k1, true);
-		assertEquals("1.2", true, ps.getBoolean(k1));
-		ps.setValue(k1, false);
-		assertEquals("1.3", false, ps.getBoolean(k1));
-		
-		ps.setDefault(k1, true);
-		assertEquals("1.4", true, ps.getDefaultBoolean(k1));
-		ps.setDefault(k1, false);
-		assertEquals("1.5", false, ps.getDefaultBoolean(k1));
-		
-	}
-
-	public void testInteger() {
-
-		Preferences ps = new Preferences();
-		final String k1 = "key1";
-		final int[] values = { 0, 1002, -201788, Integer.MAX_VALUE, Integer.MIN_VALUE};
-
-		assertEquals("1.0", 0, Preferences.INT_DEFAULT_DEFAULT);
-		assertEquals("1.1", Preferences.INT_DEFAULT_DEFAULT, ps.getInt(k1));
-
-		for (int i = 0; i < values.length; i++) {
-			int v1 = values[i];
-			int v2 = v1 + 1;
-			ps.setValue(k1, v1);
-			assertEquals("1.2", v1, ps.getInt(k1));
-			ps.setDefault(k1, v2);
-			assertEquals("1.3", v2, ps.getDefaultInt(k1));
-		}
-	}
-	
-	public void testLong() {
-
-		Preferences ps = new Preferences();
-		final String k1 = "key1";
-		final long[] values = { 0L, 1002L, -201788L, Long.MAX_VALUE, Long.MIN_VALUE};
-
-		assertEquals("1.0", 0L, Preferences.LONG_DEFAULT_DEFAULT);
-		assertEquals("1.1", Preferences.LONG_DEFAULT_DEFAULT, ps.getLong(k1));
-
-		for (int i = 0; i < values.length; i++) {
-			long v1 = values[i];
-			long v2 = v1 + 1;
-			ps.setValue(k1, v1);
-			assertEquals("1.2", v1, ps.getLong(k1));
-			ps.setDefault(k1, v2);
-			assertEquals("1.3", v2, ps.getDefaultLong(k1));
-		}
-	}
-	
-	public void testFloat() {
-
-		Preferences ps = new Preferences();
-		final String k1 = "key1";
-		final float[] values = { 0.0f, 1002.5f, -201788.55f, Float.MAX_VALUE, Float.MIN_VALUE};
-		final float tol = 1.0e-20f;
-		
-		assertEquals("1.0", 0.0f, Preferences.FLOAT_DEFAULT_DEFAULT, tol);
-		assertEquals("1.1", Preferences.FLOAT_DEFAULT_DEFAULT, ps.getFloat(k1), tol);
-
-		for (int i = 0; i < values.length; i++) {
-			float v1 = values[i];
-			float v2 = v1 + 1.0f;
-			ps.setValue(k1, v1);
-			assertEquals("1.2", v1, ps.getFloat(k1), tol);
-			ps.setDefault(k1, v2);
-			assertEquals("1.3", v2, ps.getDefaultFloat(k1), tol);
-		}
-		
-		try {
-			ps.setValue(k1, Float.NaN);
-			assertTrue("1.4", false);
-		} catch (IllegalArgumentException e) {
-			// NaNs should be rejected
-		}
-			
-	}
-	
-	public void testDouble() {
-
-		Preferences ps = new Preferences();
-		final String k1 = "key1";
-		final double[] values = { 0.0, 1002.5, -201788.55, Double.MAX_VALUE, Double.MIN_VALUE};
-		final double tol = 1.0e-20;
-
-		assertEquals("1.0", 0.0, Preferences.DOUBLE_DEFAULT_DEFAULT, tol);
-		assertEquals("1.1", Preferences.DOUBLE_DEFAULT_DEFAULT, ps.getDouble(k1), tol);
-
-		for (int i = 0; i < values.length; i++) {
-			double v1 = values[i];
-			double v2 = v1 + 1.0;
-			ps.setValue(k1, v1);
-			assertEquals("1.2", v1, ps.getDouble(k1), tol);
-			ps.setDefault(k1, v2);
-			assertEquals("1.3", v2, ps.getDefaultDouble(k1), tol);
-		}
-
-		try {
-			ps.setValue(k1, Float.NaN);
-			assertTrue("1.4", false);
-		} catch (IllegalArgumentException e) {
-			// NaNs should be rejected
-		}
-			
-	}
-	
-	public void testString() {
-
-		Preferences ps = new Preferences();
-		final String k1 = "key1";
-		final String[] values = {"", "hello", " x ", "\n"};
-
-		assertEquals("1.0", "", Preferences.STRING_DEFAULT_DEFAULT);
-		assertEquals("1.1", ps.getString(k1), Preferences.STRING_DEFAULT_DEFAULT);
-
-		for (int i = 0; i < values.length; i++) {
-			String v1 = values[i];
-			String v2 = v1 + "x";
-			ps.setValue(k1, v1);
-			assertEquals("1.2", v1, ps.getString(k1));
-			ps.setDefault(k1, v2);
-			assertEquals("1.3", v2, ps.getDefaultString(k1));
-		}
-	}
-	
-	public void testPropertyNames() {
-
-		Preferences ps = new Preferences();
-		
-		// there are no properties initially
-		assertEquals("1.0", 0, ps.propertyNames().length);
-		
-		String[] keys = {"a", "b", "c", "d"};
-		
-		// setting defaults does not add name to set
-		for (int i = 0; i < keys.length; i++) {
-			ps.setDefault(keys[i], "default");
-		}
-		assertEquals("1.1", 0, ps.propertyNames().length);
-
-		// setting real values does add name to set
-		for (int i = 0; i < keys.length; i++) {
-			ps.setValue(keys[i], "actual");
-		}
-		assertEquals("1.2", keys.length, ps.propertyNames().length);
-		
-		Set s1 = new HashSet(Arrays.asList(keys));
-		Set s2 = new HashSet(Arrays.asList(ps.propertyNames()));
-		assertEquals("1.3", s1, s2);
-		
-		// setting to default does remove name from set
-		for (int i = 0; i < keys.length; i++) {
-			ps.setToDefault(keys[i]);
-			Set s = new HashSet(Arrays.asList(ps.propertyNames()));
-			assertTrue("1.4", !s.contains(keys[i]));
-		}
-		assertEquals("1.5", 0, ps.propertyNames().length);
-	}
-	
-	public void testContains() {
-
-		Preferences ps = new Preferences();
-		String k1 = "missing";
-		String k2 = "a";
-		String k3 = "b";
-		String k4 = "c";
-		
-		// there are no properties initially
-		assertEquals("1.0", false, ps.contains("a"));
-		
-		// setting defaults adds name
-		ps.setDefault("a", "default");
-		assertEquals("1.1", true, ps.contains("a"));
-
-		// setting value adds name
-		assertEquals("1.2", false, ps.contains("b"));
-		ps.setValue("b", "any");
-		assertEquals("1.3", true, ps.contains("b"));
-		
-		// setting value does not remove entry already there
-		ps.setValue("a", "any");
-		assertEquals("1.4", true, ps.contains("a"));
-		assertEquals("1.5", true, ps.contains("b"));
-		
-		// setting to default removes name from set unless there is a default too
-		ps.setToDefault("b");
-		assertEquals("1.6", false, ps.contains("b"));
-		ps.setToDefault("a");
-		assertEquals("1.7", true, ps.contains("a"));
-	}
-	
-	public void testDefaultPropertyNames() {
-
-		Preferences ps = new Preferences();
-		
-		// there are no default properties initially
-		assertEquals("1.0", 0, ps.defaultPropertyNames().length);
-		
-		String[] keys = {"a", "b", "c", "d"};
-		
-		// setting actual values does not add name to set
-		for (int i = 0; i < keys.length; i++) {
-			ps.setValue(keys[i], "actual");
-		}
-		assertEquals("1.1", 0, ps.defaultPropertyNames().length);
-
-		// setting defaults does add name to set
-		for (int i = 0; i < keys.length; i++) {
-			ps.setDefault(keys[i], "default");
-		}
-		assertEquals("1.2", keys.length, ps.defaultPropertyNames().length);
-		
-		Set s1 = new HashSet(Arrays.asList(keys));
-		Set s2 = new HashSet(Arrays.asList(ps.defaultPropertyNames()));
-		assertEquals("1.3", s1, s2);
-		
-		// setting to default does not remove name from set
-		for (int i = 0; i < keys.length; i++) {
-			ps.setToDefault(keys[i]);
-			Set s = new HashSet(Arrays.asList(ps.defaultPropertyNames()));
-			assertTrue("1.4", s.contains(keys[i]));
-		}
-		assertEquals("1.5", keys.length, ps.defaultPropertyNames().length);
-		
-		// setting to default-default does not remove name from set either
-		for (int i = 0; i < keys.length; i++) {
-			ps.setDefault(keys[i], Preferences.STRING_DEFAULT_DEFAULT);
-			Set s = new HashSet(Arrays.asList(ps.defaultPropertyNames()));
-			assertTrue("1.6.1", s.contains(keys[i]));
-			
-			ps.setDefault(keys[i], Preferences.BOOLEAN_DEFAULT_DEFAULT);
-			s = new HashSet(Arrays.asList(ps.defaultPropertyNames()));
-			assertTrue("1.6.2", s.contains(keys[i]));
-
-			ps.setDefault(keys[i], Preferences.INT_DEFAULT_DEFAULT);
-			s = new HashSet(Arrays.asList(ps.defaultPropertyNames()));
-			assertTrue("1.6.3", s.contains(keys[i]));
-
-			ps.setDefault(keys[i], Preferences.LONG_DEFAULT_DEFAULT);
-			s = new HashSet(Arrays.asList(ps.defaultPropertyNames()));
-			assertTrue("1.6.4", s.contains(keys[i]));
-
-			ps.setDefault(keys[i], Preferences.FLOAT_DEFAULT_DEFAULT);
-			s = new HashSet(Arrays.asList(ps.defaultPropertyNames()));
-			assertTrue("1.6.5", s.contains(keys[i]));
-
-			ps.setDefault(keys[i], Preferences.DOUBLE_DEFAULT_DEFAULT);
-			s = new HashSet(Arrays.asList(ps.defaultPropertyNames()));
-			assertTrue("1.6.6", s.contains(keys[i]));
-		}
-		assertEquals("1.7", keys.length, ps.defaultPropertyNames().length);
-	}
-	
-	public void testListeners() {
-
-		final Preferences ps = new Preferences();
-		
-		class Tracer implements Preferences.IPropertyChangeListener {
-			public StringBuffer log = new StringBuffer();
-			
-			private String typeCode(Object value) {
-				if (value == null) {
-					return "";
-				}
-				if (value instanceof Boolean) {
-					return "B";
-				}
-				if (value instanceof Integer) {
-					return "I";
-				}
-				if (value instanceof Long) {
-					return "L";
-				}
-				if (value instanceof Float) {
-					return "F";
-				}
-				if (value instanceof Double) {
-					return "D";
-				}
-				if (value instanceof String) {
-					return "S";
-				}
-				assertTrue("0.0", false);
-				return null;
-			}
-
-			public void propertyChange(Preferences.PropertyChangeEvent event) {
-				log.append("[");
-				log.append(event.getProperty());
-				log.append(":");
-				log.append(typeCode(event.getOldValue()));
-				log.append(event.getOldValue() == null ? "null" : event.getOldValue());
-				log.append("->");
-				log.append(typeCode(event.getNewValue()));
-				log.append(event.getNewValue() == null ? "null" : event.getNewValue());
-				log.append("]");
-			}
-		}
-		
-		final Tracer tracer1 = new Tracer();
-		final Tracer tracer2 = new Tracer();
-		
-		// register one listener
-		ps.addPropertyChangeListener(tracer1);
-		assertEquals("1.0", "", tracer1.log.toString());
-		
-		// make sure it is notified in a type appropriate manner
-		ps.setValue("a", "1");
-		assertEquals("1.0.1", "[a:S->S1]", tracer1.log.toString());
-
-		ps.setToDefault("a");
-		tracer1.log.setLength(0);
-		ps.setValue("a", true);
-		assertEquals("1.0.2", "[a:Bfalse->Btrue]", tracer1.log.toString());
-
-		ps.setToDefault("a");
-		tracer1.log.setLength(0);
-		ps.setValue("a", 100);
-		assertEquals("1.0.3", "[a:I0->I100]", tracer1.log.toString());
-
-		ps.setToDefault("a");
-		tracer1.log.setLength(0);
-		ps.setValue("a", 100L);
-		assertEquals("1.0.4", "[a:L0->L100]", tracer1.log.toString());
-
-		ps.setToDefault("a");
-		tracer1.log.setLength(0);
-		ps.setValue("a", 2.0f);
-		assertEquals("1.0.5", "[a:F0.0->F2.0]", tracer1.log.toString());
-
-		ps.setToDefault("a");
-		tracer1.log.setLength(0);
-		ps.setValue("a", 2.0);
-		assertEquals("1.0.6", "[a:D0.0->D2.0]", tracer1.log.toString());
-
-		// make sure it is notified of a series of events
-		ps.setToDefault("a");
-		tracer1.log.setLength(0);
-		ps.setValue("a", "1");
-		assertEquals("1.1", "[a:S->S1]", tracer1.log.toString());
-
-		ps.setValue("a", "2");
-		assertEquals("1.2", "[a:S->S1][a:S1->S2]", tracer1.log.toString());
-
-		ps.setValue("a", ps.getDefaultString("a"));
-		assertEquals("1.2.1", "[a:S->S1][a:S1->S2][a:S2->S]", tracer1.log.toString());
-
-		ps.setValue("a", "3");
-		assertEquals("1.2.2", "[a:S->S1][a:S1->S2][a:S2->S][a:S->S3]", tracer1.log.toString());
-
-		ps.setToDefault("a");
-		assertEquals("1.2.3", "[a:S->S1][a:S1->S2][a:S2->S][a:S->S3][a:S3->null]", tracer1.log.toString());
-
-		// change to same value - no one notified
-		ps.setValue("a", "2");
-		tracer1.log.setLength(0);
-		assertEquals("1.3", "", tracer1.log.toString());
-
-		// register second listener
-		ps.addPropertyChangeListener(tracer2);
-
-		// make sure both are notified
-		ps.setValue("a", "3");
-		assertEquals("1.4", "[a:S2->S3]", tracer1.log.toString());
-		assertEquals("1.5", "[a:S2->S3]", tracer2.log.toString());
-		
-		// deregister is honored
-		ps.removePropertyChangeListener(tracer2);
-		tracer1.log.setLength(0);
-		tracer2.log.setLength(0);
-		ps.setValue("a", "1");
-		assertEquals("1.6", "[a:S3->S1]", tracer1.log.toString());
-		assertEquals("1.7", "", tracer2.log.toString());
-		
-		// duplicate deregister is ignored
-		ps.removePropertyChangeListener(tracer2);
-		tracer1.log.setLength(0);
-		tracer2.log.setLength(0);
-		ps.setValue("a", "2");
-		assertEquals("1.8", "[a:S1->S2]", tracer1.log.toString());
-		assertEquals("1.9", "", tracer2.log.toString());
-		
-		// duplicate register is ignored
-		ps.addPropertyChangeListener(tracer1);
-		tracer1.log.setLength(0);
-		ps.setValue("a", "1");
-		assertEquals("1.10", "[a:S2->S1]", tracer1.log.toString());
-		
-		// last deregister is honored
-		ps.removePropertyChangeListener(tracer1);
-		tracer1.log.setLength(0);
-		ps.setValue("a", "4");
-		assertEquals("1.11", "", tracer1.log.toString());
-		
-		
-		// adds 2 and removes 1 during during callback!
-		class Trouble implements Preferences.IPropertyChangeListener {
-			public void propertyChange(Preferences.PropertyChangeEvent event) {
-				ps.removePropertyChangeListener(tracer1);
-				ps.addPropertyChangeListener(tracer2);
-			}
-		}
-		
-		ps.setValue("a", "0");
-		ps.addPropertyChangeListener(tracer1);
-		ps.addPropertyChangeListener(new Trouble());
-		tracer1.log.setLength(0);
-		tracer2.log.setLength(0);
-		ps.setValue("a", "1");
-		ps.setValue("a", "2");
-		assertEquals("1.12", "[a:S0->S1]", tracer1.log.toString());
-		assertEquals("1.13", "[a:S1->S2]", tracer2.log.toString());
-		
-	}
-	
-	public void testLoadStore() {
-
-		final Preferences ps = new Preferences();
-		
-		ps.setValue("b1", true);
-		ps.setValue("i1", 1);
-		ps.setValue("l1", 2L);
-		ps.setValue("f1", 1.0f);
-		ps.setValue("d1", 1.0);
-		ps.setValue("s1", "x");
-		String[] keys = {"b1", "i1", "l1", "f1", "d1", "s1", };
-		
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		try {
-			ps.store(out, "test header");
-		} catch (IOException e) {
-			assertTrue("0.1", false);
-		}
-
-		ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-				
-		final Preferences ps2 = new Preferences();
-		try {
-			ps2.load(in);
-		} catch (IOException e) {
-			assertTrue("0.2", false);
-		}
-		
-		assertEquals("1.1", true, ps2.getBoolean("b1"));
-		assertEquals("1.2", 1, ps2.getInt("i1"));
-		assertEquals("1.3", 2L, ps2.getLong("l1"));
-		assertEquals("1.4", 1.0f, ps2.getFloat("f1"), 1e-20f);
-		assertEquals("1.5", 1.0, ps2.getDouble("d1"), 1e-20);
-		assertEquals("1.6", "x", ps2.getString("s1"));
-
-		Set s1 = new HashSet(Arrays.asList(keys));
-		Set s2 = new HashSet(Arrays.asList(ps2.propertyNames()));
-		assertEquals("1.7", s1, s2);
-
-		// load discards current values
-		in = new ByteArrayInputStream(out.toByteArray());
-		final Preferences ps3 = new Preferences();
-		ps3.setValue("s1", "y");
-		try {
-			ps3.load(in);
-			assertEquals("1.8", "x", ps3.getString("s1"));
-			Set k1 = new HashSet(Arrays.asList(keys));
-			Set k2 = new HashSet(Arrays.asList(ps3.propertyNames()));
-			assertEquals("1.9", k1, k2);
-		} catch (IOException e) {
-			assertTrue("1.10", false);
-		}
-		
-	}
-	
-	public void testNeedsSaving() {
-
-		Preferences ps = new Preferences();
-		
-		// setValue dirties
-		ps = new Preferences();
-		assertEquals("1.0", false, ps.needsSaving());
-		ps.setValue("b1", true);
-		assertEquals("1.1", true, ps.needsSaving());
-
-		ps = new Preferences();
-		assertEquals("2.0", false, ps.needsSaving());
-		ps.setValue("i1", 1);
-		assertEquals("2.1", true, ps.needsSaving());
-
-		ps = new Preferences();
-		assertEquals("3.0", false, ps.needsSaving());
-		ps.setValue("l1", 2L);
-		assertEquals("3.1", true, ps.needsSaving());
-
-		ps = new Preferences();
-		assertEquals("4.0", false, ps.needsSaving());
-		ps.setValue("f1", 1.0f);
-		assertEquals("4.1", true, ps.needsSaving());
-
-		ps = new Preferences();
-		assertEquals("5.0", false, ps.needsSaving());
-		ps.setValue("d1", 1.0);
-		assertEquals("5.1", true, ps.needsSaving());
-
-		ps = new Preferences();
-		assertEquals("6.0", false, ps.needsSaving());
-		ps.setValue("s1", "x");
-		assertEquals("6.1", true, ps.needsSaving());
-
-		// setToDefault does not dirty if value not set
-		ps = new Preferences();
-		assertEquals("7.0", false, ps.needsSaving());
-		ps.setToDefault("any");
-		assertEquals("7.1", false, ps.needsSaving());
-
-		// setToDefault dirties if value was set
-		try {
-			ps = new Preferences();
-			assertEquals("7.2", false, ps.needsSaving());
-			ps.setValue("any", "x");
-			ByteArrayOutputStream out = new ByteArrayOutputStream();
-			ps.store(out, "test header");
-			ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-			ps.load(in);
-			assertEquals("7.3", false, ps.needsSaving());
-			ps.setToDefault("any");
-			assertEquals("7.4", true, ps.needsSaving());
-		} catch (IOException e) {
-			assertTrue("7.5", false);
-		}
-
-		// setDefault, getT, getDefaultT do not dirty
-		ps = new Preferences();
-		assertEquals("8.0", false, ps.needsSaving());
-		ps.setDefault("b1", true);
-		ps.getBoolean("b1");
-		ps.getDefaultBoolean("b1");
-		ps.setDefault("i1", 1);
-		ps.getInt("i1");
-		ps.getDefaultInt("i1");
-		ps.setDefault("l1", 1L);
-		ps.getLong("l1");
-		ps.getDefaultLong("l1");
-		ps.setDefault("f1", 1.0f);
-		ps.getFloat("f1");
-		ps.getDefaultFloat("f1");
-		ps.setDefault("d1", 1.0);
-		ps.getDouble("d1");
-		ps.getDefaultDouble("d1");
-		ps.setDefault("s1", "x");
-		ps.getString("s1");
-		ps.getDefaultString("s1");
-		assertEquals("8.1", false, ps.needsSaving());
-
-		try {
-			ps = new Preferences();
-			assertEquals("9.1", false, ps.needsSaving());
-			ps.setValue("b1", true);
-			assertEquals("9.2", true, ps.needsSaving());
-			ByteArrayOutputStream out = new ByteArrayOutputStream();
-			
-			// store makes not dirty
-			ps.store(out, "test header");
-			assertEquals("9.3", false, ps.needsSaving());
-			
-			// load comes in not dirty
-			ps.setValue("b1", false);
-			assertEquals("9.4", true, ps.needsSaving());
-			ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-			ps.load(in);
-			assertEquals("9.5", false, ps.needsSaving());
-		} catch (IOException e) {
-			assertTrue("9.0", false);
-		}
-	}
-	
-/* Comment this test out until we are able to use session tests
- * with it. - ddw
- * 	public void testPluginPrefs() {
-		IPluginRegistry registry = InternalPlatform.getPluginRegistry();
-		IPluginDescriptor resPlugin = registry.getPluginDescriptor("org.eclipse.core.resources");
-		Preferences perfs = null;
-		try {
-			perfs = resPlugin.getPlugin().getPluginPreferences();
-		} catch (CoreException ce) {
-			fail("0.1 core exception from getPlugin");
-		}
-		boolean oneBoolean = perfs.getBoolean("OneBoolean");
-		double oneDouble = perfs.getDouble("OneDouble");
-		float oneFloat = perfs.getFloat("OneFloat");
-		int oneInt = perfs.getInt("OneInt");
-		long oneLong = perfs.getLong("OneLong");
-		String oneString = perfs.getString("OneString");
-		assertTrue("1.0 boolean", oneBoolean);
-		assertTrue("2.0 double", oneDouble == 4);
-		assertTrue("3.0 float", oneFloat ==	4.3f);
-		assertTrue("4.0 int", oneInt == 5);
-		assertTrue("5.0 long", oneLong == 6);
-		assertTrue("6.0 string", oneString.equals("A string from the plugin root directory"));
-		int a = 4;
-		int b = 3;
-	}
-*/
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/ProgressMonitorWrapperTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/ProgressMonitorWrapperTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/ProgressMonitorWrapperTest.java
deleted file mode 100644
index 309d838..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/ProgressMonitorWrapperTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import org.eclipse.core.runtime.*;
-import junit.framework.*;
-
-/**
- * Test cases for the Path class.
- */
-public class ProgressMonitorWrapperTest extends RuntimeTest {
-/**
- * Need a zero argument constructor to satisfy the test harness.
- * This constructor should not do any real work nor should it be
- * called by user code.
- */
-public ProgressMonitorWrapperTest() {
-	super(null);
-}
-public ProgressMonitorWrapperTest(String name) {
-	super(name);
-}
-public static Test suite() {
-	return new TestSuite(ProgressMonitorWrapperTest.class);
-}
-public void testProgressMonitorWrapper() {
-	NullProgressMonitor nullMonitor = new NullProgressMonitor();
-	SubProgressMonitor wrapped = new SubProgressMonitor(nullMonitor,10);
-	ProgressMonitorWrapper wrapper = new ProgressMonitorWrapper(wrapped) {};
-	
-	assertSame("1.0",nullMonitor,wrapped.getWrappedProgressMonitor());
-	assertSame("1.1",wrapped,wrapper.getWrappedProgressMonitor());
-	
-	assertTrue("1.2",!nullMonitor.isCanceled());
-	assertTrue("1.3",!wrapped.isCanceled());
-	assertTrue("1.4",!wrapper.isCanceled());
-	
-	nullMonitor.setCanceled(true);
-	assertTrue("1.5",nullMonitor.isCanceled());
-	assertTrue("1.6",wrapped.isCanceled());
-	assertTrue("1.7",wrapper.isCanceled());
-}
-}

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/QualifiedNameTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/QualifiedNameTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/QualifiedNameTest.java
deleted file mode 100644
index f03b24f..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/QualifiedNameTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import org.eclipse.core.runtime.*;
-import junit.framework.*;
-
-/**
- * Test cases for the QualifiedName class.
- */
-
-public class QualifiedNameTest extends RuntimeTest {
-
-/**
- * Need a zero argument constructor to satisfy the test harness.
- * This constructor should not do any real work nor should it be
- * called by user code.
- */
-public QualifiedNameTest() {
-	super(null);
-}
-
-/**
- * Constructor for QualifiedNameTest
- */
-public QualifiedNameTest(String name) {
-	super(name);
-}
-
-public static Test suite() {
-
-	TestSuite suite= new TestSuite();
-	suite.addTest(new QualifiedNameTest("testQualifiers"));
-	suite.addTest(new QualifiedNameTest("testLocalNames"));
-	suite.addTest(new QualifiedNameTest("testEqualsAndHashcode"));
-	return suite;
-}
-
-public void testQualifiers() {
-	
-	try {
-		QualifiedName qN1 = new QualifiedName("foo","bar");
-	} catch (Exception e) {
-		fail("1.0");
-	}
-	
-	try {
-		QualifiedName qN3 = new QualifiedName(null,"bar");
-	} catch (Exception e) {
-		fail("1.1");
-	}
-
-	try {
-		QualifiedName qN2 = new QualifiedName(" ","bar");
-	} catch (Exception e) {
-		fail("1.2");
-	}
-	
-	try {
-		QualifiedName qN2 = new QualifiedName("","bar");
-	} catch (Exception e) {
-		fail("1.3");
-	}
-	
-}
-	
-public void testLocalNames() {
-	
-	try {
-		QualifiedName qN1 = new QualifiedName("foo", null);
-		fail("2.0");
-	} catch (Exception e) {
-	}
-	
-	try {
-		QualifiedName qN2 = new QualifiedName("foo","");
-		fail("2.1");
-	} catch (Exception e) {
-	}
-	
-	try {
-		QualifiedName qN3 = new QualifiedName("foo"," ");
-	} catch (Exception e) {
-		fail("2.2");
-	}
-	
-	try {
-		QualifiedName qN3 = new QualifiedName("foo"," port ");
-	} catch (Exception e) {
-		fail("2.3");
-	}	
-	
-}
-
-public void testEqualsAndHashcode() {
-	
-	QualifiedName qN1 = new QualifiedName("org.eclipse.runtime", "myClass");
-	QualifiedName qN2 = new QualifiedName("org.eclipse.runtime", "myClass");	
-	assertTrue("1.0", qN1.equals(qN2));
-	assertTrue("1.1", qN2.equals(qN1));
-	assertEquals("1.2", qN1.hashCode(), qN2.hashCode());
-	
-	
-	assertTrue("2.0", !qN1.equals(new String("org.eclipse.runtime.myClass")));
-	
-	
-	QualifiedName qN3 = new QualifiedName(null,"myClass");
-	assertTrue("3.0", !qN1.equals(qN3));
-	
-	QualifiedName qN4 = new QualifiedName("org.eclipse.runtime", " myClass");
-	assertTrue("3.1", !qN1.equals(qN4));
-	
-	QualifiedName qN5 = new QualifiedName("org.eclipse.runtime", "myClass ");
-	assertTrue("3.2", !qN1.equals(qN5));
-	
-	QualifiedName qN6 = new QualifiedName( null, "myClass");
-	QualifiedName qN7 = new QualifiedName( null, "myClass");
-	assertTrue("4.0", qN6.equals(qN7));
-	assertTrue("4.1", qN7.equals(qN6));
-	assertEquals("4.2", qN7.hashCode(), qN6.hashCode());
-	
-	QualifiedName qN8 = new QualifiedName(" ", "myClass");
-	assertTrue("5.0", ! qN8.equals(qN7));
-	QualifiedName qN9 = new QualifiedName("", "myClass");
-	assertTrue("5.1", ! qN8.equals(qN9));
-	
-}
-
-
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/RuntimeTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/RuntimeTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/RuntimeTest.java
deleted file mode 100644
index a337dcc..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/RuntimeTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-/**
- * Common superclass for all runtime tests.
- */
-public abstract class RuntimeTest extends TestCase {
-/**
- * Constructor required by test framework.
- */
-public RuntimeTest(String name) {
-	super(name);
-}
-/**
- * Fails the test due to the given exception.
- * @param message
- * @param e
- */
-public void fail(String message, Exception e) {
-	fail(message + ": " + e);
-}
-}
-

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java
deleted file mode 100644
index 5416134..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/StatusTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002 IBM Corporation and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Common Public License v0.5
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
- * 
- * Contributors:
- * IBM - Initial API and implementation
- ******************************************************************************/
-package org.eclipse.core.tests.runtime;
-
-import org.eclipse.core.runtime.*;
-import java.util.Arrays;
-import junit.framework.*;
-
-public class StatusTest extends RuntimeTest {
-	
-private int status1Severity = IStatus.OK;
-private String status1PluginId = "org.eclipse.core.tests.runtime";
-private int status1Code = -20;
-private String status1Message = "Something was canceled";
-private Exception status1Exception = new OperationCanceledException();
-private Status status1;
-
-private int status2Severity = IStatus.ERROR;
-private String status2PluginId = " ";
-private int status2Code = IStatus.OK;
-private String status2Message = "";
-private Exception status2Exception = null;
-private Status status2;
-
-private String multistatus1PluginId = "org.eclipse.core.tests.multistatus1";
-private int multistatus1Code = 20;
-private IStatus[] multistatus1Children = new IStatus[0];
-private String multistatus1Message = "Multistatus #1 message";
-private Throwable multistatus1Exception = new OperationCanceledException();
-private MultiStatus multistatus1;
-
-private MultiStatus multistatus2;
-	
-public StatusTest() {
-	super(null);
-}
-
-public StatusTest(String name) {
-	super(name);
-}
-
-public static Test suite() {
-	TestSuite suite= new TestSuite();
-	suite.addTest(new StatusTest("testSingleStatusReturnValues"));
-	suite.addTest(new StatusTest("testMultiStatusReturnValues"));
-	suite.addTest(new StatusTest("testAdd"));
-	suite.addTest(new StatusTest("testAddAll"));
-	suite.addTest(new StatusTest("testIsOK"));
-	suite.addTest(new StatusTest("testMerge"));
-	return suite;
-}
-
-protected void setUp() {
-	status1 = new Status(status1Severity, status1PluginId, status1Code, status1Message, status1Exception);
-	status2 = new Status(status2Severity, status2PluginId, status2Code, status2Message, status2Exception);
-
-	multistatus1 = new MultiStatus(multistatus1PluginId, multistatus1Code, multistatus1Children, multistatus1Message, multistatus1Exception);
-	multistatus2 = new MultiStatus(" ", 45, new Status[0], "", null);
-	multistatus2.add(status1);
-	multistatus2.add(status1);	
-}
-
-public void testMultiStatusReturnValues() {
-	assertEquals("1.1", multistatus1PluginId, multistatus1.getPlugin());
-	assertEquals("1.2", multistatus1Code, multistatus1.getCode());
-	assertTrue("1.3", Arrays.equals(multistatus1Children, multistatus1.getChildren()));
-	assertEquals("1.4", multistatus1Message, multistatus1.getMessage());
-	assertEquals("1.5", multistatus1Exception, multistatus1.getException());
-	assertTrue("1.6", multistatus1.isMultiStatus());
-	assertEquals("1.7", IStatus.OK, multistatus1.getSeverity());
-	assertTrue("1.8", multistatus1.isOK());
-	assertEquals("1.9", false, status1.matches(IStatus.ERROR | IStatus.WARNING | IStatus.INFO));
-}
-
-public void testSingleStatusReturnValues() {
-	assertEquals("1.0", status1Severity, status1.getSeverity());
-	assertEquals("1.1", status1PluginId, status1.getPlugin());
-	assertEquals("1.2", status1Code, status1.getCode());
-	assertEquals("1.3", status1Message, status1.getMessage());
-	assertEquals("1.4", status1Exception, status1.getException());
-	assertEquals("1.5", 0, status1.getChildren().length);
-	assertEquals("1.6", false, status1.isMultiStatus());
-	assertEquals("1.7", status1Severity == IStatus.OK, status1.isOK());
-	assertEquals("1.8", status1.matches(IStatus.ERROR | IStatus.WARNING | IStatus.INFO), !status1.isOK());
-
-	assertEquals("2.0", status2Severity, status2.getSeverity());
-	assertEquals("2.1", status2PluginId, status2.getPlugin());
-	assertEquals("2.2", status2Code, status2.getCode());
-	assertEquals("2.3", status2Message, status2.getMessage());
-	assertEquals("2.4", status2Exception, status2.getException());
-	assertEquals("2.5", 0, status2.getChildren().length);
-	assertEquals("2.6", false, status2.isMultiStatus());
-	assertEquals("2.7", status2Severity == IStatus.OK, status2.isOK());
-	assertEquals("2.8", status2.matches(IStatus.ERROR), !status2.isOK());
-}
-
-public void testAdd() {
-	
-	multistatus1.add(status1);
-	assertEquals("1.0",status1, (multistatus1.getChildren())[0]);
-	
-	multistatus1.add(multistatus2);
-	assertEquals("1.1",multistatus2, (multistatus1.getChildren())[1]);
-	
-	multistatus1.add(multistatus1);
-	assertEquals("1.2",multistatus1, (multistatus1.getChildren())[2]);
-	
-}
-
-public void testAddAll() {
-	
-	multistatus1.add(status2);
-	multistatus1.addAll(multistatus2);		
-	Status[] array = new Status[3];
-	array[0] = status2;
-	array[1] = status1;
-	array[2] = status1;
-	
-	assertTrue("1.0", multistatus1.getChildren().length == 3);
-	assertTrue("1.1", Arrays.equals(array, multistatus1.getChildren()));
-	
-	
-	multistatus1.add(multistatus2);
-	multistatus1.addAll(multistatus1);
-	Status[] array2 = new Status[8];
-	array2[0] = status2;
-	array2[1] = status1;
-	array2[2] = status1;
-	array2[3] = multistatus2;
-	array2[4] = status2;
-	array2[5] = status1;
-	array2[6] = status1;
-	array2[7] = multistatus2;
-	
-	assertTrue("2.0", multistatus1.getChildren().length == 8);
-	assertTrue("2.1", Arrays.equals(array2, multistatus1.getChildren()));	
-	
-}
-
-public void testIsOK() {
-
-	assertTrue("1.0", multistatus2.isOK());
-	
-	multistatus1.add(status2);
-	multistatus1.addAll(multistatus2);
-	assertTrue("1.1", !multistatus1.isOK());
-	
-}
-
-public void testMerge() {
-
-	multistatus1.merge(status2);
-	multistatus1.merge(multistatus2);		
-	Status[] array = new Status[3];
-	array[0] = status2;
-	array[1] = status1;
-	array[2] = status1;
-	
-	assertTrue("1.0", multistatus1.getChildren().length == 3);
-	assertTrue("1.1", Arrays.equals(array, multistatus1.getChildren()));
-	
-	
-	multistatus1.merge(multistatus1);
-	Status[] array2 = new Status[6];
-	array2[0] = status2;
-	array2[1] = status1;
-	array2[2] = status1;
-	array2[3] = status2;
-	array2[4] = status1;
-	array2[5] = status1;
-	
-	assertTrue("2.0", multistatus1.getChildren().length == 6);
-	assertTrue("2.1", Arrays.equals(array2, multistatus1.getChildren()));
-	
-	
-	multistatus2.add(multistatus1);
-	assertTrue("3.0", ! multistatus2.isOK());
-	multistatus2.merge(multistatus2.getChildren()[2]);
-	assertTrue("3.1", multistatus2.getChildren().length == 9);
-	
-}
-	
-	
-}
\ No newline at end of file

tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/model/ConfigurationElementModelTest.java

diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/model/ConfigurationElementModelTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/model/ConfigurationElementModelTest.java
deleted file mode 100644
index 1d48028..0000000
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/model/ConfigurationElementModelTest.java
+++ /dev/null
Binary files differ