This commit was manufactured by cvs2svn to create tag 'v200908211924'.

Sprout from master 2009-08-21 21:07:31 UTC Greg Watson <g.watson@computer.org> 'Added support for new debugger launch helper.'
Delete:
    core/org.eclipse.ptp.services.core/.classpath
    core/org.eclipse.ptp.services.core/.project
    core/org.eclipse.ptp.services.core/.settings/org.eclipse.jdt.core.prefs
    core/org.eclipse.ptp.services.core/META-INF/MANIFEST.MF
    core/org.eclipse.ptp.services.core/about.html
    core/org.eclipse.ptp.services.core/build.properties
    core/org.eclipse.ptp.services.core/plugin.properties
    core/org.eclipse.ptp.services.core/plugin.xml
    core/org.eclipse.ptp.services.core/schema/providers.exsd
    core/org.eclipse.ptp.services.core/schema/services.exsd
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/Activator.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IService.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceConfiguration.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelEvent.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelEventListener.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelManager.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProvider.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProviderDescriptor.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ProjectDeletionListener.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ProjectNotConfiguredException.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceModelManager.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProvider.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProviderDescriptor.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/messages/Messages.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/messages/messages.properties
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/Service.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceConfiguration.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceModelEvent.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceModelEventManager.java
    core/org.eclipse.ptp.services.test/.classpath
    core/org.eclipse.ptp.services.test/.project
    core/org.eclipse.ptp.services.test/.settings/org.eclipse.jdt.core.prefs
    core/org.eclipse.ptp.services.test/META-INF/MANIFEST.MF
    core/org.eclipse.ptp.services.test/build.properties
    core/org.eclipse.ptp.services.test/plugin.xml
    core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/Activator.java
    core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/ServiceModelManagerTests.java
    core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider.java
    core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider2.java
    core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider3.java
    core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/handlers/PrintServiceModelHandler.java
    core/org.eclipse.ptp.services.ui/.classpath
    core/org.eclipse.ptp.services.ui/.project
    core/org.eclipse.ptp.services.ui/.settings/org.eclipse.jdt.core.prefs
    core/org.eclipse.ptp.services.ui/META-INF/MANIFEST.MF
    core/org.eclipse.ptp.services.ui/about.html
    core/org.eclipse.ptp.services.ui/build.properties
    core/org.eclipse.ptp.services.ui/icons/etool16/new_hpc_proj.gif
    core/org.eclipse.ptp.services.ui/plugin.properties
    core/org.eclipse.ptp.services.ui/plugin.xml
    core/org.eclipse.ptp.services.ui/schema/providerContributors.exsd
    core/org.eclipse.ptp.services.ui/schema/serviceContributors.exsd
    core/org.eclipse.ptp.services.ui/schema/wizardExtensions.exsd
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/AddServiceConfigurationAction.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/EditServiceConfigurationAction.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/RemoveServiceConfigurationAction.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/SelectActiveServiceConfigurationAction.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceConfigurationWorkbenchAdapter.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceModelWorkbenchAdapter.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceModelWorkbenchAdapterFactory.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceProviderWorkbenchAdapter.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/Activator.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceContributor.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceProviderConfiguration.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceProviderContributor.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceConfigurationPropertyPage.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelUIManager.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/dialogs/ServiceConfigurationSelectionDialog.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/dialogs/ServicesDialog.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/handlers/LaunchWizardHandler.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/Messages.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/messages.properties
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/preferences/ServiceConfigurationPreferencePage.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/views/ServiceConfigurationView.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/NewServiceConfigurationProjectWizard.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationSelectionWizardPage.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWidget.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWizard.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWizardPage.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceModelWidget.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceProviderConfigurationWizard.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceProviderConfigurationWizardPage.java
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.classpath
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.project
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.settings/org.eclipse.jdt.core.prefs
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/about.html
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/build.properties
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.properties
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.xml
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/RemoteConfigurationEnvironmentSupplier.java
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/Activator.java
    rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/RemoteProjectEnvironmentSupplier.java
    rdt/org.eclipse.ptp.rdt.ui.tests/.classpath
    rdt/org.eclipse.ptp.rdt.ui.tests/.project
    rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
    rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF
    rdt/org.eclipse.ptp.rdt.ui.tests/build.properties
    rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c
    rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h
    rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java
    rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java
    rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java
    rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java
    releng/.cvsignore
    releng/org.eclipse.ptp.pldt.upc-feature/.project
    releng/org.eclipse.ptp.pldt.upc-feature/build.properties
    releng/org.eclipse.ptp.pldt.upc-feature/epl-v10.html
    releng/org.eclipse.ptp.pldt.upc-feature/feature.properties
    releng/org.eclipse.ptp.pldt.upc-feature/feature.xml
    releng/org.eclipse.ptp.pldt.upc-feature/license.html
    releng/org.eclipse.ptp.releng/.cvsignore
    releng/org.eclipse.ptp.releng/.project
    releng/org.eclipse.ptp.releng/build.sh
    releng/org.eclipse.ptp.releng/build.xml
    releng/org.eclipse.ptp.releng/buildsite.xml
    releng/org.eclipse.ptp.releng/buildsite_release.xml
    releng/org.eclipse.ptp.releng/maps/photran.map
    releng/org.eclipse.ptp.releng/maps/ptp.map
    releng/org.eclipse.ptp.releng/master/build.properties
    releng/org.eclipse.ptp.releng/master/customTargets.xml
    releng/org.eclipse.ptp.releng/pack.properties
    releng/org.eclipse.ptp.releng/photran_buildsite.xml
    releng/org.eclipse.ptp.releng/ptpbuild
    releng/org.eclipse.ptp.releng/update_versions
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml
    releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html
    releng/org.eclipse.ptp.rm.ibm.ll-feature/.project
    releng/org.eclipse.ptp.rm.ibm.ll-feature/build.properties
    releng/org.eclipse.ptp.rm.ibm.ll-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.properties
    releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.xml
    releng/org.eclipse.ptp.rm.ibm.ll-feature/license.html
    releng/org.eclipse.ptp.rm.ibm.pe-feature/.project
    releng/org.eclipse.ptp.rm.ibm.pe-feature/build.properties
    releng/org.eclipse.ptp.rm.ibm.pe-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.properties
    releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.xml
    releng/org.eclipse.ptp.rm.ibm.pe-feature/license.html
    releng/org.eclipse.ptp.rm.lsf-feature/.project
    releng/org.eclipse.ptp.rm.lsf-feature/build.properties
    releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.lsf-feature/feature.properties
    releng/org.eclipse.ptp.rm.lsf-feature/feature.xml
    releng/org.eclipse.ptp.rm.lsf-feature/license.html
    releng/org.eclipse.ptp.rm.mpich2-feature/.project
    releng/org.eclipse.ptp.rm.mpich2-feature/build.properties
    releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties
    releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml
    releng/org.eclipse.ptp.rm.mpich2-feature/license.html
    releng/org.eclipse.ptp.rm.openmpi-feature/.project
    releng/org.eclipse.ptp.rm.openmpi-feature/build.properties
    releng/org.eclipse.ptp.rm.openmpi-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.openmpi-feature/feature.properties
    releng/org.eclipse.ptp.rm.openmpi-feature/feature.xml
    releng/org.eclipse.ptp.rm.openmpi-feature/license.html
    releng/org.eclipse.ptp.rm.orte-feature/.project
    releng/org.eclipse.ptp.rm.orte-feature/build.properties
    releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.orte-feature/feature.properties
    releng/org.eclipse.ptp.rm.orte-feature/feature.xml
    releng/org.eclipse.ptp.rm.orte-feature/license.html
    releng/org.eclipse.ptp.rm.slurm-feature/.project
    releng/org.eclipse.ptp.rm.slurm-feature/build.properties
    releng/org.eclipse.ptp.rm.slurm-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.slurm-feature/feature.properties
    releng/org.eclipse.ptp.rm.slurm-feature/feature.xml
    releng/org.eclipse.ptp.rm.slurm-feature/license.html
    releng/org.eclipse.ptp.services-feature/.project
    releng/org.eclipse.ptp.services-feature/build.properties
    releng/org.eclipse.ptp.services-feature/epl-v10.html
    releng/org.eclipse.ptp.services-feature/feature.properties
    releng/org.eclipse.ptp.services-feature/feature.xml
    releng/org.eclipse.ptp.services-feature/license.html
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/.classpath
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/.project
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/.settings/org.eclipse.jdt.core.prefs
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.html
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.ini
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.mappings
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.properties
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/build.properties
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/data/defaults.properties
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/eclipse32.png
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.properties
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.xml
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/EffectiveMPICH2ResourceManagerConfiguration.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/IMPICH2ResourceManagerConfiguration.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2RMServiceProviderFactory.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManager.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ServiceProvider.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/build.properties
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/data/launch-defaults.properties
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.properties
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.xml
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2ProviderContributor.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPage.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java
    rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMServiceProviderConfigurationWizardPageFactory.java
    rms/org.eclipse.ptp.rm.slurm.core/.classpath
    rms/org.eclipse.ptp.rm.slurm.core/.project
    rms/org.eclipse.ptp.rm.slurm.core/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.slurm.core/about.html
    rms/org.eclipse.ptp.rm.slurm.core/build.properties
    rms/org.eclipse.ptp.rm.slurm.core/plugin.properties
    rms/org.eclipse.ptp.rm.slurm.core/plugin.xml
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/Activator.java
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMAttributes.java
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMJobAttributes.java
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMPreferenceManager.java
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/Messages.java
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/messages.properties
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManager.java
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerConfiguration.java
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerFactory.java
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyCommandFactory.java
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyRuntimeClient.java
    rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMRuntimeSystem.java
    rms/org.eclipse.ptp.rm.slurm.proxy/.cproject
    rms/org.eclipse.ptp.rm.slurm.proxy/.project
    rms/org.eclipse.ptp.rm.slurm.proxy/AUTHORS
    rms/org.eclipse.ptp.rm.slurm.proxy/COPYING
    rms/org.eclipse.ptp.rm.slurm.proxy/ChangeLog
    rms/org.eclipse.ptp.rm.slurm.proxy/INSTALL
    rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/eclipse.inf
    rms/org.eclipse.ptp.rm.slurm.proxy/Makefile.am
    rms/org.eclipse.ptp.rm.slurm.proxy/NEWS
    rms/org.eclipse.ptp.rm.slurm.proxy/README
    rms/org.eclipse.ptp.rm.slurm.proxy/about.html
    rms/org.eclipse.ptp.rm.slurm.proxy/config.h.in
    rms/org.eclipse.ptp.rm.slurm.proxy/configure.in
    rms/org.eclipse.ptp.rm.slurm.proxy/libproxy.patch
    rms/org.eclipse.ptp.rm.slurm.proxy/src/ptp_slurm_proxy.c
    rms/org.eclipse.ptp.rm.slurm.ui/.classpath
    rms/org.eclipse.ptp.rm.slurm.ui/.project
    rms/org.eclipse.ptp.rm.slurm.ui/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.slurm.ui/about.html
    rms/org.eclipse.ptp.rm.slurm.ui/build.properties
    rms/org.eclipse.ptp.rm.slurm.ui/plugin.properties
    rms/org.eclipse.ptp.rm.slurm.ui/plugin.xml
    rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/Activator.java
    rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/Messages.java
    rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/messages.properties
    rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/preferences/SLURMPreferencePage.java
    rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationDynamicTab.java
    rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationFactory.java
    rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMConfigurationWizardPage.java
    rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPage.java
    rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPageFactory.java
    tools/pldt/org.eclipse.ptp.pldt.tests/.classpath
    tools/pldt/org.eclipse.ptp.pldt.tests/.project
    tools/pldt/org.eclipse.ptp.pldt.tests/.settings/org.eclipse.jdt.core.prefs
    tools/pldt/org.eclipse.ptp.pldt.tests/META-INF/MANIFEST.MF
    tools/pldt/org.eclipse.ptp.pldt.tests/build.properties
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/includes/mpi.h
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPI.c
    tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/PldtBaseTestFramework.java
    tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test.java
    tools/pldt/org.eclipse.ptp.pldt.upc/.classpath
    tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore
    tools/pldt/org.eclipse.ptp.pldt.upc/.project
    tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
    tools/pldt/org.eclipse.ptp.pldt.upc/build.properties
    tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html
    tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html
    tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore
    tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif
    tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties
    tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java
    tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.classpath
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.project
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/META-INF/MANIFEST.MF
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/build.properties
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/calls.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsC.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsCF.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/class_hi.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphC.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphW.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/sample.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/plugin.xml
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/Hello.c
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/graph.c
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast.c
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast_edge.c
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast_edge_comments.c
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/Activator.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/actions/ASTWalkerAction.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCFGraphHandler.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCallGraphHandler.java
diff --git a/core/org.eclipse.ptp.services.core/.classpath b/core/org.eclipse.ptp.services.core/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/core/org.eclipse.ptp.services.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/core/org.eclipse.ptp.services.core/.project b/core/org.eclipse.ptp.services.core/.project
deleted file mode 100644
index 4b5ea18..0000000
--- a/core/org.eclipse.ptp.services.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.services.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/core/org.eclipse.ptp.services.core/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.services.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4abb5c1..0000000
--- a/core/org.eclipse.ptp.services.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Jun 05 18:42:17 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.ptp.services.core/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.services.core/META-INF/MANIFEST.MF
deleted file mode 100644
index a9df334..0000000
--- a/core/org.eclipse.ptp.services.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.ptp.services.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.services.core.Activator
-Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.services.core
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/org.eclipse.ptp.services.core/about.html b/core/org.eclipse.ptp.services.core/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/core/org.eclipse.ptp.services.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation 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
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.services.core/build.properties b/core/org.eclipse.ptp.services.core/build.properties
deleted file mode 100644
index bc3b0f2..0000000
--- a/core/org.eclipse.ptp.services.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
diff --git a/core/org.eclipse.ptp.services.core/plugin.properties b/core/org.eclipse.ptp.services.core/plugin.properties
deleted file mode 100644
index 3f154dd..0000000
--- a/core/org.eclipse.ptp.services.core/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.ptp.rdt.services
-Bundle-Vendor.0 = eclipse.org
-Bundle-Name.0 = PTP Services Model Plug-in
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.services.core/plugin.xml b/core/org.eclipse.ptp.services.core/plugin.xml
deleted file mode 100644
index 5961b46..0000000
--- a/core/org.eclipse.ptp.services.core/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension-point id="providers" name="Service Providers" schema="schema/providers.exsd"/>
-   <extension-point id="services" name="Services" schema="schema/services.exsd"/>
-
-</plugin>
diff --git a/core/org.eclipse.ptp.services.core/schema/providers.exsd b/core/org.eclipse.ptp.services.core/schema/providers.exsd
deleted file mode 100644
index 3f50e2f..0000000
--- a/core/org.eclipse.ptp.services.core/schema/providers.exsd
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.services.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.services.core" id="providers" name="Service Providers"/>
-      </appInfo>
-      <documentation>
-         Extension point to specify alternate providers for services.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="provider"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="provider">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier for this service provider
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a human readable name for the service
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="serviceId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the ID of the service this provider is for.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified name of the Java class implementing &lt;samp&gt;org.eclipse.ptp.services.core.IServiceProvider&lt;/samp&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.services.core.IServiceProvider"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="priority" type="string">
-            <annotation>
-               <documentation>
-                  a priority for the provider - lower values indicated a higher priority.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/core/org.eclipse.ptp.services.core/schema/services.exsd b/core/org.eclipse.ptp.services.core/schema/services.exsd
deleted file mode 100644
index 3ed7c95..0000000
--- a/core/org.eclipse.ptp.services.core/schema/services.exsd
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.services.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.services.core" id="services" name="Services"/>
-      </appInfo>
-      <documentation>
-         Used to define a service. This extension point is intended to allow certain services to be abstracted. For example, to provide remote implementations of project build services.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="service"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="service">
-      <complexType>
-         <sequence minOccurs="0" maxOccurs="unbounded">
-            <element ref="nature"/>
-         </sequence>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier for this service
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a human readable name for the service
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="priority" type="string">
-            <annotation>
-               <documentation>
-                  a priority for the service - lower values indicate higher priority.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="nature">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a unique identifier for this nature
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/Activator.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/Activator.java
deleted file mode 100644
index 9d2766a..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/Activator.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.services.core"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		
-		// If the plugin fails to activate because of an exception in the ServiceModelManager
-		// then we need to know what happened, so log it.
-		try {
-			ServiceModelManager.getInstance().loadModelConfiguration();
-		} catch (Exception e) {
-			log(e);
-		}
-		
-		ProjectDeletionListener.startListening();
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		try {
-			ProjectDeletionListener.stopListening();
-			try {
-				ServiceModelManager.getInstance().saveModelConfiguration();
-			} catch (Exception e) {
-				log(e);
-			}
-		}
-		finally {
-			plugin = null;
-			super.stop(context);
-		}
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	public void log(Throwable e) {
-		log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "Error", e)); //$NON-NLS-1$
-	}
-
-	public void log(IStatus status) {
-		getLog().log(status);
-	}
-	
-	public void logErrorMessage(String message) {
-		log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, message, null));
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IService.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IService.java
deleted file mode 100644
index 47094ba..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IService.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import java.util.Set;
-import java.util.SortedSet;
-
-/**
- * An interface for arbitrary services.  Services can be implemented by one or more
- * providers.
- *
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- *
- * @see IServiceProvider
- */
-public interface IService {
-	/**
-	 * Add service provider to list of providers for this service.
-	 * 
-	 * @param provider provider to add
-	 */
-	public void addServiceProvider(IServiceProviderDescriptor provider);
-	
-	/**
-	 * Get the ID of this service provider.
-	 * 
-	 * @return ID of this service provider
-	 */
-	public String getId();
-	
-	/**
-	 * Get the name of this service provider.
-	 * 
-	 * @return name of this service provider
-	 */
-	public String getName();
-	
-	/**
-	 * Get the set of natures that this service applies to. The
-	 * default nature "all" means the services is generic an applies
-	 * to all natures.
-	 * 
-	 * @return set of natures
-	 */
-	public Set<String> getNatures();
-	
-	/**
-	 * Get the priority of this service. Lower values have higher priority.
-	 * 
-	 * @return a string representing the service priority
-	 */
-	public Integer getPriority();
-	
-	/**
-	 * Gets a specific provider of this service.
-	 * 
-	 * @param id The unique ID of the service requested.
-	 * @return IServiceProviderDescriptor
-	 */
-	public IServiceProviderDescriptor getProviderDescriptor(String id);
-
-	/**
-	 * Get the set of all providers for this service.
-	 * 
-	 * @return set of providers for this service
-	 */
-	public Set<IServiceProviderDescriptor> getProviders();
-	
-	/**
-	 * Return the set of providers sorted by priority
-	 * 
-	 * @param service service containing providers
-	 * @return sorted providers
-	 */
-	public SortedSet<IServiceProviderDescriptor> getProvidersByPriority();
-	
-	/**
-	 * Remove service provider from list of providers for this service.
-	 * 
-	 * @param provider provider to remove
-	 */
-	public void removeServiceProvider(IServiceProviderDescriptor provider);
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceConfiguration.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceConfiguration.java
deleted file mode 100644
index f3756ba..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceConfiguration.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import java.util.Set;
-import java.util.SortedSet;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- *
- * An IServiceConfiguration represents a particular set of service providers
- * for each known service. 
- * 
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- */
-public interface IServiceConfiguration extends IAdaptable {
-	/**
-	 * Get the unique ID for this configuration.
-	 * 
-	 * @return the unique ID of this configuration
-	 */
-	public String getId();
-	
-	/**
-	 * Get the name for this configuration.
-	 * 
-	 * @return the name of this configuration
-	 */
-	public String getName();
-
-	/**
-	 * Get the service provider for a particular service in this configuration.
-	 * 
-	 * @param service service for which provider is required
-	 * @return service provider for the service
-	 */
-	public IServiceProvider getServiceProvider(IService service);
-	
-	/**
-	 * Returns all of the services that are part of this configuration. 
-	 * 
-	 * @return all of the services that are part of this configuration.
-	 */
-	public Set<IService> getServices();
-	
-	/**
-	 * Return the set of providers sorted by priority
-	 * 
-	 * @param service service containing providers
-	 * @return sorted providers
-	 */
-	public SortedSet<IService> getServicesByPriority();
-	
-	/**
-	 * Remove a service and its provider from this configuration
-	 * 
-	 * @param service service to remove
-	 */
-	public void removeService(IService service);
-	
-	/**
-	 * Set the name for this configuration.
-	 * 
-	 * @param name the name of this configuration
-	 */
-	public void setName(String name);
-	
-	/**
-	 * Set the service provider for a particular service in this configuration.
-	 * 
-	 * @param service service to set the provider for
-	 * @param provider provider for this service
-	 */
-	public void setServiceProvider(IService service, IServiceProvider provider);
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelEvent.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelEvent.java
deleted file mode 100644
index de3ec6a..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelEvent.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.ptp.services.core;
-
-
-public interface IServiceModelEvent {
-	/**
-	 * Event type used to indicate that a new service configuration has
-	 * been added to the model. For this event type, {@link #getSource()}
-	 * will return the new service configuration.
-	 */
-	public static final int SERVICE_CONFIGURATION_ADDED = 		0x001;
-
-	/**
-	 * Event type used to indicate that a new service configuration has
-	 * been removed from the model. For this event type, {@link #getSource()}
-	 * will return the old service configuration.
-	 */
-	public static final int SERVICE_CONFIGURATION_REMOVED = 	0x002;
-
-	/**
-	 * Event type used to indicate that a service configuration has
-	 * been modified. For this event type, {@link #getSource()}
-	 * will return the modified service configuration.
-	 */
-	public static final int SERVICE_CONFIGURATION_CHANGED = 	0x004;
-	
-	/**
-	 * Event type used to indicate that a service configuration has
-	 * been selected as the default. For this event type, {@link #getSource()}
-	 * will return the service configuration, or null if all service
-	 * configurations are unselected.
-	 */
-	public static final int SERVICE_CONFIGURATION_SELECTED = 	0x008;
-	
-	/**
-	 * Event type used to indicate that the service model has been successfully
-	 * saved to persistent storage. For this event type, {@link #getSource()}
-	 * will return an instance of IServiceModelManager.
-	 */
-	public static final int SERVICE_MODEL_SAVED = 				0x010;
-	
-	/**
-	 * Event type used to indicate that the service model has been successfully 
-	 * loaded from persistent storage. For this event type, {@link #getSource()}
-	 * will return an instance of IServiceModelManager.
-	 */
-	public static final int SERVICE_MODEL_LOADED = 				0x020;
-
-	/**
-	 * Event type that can be used to indicate that notification of all
-	 * types of events is requested.
-	 */
-	public static final int ALL_EVENTS = 						0x03f;
-
-	/**
-	 * Returns an object identifying the source of this event.
-	 * 
-	 * @return an object identifying the source of this event 
-	 * @see java.util.EventObject
-	 */
-	public Object getSource();
-	
-	/**
-	 * Returns the type of event being reported.
-	 *
-	 * @return one of the event type constants
-	 * @see #SERVICE_CONFIGURATION_ADDED
-	 * @see #SERVICE_CONFIGURATION_REMOVED
-	 * @see #SERVICE_CONFIGURATION_CHANGED
-	 * @see #SERVICE_CONFIGURATION_SELECTED
-	 * @see #SERVICE_MODEL_SAVED
-	 * @see #SERVICE_MODEL_LOADED
-	 */
-	public int getType();
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelEventListener.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelEventListener.java
deleted file mode 100644
index c0465e7..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelEventListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-/**
- * A service model event listener is notified of events relating to the service model.
- */
-public interface IServiceModelEventListener {
-
-	/**
-	 * Notifies this listener that some service model event has occurred.
-	 * 
-	 * @param event the service model event
-	 */
-	public void handleEvent(IServiceModelEvent event);
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelManager.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelManager.java
deleted file mode 100644
index 0fa3752..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelManager.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-
-public interface IServiceModelManager extends IAdaptable {
-	/**
-	 * Associate the service configuration with a project. A project can have multiple
-	 * service configurations. The service configuration will become the active
-	 * configuration for the project.
-	 * 
-	 * @param project the project
-	 * @param conf the configuration
-	 * 
-	 * @throws NullPointerException if project or conf is null
-	 */
-	public void addConfiguration(IProject project, IServiceConfiguration conf);
-	
-	/**
-	 * Adds the given listener for service model events. Has no effect if an 
-	 * identical listener is already registered. 
-	 * <p>
-	 * Listeners can listen for several types of event as defined in
-	 * <code>IServiceModelEvent</code>. Clients are free to register for
-	 * any number of event types. Clients are guaranteed to only receive
-	 * event types for which they are registered.
-	 * </p>
-	 * 
-	 * @param listener the listener
-	 * @param eventMask the bit-wise OR of all event types of interest to the
-	 * listener
-	 * @see IServiceModelEventListener
-	 * @see IServiceModelEvent
-	 * @see #removeEventListener(IServiceModelEventListener)
-	 */
-	public void addEventListener(IServiceModelEventListener listener, int type);
-	
-	/**
-	 * Get the global "active" service configuration. The "active" configuration is an
-	 * arbitrary configuration can be used by tools that do not operate on a project basis.
-	 * 
-	 * @return active service configuration, or null if no active configuration has been set
-	 */
-	public IServiceConfiguration getActiveConfiguration();
-	
-	/**
-	 * Get the configuration that is currently active for the project. Each project has
-	 * exactly one active configuration, which describes the mapping from services to
-	 * service providers. By default, the first configuration created for a project will 
-	 * be the active configuration for that project.
-	 * 
-	 * @param project project for which the configuration will be obtained
-	 * @return the service configuration for this project
-	 * 
-	 * @throws NullPointerException if project is null
-	 * @throws ProjectNotConfiguredException if the project has not been configured
-	 */
-	public IServiceConfiguration getActiveConfiguration(IProject project);
-	
-	/**
-	 * Get the named configuration for this project.
-	 * 
-	 * @param project project for which the configuration will be obtained
-	 * @param name name of the configuration
-	 * @return the service configuration or null if no configurations with the supplied name exist
-	 * 
-	 * @throws NullPointerException if project is null
-	 * @throws ProjectNotConfiguredException if the project has not been configured
-	 */
-	public IServiceConfiguration getConfiguration(IProject project, String name);
-	
-	/**
-	 * Get the configuration with the specified ID.
-	 * 
-	 * @param id ID of the configuration
-	 * @return the service configuration or null if no configurations with the supplied ID exist
-	 */
-	public IServiceConfiguration getConfiguration(String id);
-	
-	/**
-	 * Get all configurations available in the workspace.
-	 * 
-	 * @return all configurations that could be found, or an empty set
-	 */
-	public Set<IServiceConfiguration> getConfigurations();
-	
-	/**
-	 * Get all the configurations that are known by the project
-	 * 
-	 * @param project project containing the configurations
-	 * @return set of configurations known by the project
-	 * 
-	 * @throws NullPointerException if project is null
-	 * @throws ProjectNotConfiguredException if the project has not been configured
-	 */
-	public Set<IServiceConfiguration> getConfigurations(IProject project);
-	
-	/**
-	 * Get the set of projects which use the specified service configuration
-	 * 
-	 * @param serviceConfiguration Service configuration to query set of projects using it
-	 * @return Set of projects using the service configuration
-	 */
-	public Set<IProject> getProjectsForConfiguration(IServiceConfiguration serviceConfiguration);
-	
-	/**
-	 * Retrieves the service corresponding to a given id.
-	 * 
-	 * @param id The unique id of the service to retrieve.
-	 * @return IService or null
-	 */
-	public IService getService(String id);
-	
-	/**
-	 * Return a new instance of a service provider based on the descriptor.
-	 * 
-	 * @param desc extension description
-	 * @return service provider
-	 */
-	public IServiceProvider getServiceProvider(IServiceProviderDescriptor desc);
-	
-	/**
-	 * Get all the services that have been registered with the system.
-	 * 
-	 * @return a set of all the services
-	 */
-	public Set<IService> getServices();
-	
-	/**
-	 * Get all the services that are used by a particular project.
-	 * 
-	 * @param project project using the services
-	 * @return set of services
-	 * 
-	 * @throws NullPointerException if project is null
-	 * @throws ProjectNotConfiguredException if the project has not been configured
-	 */
-	public Set<IService> getServices(IProject project);
-	
-	/**
-	 * Get all the services that are associated with a project nature.
-	 * 
-	 * @param nature project nature
-	 * @return set of services or null
-	 */
-	public Set<IService> getServices(String natureID);
-	
-	/**
-	 * Returns true if the given project has a configuration.
-	 * 
-	 */
-	public boolean isConfigured(IProject project);
-	
-	
-	/**
-	 * Obtain a new service configuration with name 'name'. The name
-	 * does not need to be unique.
-	 * 
-	 * @param name name of service configuration
-	 * @return new service configuration
-	 */
-	public IServiceConfiguration newServiceConfiguration(String name);
-	
-	/**
-	 * Removes all the configurations and services associated to the given project.
-	 * If the project has not been configured then this method does nothing.
-	 * 
-	 * @throws NullPointerException if project is null
-	 */
-	public void remove(IProject project);
-
-	/**
-	 * Removes the service configuration.
-	 * 
-	 * @param conf the configuration
-	 */
-	public void remove(IServiceConfiguration conf);
-
-	/**
-	 * TODO What happens if you try to remove the active configuration?
-	 * TODO What happens if there are no configurations left after removing the given configuration?
-	 * 
-	 * Remove the service configuration from a project.
-	 * If the configuration was not set up on the project then this method
-	 * does nothing.
-	 * 
-	 * @param project the project
-	 * @param conf the configuration
-	 * 
-	 * @throws NullPointerException if project or conf is null
-	 * @throws ProjectNotConfiguredException if the project has not been configured
-	 */
-	public void removeConfiguration(IProject project, IServiceConfiguration conf);
-	
-	/**
-	 * Removes the given listener for service model events. Has no effect if the 
-	 * listener is not registered. 
-	 * <p>
-	 * @param listener the listener
-	 * @see IServiceModelEventListener
-	 * @see IServiceModelEvent
-	 * @see #addEventListener(IServiceModelEventListener)
-	 */
-	public void removeEventListener(IServiceModelEventListener listener);
-	
-	/**
-	 * Set the active configuration for a project. By default, the first configuration created
-	 * for a project will be the active configuration for that project.
-	 * 
-	 * @param project project for which the configuration will be obtained
-	 * @param configuration configuration to set as active for this project
-	 * 
-	 * @throws NullPointerException if project or configuration is null
-	 * @throws ProjectNotConfiguredException if the project has not been configured yet
-	 * @throws IllegalArgumentException if the configuration was not part of the project
-	 */
-	public void setActiveConfiguration(IProject project, IServiceConfiguration configuration);
-	
-	/**
-	 * Set the global "active" service configuration. The "active" configuration is an
-	 * arbitrary configuration can be used by tools that do not operate on a project basis.
-	 * 
-	 * @param config the service configuration to select as active
-	 */
-	public void setActiveConfiguration(IServiceConfiguration config);
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProvider.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProvider.java
deleted file mode 100644
index 8a7a235..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProvider.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-
-/**
- * An interface that represents the provider of a service.
- *
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- *
- * @see IService
- */
-public interface IServiceProvider extends IServiceProviderDescriptor, IAdaptable {
-	/**
-	 * Returns provider specific information for the current configuration.
-	 * 
-	 * @return information on current configuration for this provider
-	 */
-	public String getConfigurationString();
-
-	/**
-	 * Returns the boolean value of the given key.
-	 * 
-	 * @param key the key
-	 * @param defaultValue The value to return if key not stored
-	 * @return the value or defaultValue if no value was found
-	 */
-	public boolean getBoolean(String key, boolean defaultValue);
-
-	/**
-	 * Returns the int value of the given key.
-	 * 
-	 * @param key the key
-	 * @param defaultValue The value to return if key not stored
-	 * @return the value or defaultValue if no value was found
-	 */
-	public int getInt(String key, int defaultValue);
-
-	/**
-	 * Returns the string value of the given key.
-	 * 
-	 * @param key the key
-	 * @param defaultValue The value to return if key not stored
-	 * @return the value or defaultValue if no value was found
-	 */
-	public String getString(String key, String defaultValue);
-	
-	/**
-	 * Test if this service provider has been configured.
-	 * 
-	 * @return true if provider has been configured
-	 */
-	public boolean isConfigured();
-	
-	/**
-	 * Sets the value of the given key to the given boolean
-	 * 
-	 * @param key the key
-	 * @param value the value
-	 */
-	public void putBoolean(String key, boolean value);
-	
-	/**
-	 * Sets the value of the given key to the given int
-	 * 
-	 * @param key the key
-	 * @param value the value
-	 */
-	public void putInt(String key, int value);
-
-	/**
-	 * Sets the value of the given key to the given string
-	 * 
-	 * @param key the key
-	 * @param value the value
-	 */
-	public void putString(String key, String value);
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProviderDescriptor.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProviderDescriptor.java
deleted file mode 100644
index 2791243..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProviderDescriptor.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-/**
- * A description (but not an instance) of a service provider.
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- *
- */
-public interface IServiceProviderDescriptor {
-	/**
-	 * Get the ID of this service provider.
-	 * 
-	 * @return ID of this service provider
-	 */
-	public String getId();
-	
-	/**
-	 * Get the name of this service provider.
-	 * 
-	 * @return name of this service provider
-	 */
-	public String getName();
-
-	/**
-	 * Get the service this service provider is for.
-	 * 
-	 * @return service
-	 */
-	public String getServiceId();
-	
-	/**
-	 * Get the priority for the the provider. 
-	 * Lower values have higher priority.
-	 * 
-	 * @return priority
-	 */
-	public Integer getPriority();
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ProjectDeletionListener.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ProjectDeletionListener.java
deleted file mode 100644
index fb75ec2..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ProjectDeletionListener.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.eclipse.ptp.services.core;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-/**
- * Removes deleted projects from the service model.
- * 
- * @author Mike Kucera
- *
- */
-public class ProjectDeletionListener implements IResourceChangeListener {
-
-	private ProjectDeletionListener() {}
-	
-	private static final ProjectDeletionListener instance = new ProjectDeletionListener();
-	
-	
-	public static void startListening() {
-		// before-the-fact report of pending deletion of a single project
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(instance, IResourceChangeEvent.PRE_DELETE);
-	}
-	
-	public static void stopListening() {
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(instance);
-	}
-	
-	/**
-	 * Will get notified about project deletion before the project is actually
-	 * deleted, simply remove the project from the service model.
-	 */
-	public void resourceChanged(IResourceChangeEvent event) {
-		IProject project = (IProject) event.getResource();
-		ServiceModelManager manager = ServiceModelManager.getInstance();
-		
-		// does nothing if the project is not part of the service model
-		manager.remove(project);
-		try {
-			manager.saveModelConfiguration();
-		} catch (IOException e) {
-			Activator.getDefault().log(e);
-		}
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ProjectNotConfiguredException.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ProjectNotConfiguredException.java
deleted file mode 100644
index be3ae59..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ProjectNotConfiguredException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-
-/**
- * Runtime exception indicating that for some reason the given project's service
- * model has not been configured.
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- *
- */
-@SuppressWarnings("serial")
-public class ProjectNotConfiguredException extends RuntimeException {
-
-	public ProjectNotConfiguredException() {
-		super();
-	}
-
-	public ProjectNotConfiguredException(String arg0, Throwable arg1) {
-		super(arg0, arg1);
-	}
-
-	public ProjectNotConfiguredException(String arg0) {
-		super(arg0);
-	}
-
-	public ProjectNotConfiguredException(Throwable arg0) {
-		super(arg0);
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceModelManager.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceModelManager.java
deleted file mode 100644
index 1c7c319..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceModelManager.java
+++ /dev/null
@@ -1,677 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.Map.Entry;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.services.core.messages.Messages;
-import org.eclipse.ptp.services.internal.core.Service;
-import org.eclipse.ptp.services.internal.core.ServiceConfiguration;
-import org.eclipse.ptp.services.internal.core.ServiceModelEvent;
-import org.eclipse.ptp.services.internal.core.ServiceModelEventManager;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.XMLMemento;
-
-/**
- * A singleton class which is the entry point to a service model which represents:
- * - the set of contributed services
- * - the set of providers which provide those services
- * - the service fProjectConfigurations for each project which specify which services are
- * 		mapped to which providers.
- *
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- */
-public class ServiceModelManager extends PlatformObject implements IServiceModelManager {
-	private final static String SERVICE_EXTENSION_ID = "services"; //$NON-NLS-1$
-	private final static String PROVIDER_EXTENSION_ID = "providers"; //$NON-NLS-1$
-	private final static String SERVICE_ELEMENT_NAME = "service"; //$NON-NLS-1$
-	private final static String NATURE_ELEMENT_NAME = "nature"; //$NON-NLS-1$
-	private final static String PROVIDER_ELEMENT_NAME = "provider"; //$NON-NLS-1$
-	private final static String ATTR_ID = "id"; //$NON-NLS-1$
-	private final static String ATTR_NAME = "name"; //$NON-NLS-1$
-	private final static String ATTR_PRIORITY = "priority"; //$NON-NLS-1$
-	private final static String ATTR_SERVICE_ID = "serviceId"; //$NON-NLS-1$
-	private final static String ATTR_CLASS = "class"; //$NON-NLS-1$
-	private final static String ATTR_ACTIVE = "active"; //$NON-NLS-1$
-	private final static String SERVICE_MODEL_ELEMENT_NAME = "service-model"; //$NON-NLS-1$
-	private final static String PROJECT_ELEMENT_NAME = "project"; //$NON-NLS-1$
-	private final static String SERVICE_CONFIGURATION_ELEMENT_NAME = "service-configuration"; //$NON-NLS-1$
-	private final static String PROVIDER_CONFIGURATION_ELEMENT_NAME = "provider-configuration"; //$NON-NLS-1$
-	private final static String ATTR_PROVIDER_ID = "provider-id"; //$NON-NLS-1$
-	private final static String DEFAULT_SAVE_FILE_NAME = "service_model.xml";  //$NON-NLS-1$
-	
-	private static <T> T getConf(Map<IProject, T> map, IProject project) {
-		if(project == null) {
-			throw new NullPointerException();
-		}
-		T value = map.get(project);
-		if(value == null) {
-			throw new ProjectNotConfiguredException(); 
-		}
-		return value;
-	} 
-	
-	private static void saveModelConfiguration(Map<String, IServiceConfiguration> configs,
-			Map<IProject, Map<String, IServiceConfiguration>> projectConfigs,
-			Map<IProject, IServiceConfiguration> activeConfigs,
-			Writer writer) throws IOException {
-		XMLMemento rootMemento = XMLMemento.createWriteRoot(SERVICE_MODEL_ELEMENT_NAME);
-		
-		for (IServiceConfiguration config : configs.values()) {
-			String configurationId = config.getId();
-			String configurationName = config.getName();
-			
-			IMemento configMemento = rootMemento.createChild(SERVICE_CONFIGURATION_ELEMENT_NAME);
-			configMemento.putString(ATTR_ID, configurationId);
-			configMemento.putString(ATTR_NAME, configurationName);
-			
-			Set<IService> services = config.getServices();
-			for (IService service : services) {
-				IServiceProvider provider = config.getServiceProvider(service);
-				if(provider != null) {
-					IMemento serviceMemento = configMemento.createChild(SERVICE_ELEMENT_NAME);
-					serviceMemento.putString(ATTR_ID, service.getId());
-					serviceMemento.putString(ATTR_PROVIDER_ID, provider.getId());
-				
-					if (provider instanceof ServiceProvider) {
-						IMemento providerMemento = serviceMemento.createChild(PROVIDER_CONFIGURATION_ELEMENT_NAME);
-						((ServiceProvider)provider).saveState(providerMemento);
-					}
-				}
-			}
-		}
-		
-		for (Entry<IProject, Map<String, IServiceConfiguration>> entry : projectConfigs.entrySet()) {
-			IProject project = entry.getKey();
-			if (!project.exists()) {// Skip over deleted projects
-				continue;
-			}
-			
-			String projectName = project.getName();
-			IMemento projectMemento = rootMemento.createChild(PROJECT_ELEMENT_NAME);
-			projectMemento.putString(ATTR_NAME, projectName);
-			
-			Map<String, IServiceConfiguration> configurations = entry.getValue();
-			for (IServiceConfiguration config : configurations.values()) {
-				String configurationId = config.getId();
-				
-				IMemento configMemento = projectMemento.createChild(SERVICE_CONFIGURATION_ELEMENT_NAME);
-				configMemento.putString(ATTR_ID, configurationId);
-				IServiceConfiguration active = activeConfigs.get(project);
-				configMemento.putBoolean(ATTR_ACTIVE, active != null);
-			}
-		}
-			
-		rootMemento.save(writer);
-	}
-	/** Default location to save service model configuration */
-	private final IPath defaultSaveFile;
-	private Map<String, IServiceConfiguration> fConfigurations = new HashMap<String, IServiceConfiguration>();
-	private Map<IProject, Map<String, IServiceConfiguration>> fProjectConfigurations = new HashMap<IProject, Map<String, IServiceConfiguration>>();
-
-	private Map<IProject, IServiceConfiguration> fActiveConfigurations = new HashMap<IProject, IServiceConfiguration>();
-	private Map<IProject, Set<IService>> fProjectServices = new HashMap<IProject, Set<IService>>();
-	private Map<String, IService> fServices = null;
-	private Set<IService> fServiceSet = null;
-	
-	private Map<String, Set<IService>> fNatureServices = null;
-
-	private IServiceConfiguration fDefaultServiceConfiguration = null;
-
-	private ServiceModelEventManager fEventManager = new ServiceModelEventManager();
-	
-	private static ServiceModelManager fInstance;
-	
-	public static synchronized ServiceModelManager getInstance() {
-		if(fInstance == null) {
-			fInstance = new ServiceModelManager();
-		}
-		return fInstance;
-	}
-	
-	private ServiceModelManager() {
-		defaultSaveFile = Activator.getDefault().getStateLocation().append(DEFAULT_SAVE_FILE_NAME);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#addConfiguration(org.eclipse.core.resources.IProject, org.eclipse.ptp.services.core.IServiceConfiguration)
-	 */
-	public void addConfiguration(IProject project, IServiceConfiguration conf) {
-		if(project == null || conf == null)
-			throw new NullPointerException();
-		
-		Map<String, IServiceConfiguration> confs = fProjectConfigurations.get(project);
-		if(confs == null) {
-			confs = new HashMap<String, IServiceConfiguration>();
-			fProjectConfigurations.put(project, confs);
-			fActiveConfigurations.put(project, conf);
-		}
-		
-		confs.put(conf.getId(), conf);
-		
-		Set<IService> services = fProjectServices.get(project);
-		if(services == null) {
-			services = new HashSet<IService>();
-			fProjectServices.put(project, services);
-		}
-		
-		for(IServiceConfiguration config : confs.values()) {
-			for(IService service : config.getServices()) {
-				services.add(service);
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#addEventListener(org.eclipse.ptp.services.core.IServiceModelEventListener, int)
-	 */
-	public void addEventListener(IServiceModelEventListener listener, int type) {
-		fEventManager.addEventListener(listener, type);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getActiveConfiguration(org.eclipse.core.resources.IProject)
-	 */
-	public IServiceConfiguration getActiveConfiguration(IProject project) {
-		return getConf(fActiveConfigurations, project);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getConfiguration(org.eclipse.core.resources.IProject, java.lang.String)
-	 */
-	public IServiceConfiguration getConfiguration(IProject project, String name) {
-		Map<String, IServiceConfiguration> confMap = getConf(fProjectConfigurations, project);
-		for (IServiceConfiguration conf : confMap.values()) {
-			if (conf.getName().equals(name)) {
-				return conf;
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getConfiguration(java.lang.String)
-	 */
-	public IServiceConfiguration getConfiguration(String id) {
-		return fConfigurations.get(id);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getConfigurations()
-	 */
-	public Set<IServiceConfiguration> getConfigurations() {
-		return new HashSet<IServiceConfiguration>(fConfigurations.values());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getConfigurations(org.eclipse.core.resources.IProject)
-	 */
-	public Set<IServiceConfiguration> getConfigurations(IProject project) {
-		return new HashSet<IServiceConfiguration>(getConf(fProjectConfigurations, project).values());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getDefaultConfiguration()
-	 */
-	public IServiceConfiguration getActiveConfiguration() {
-		return fDefaultServiceConfiguration;
-	}
-
-	/**
-	 * Get the set of projects which use the specified service configuration
-	 * 
-	 * @param serviceConfiguration The service configuration
-	 * @return Set of projects which use the service configuration
-	 */
-	public Set<IProject> getProjectsForConfiguration(IServiceConfiguration serviceConfiguration) {
-		Set<IProject> projects;
-		Set<IProject> projectsForConfig;
-		
-			// Get the set of projects known to the service model manager
-		projects = fProjectConfigurations.keySet();
-		projectsForConfig = new HashSet<IProject>();
-			// For each project, check if it uses the specified service configuration
-			// If so, add the project to the projectsForConfig set.
-		for (IProject project : projects) {
-			Set<IServiceConfiguration> configs;
-			
-			configs = getConfigurations(project);
-			for (IServiceConfiguration config : configs) {
-				if (config == serviceConfiguration) {
-					projectsForConfig.add(project);
-				}
-			}
-		}
-		return projectsForConfig;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getService(java.lang.String)
-	 */
-	public IService getService(String id) {
-		loadServices();
-		return fServices.get(id);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getServiceProvider(org.eclipse.ptp.services.core.IServiceProviderDescriptor)
-	 */
-	public IServiceProvider getServiceProvider(IServiceProviderDescriptor desc) {
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID,	PROVIDER_EXTENSION_ID);
-		if (extensionPoint != null) {
-			for (IExtension extension : extensionPoint.getExtensions()) {
-				for (IConfigurationElement element : extension.getConfigurationElements()) {
-					if (element.getName().equals(PROVIDER_ELEMENT_NAME)) {
-						if (element.getAttribute(ATTR_ID).equals(desc.getId())) {
-							try {
-								IServiceProvider provider = (IServiceProvider) element.createExecutableExtension(ATTR_CLASS);
-								if (provider instanceof ServiceProvider) {
-									((ServiceProvider)provider).setDescriptor(desc);
-								}
-								return provider;
-							} catch (Exception e) {
-								Activator.getDefault().log(e);
-								return null;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getServices()
-	 */
-	public Set<IService> getServices() {
-		loadServices();
-		return fServiceSet;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getServices(org.eclipse.core.resources.IProject)
-	 */
-	public Set<IService> getServices(IProject project) {
-		return getConf(fProjectServices, project);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getServices(java.lang.String)
-	 */
-	public Set<IService> getServices(String natureId) {
-		loadServices();
-		return fNatureServices.get(natureId);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#isConfigured(org.eclipse.core.resources.IProject)
-	 */
-	public boolean isConfigured(IProject project) {
-		return fProjectConfigurations.containsKey(project);
-	}
-	
-	/**
-	 * Replaces the current service model configuration with what is
-	 * specified in the default save file. If the file does not exist
-	 * then this method does nothing.
-	 * 
-	 * This method is not meant to be called outside of the
-	 * <code>org.eclipse.ptp.services.core<code> plugin.
-	 * 
-	 * @throws IOException
-	 * @throws CoreException 
-	 */
-	public void loadModelConfiguration() throws IOException, CoreException {
-		loadServices();
-		File file = defaultSaveFile.toFile();
-		if(file.exists()) {
-			Reader reader = new BufferedReader(new FileReader(file));
-			try {
-				loadModelConfiguration(reader);
-			} finally {
-				reader.close();
-			}
-		}
-		notifyListeners(new ServiceModelEvent(this, IServiceModelEvent.SERVICE_MODEL_LOADED));
-	}
-
-	/**
-	 * Replaces the current service model configuration with what is
-	 * specified in the given <code>file</code>.
-	 * 
-	 * This method is not meant to be called outside of the
-	 * <code>org.eclipse.ptp.services.core<code> plugin.
-	 * 
-	 * @throws IOException 
-	 */
-	public void loadModelConfiguration(Reader reader) throws IOException, CoreException {
-		initialize(); // Clear out the existing model
-		
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		XMLMemento rootMemento = XMLMemento.createReadRoot(reader);
-		
-		for (IMemento configMemento : rootMemento.getChildren(SERVICE_CONFIGURATION_ELEMENT_NAME)) {
-			String configId = configMemento.getString(ATTR_ID);
-			String configName = configMemento.getString(ATTR_NAME);
-			IServiceConfiguration config = newServiceConfiguration(configId, configName);
-			for (IMemento serviceMemento : configMemento.getChildren(SERVICE_ELEMENT_NAME)) {
-				String serviceId = serviceMemento.getString(ATTR_ID);
-				String providerId = serviceMemento.getString(ATTR_PROVIDER_ID);
-				
-				IService service = getService(serviceId);
-				if (service != null) {
-					IServiceProviderDescriptor descriptor = service.getProviderDescriptor(providerId);
-					if (descriptor != null) {
-						IServiceProvider provider = getServiceProvider(descriptor);
-						if (provider != null) {
-							if (provider instanceof ServiceProvider) {
-								IMemento providerMemento = serviceMemento.getChild(PROVIDER_CONFIGURATION_ELEMENT_NAME);
-								((ServiceProvider)provider).restoreState(providerMemento);
-							}
-							config.setServiceProvider(service, provider);
-						} else {
-							Activator.getDefault().logErrorMessage(Messages.ServiceModelManager_2);
-						}
-					} else {
-						Activator.getDefault().logErrorMessage(Messages.ServiceModelManager_0 + providerId);
-					}
-				} else {
-					Activator.getDefault().logErrorMessage(Messages.ServiceModelManager_1 + serviceId);
-				}
-			}
-			
-			fConfigurations.put(configId, config);
-		}
-		
-		for (IMemento projectMemento : rootMemento.getChildren(PROJECT_ELEMENT_NAME)) {
-			String projectName = projectMemento.getString(ATTR_NAME);
-			IProject project = root.getProject(projectName);
-			
-			if (!project.exists()) {
-				continue;
-			}
-			
-			for (IMemento configMemento : projectMemento.getChildren(SERVICE_CONFIGURATION_ELEMENT_NAME)) {
-				String configId = configMemento.getString(ATTR_ID);
-				IServiceConfiguration config = fConfigurations.get(configId);
-				if (config != null) {
-					addConfiguration(project, config);
-					Boolean active = configMemento.getBoolean(ATTR_ACTIVE);
-					if (active != null && active.booleanValue()) {
-						setActiveConfiguration(project, config);
-					}
-				}
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#newServiceConfiguration(java.lang.String)
-	 */
-	public IServiceConfiguration newServiceConfiguration(String name) {
-		return newServiceConfiguration(UUID.randomUUID().toString(), name);
-	}
-	
-	/**
-	 * Notify listeners of an event occurrence.
-	 * 
-	 * This method is not meant to be called outside of the
-	 * <code>org.eclipse.ptp.services.core<code> plugin.
-	 * 
-	 * @param event event to notify
-	 */
-	public void notifyListeners(IServiceModelEvent event) {
-		fEventManager.notifyListeners(event);
-	}
-	
-	/**
-	 * Prints the current service model to the console, for debugging purposes.
-	 */
-	public void printServiceModel() {
-		System.out.println("Service Model: "); //$NON-NLS-1$
-		if(fProjectConfigurations.isEmpty())
-			System.out.println("  Service Model is empty"); //$NON-NLS-1$
-		
-		for(Entry<IProject, Map<String, IServiceConfiguration>> entry : fProjectConfigurations.entrySet()) {
-			IProject project = entry.getKey();
-			System.out.println("  Project: " + project.getName()); //$NON-NLS-1$
-			for(IServiceConfiguration conf : entry.getValue().values()) {
-				System.out.println("      " + conf); //$NON-NLS-1$
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#remove(org.eclipse.core.resources.IProject)
-	 */
-	public void remove(IProject project) {
-		if(project == null) {
-			throw new NullPointerException();
-		}
-		fProjectConfigurations.remove(project);
-		fActiveConfigurations.remove(project);
-		fProjectServices.remove(project);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#remove(org.eclipse.ptp.services.core.IServiceConfiguration)
-	 */
-	public void remove(IServiceConfiguration conf) {
-		for (IProject project : fProjectConfigurations.keySet()) {
-			removeConfiguration(project, conf);
-			if (conf.equals(getActiveConfiguration(project))) {
-				fActiveConfigurations.remove(project);
-			}
-		}
-		fConfigurations.remove(conf.getId());
-		notifyListeners(new ServiceModelEvent(conf, IServiceModelEvent.SERVICE_CONFIGURATION_REMOVED));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#removeConfiguration(org.eclipse.core.resources.IProject, org.eclipse.ptp.services.core.IServiceConfiguration)
-	 */
-	public void removeConfiguration(IProject project, IServiceConfiguration conf) {
-		Map<String, IServiceConfiguration> confs = getConf(fProjectConfigurations, project);
-		if(confs != null) {
-			confs.remove(conf.getId());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#removeEventListener(org.eclipse.ptp.services.core.IServiceModelEventListener)
-	 */
-	public void removeEventListener(IServiceModelEventListener listener) {
-		fEventManager.removeEventListener(listener);
-	}
-	
-	/**
-	 * Saves the model configuration into the plugin's metadata area using
-	 * the default file name.
-	 * Will not save data for projects that do not exist.
-	 * 
-	 * This method is not meant to be called outside of the
-	 * <code>org.eclipse.ptp.services.core<code> plugin.
-	 * 
-	 * @throws IOException
-	 */
-	public void saveModelConfiguration() throws IOException {
-		File file = defaultSaveFile.toFile();
-		BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-		try {
-			saveModelConfiguration(writer);
-		} finally {
-			writer.close();
-		}
-	}
-	
-	/**
-	 * Saves the service model configuration to the given <code>file</code>.
-	 * Will not save data for projects that do not exist.
-	 * 
-	 * This method is not meant to be called outside of the
-	 * <code>org.eclipse.ptp.services.core<code> plugin.
-	 * 
-	 * @param file
-	 * @throws IOException 
-	 * @throws NullPointerException if file is null
-	 */
-	public void saveModelConfiguration(Writer writer) throws IOException {
-		if(writer == null)
-			throw new NullPointerException();
-		saveModelConfiguration(fConfigurations, fProjectConfigurations, fActiveConfigurations, writer);
-		notifyListeners(new ServiceModelEvent(this, IServiceModelEvent.SERVICE_MODEL_SAVED));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#setActiveConfiguration(org.eclipse.core.resources.IProject, org.eclipse.ptp.services.core.IServiceConfiguration)
-	 */
-	public void setActiveConfiguration(IProject project, IServiceConfiguration configuration) {
-		Map<String, IServiceConfiguration> confs = getConf(fProjectConfigurations, project);
-		
-		if(!confs.containsKey(configuration.getId())) {
-			throw new IllegalArgumentException();
-		}
-		
-		fActiveConfigurations.put(project, configuration);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#setDefaultConfiguration(org.eclipse.ptp.services.core.IServiceConfiguration)
-	 */
-	public void setActiveConfiguration(IServiceConfiguration config) {
-		fDefaultServiceConfiguration = config;
-		notifyListeners(new ServiceModelEvent(config, IServiceModelEvent.SERVICE_CONFIGURATION_SELECTED));
-	}
-	
-	/**
-	 * Initialize model
-	 */
-	private void initialize() {
-		fActiveConfigurations.clear();
-		fProjectConfigurations.clear();
-		fProjectServices.clear();
-		fConfigurations.clear();
-	}
-
-	/**
-	 * Locate and initialize service extensions.
-	 */
-	private void loadServices() {
-		if (fServices != null) {
-			return;
-		}
-		fServices = new HashMap<String, IService>();
-		fServiceSet = new HashSet<IService>();
-		fNatureServices = new HashMap<String, Set<IService>>();
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-        IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID, SERVICE_EXTENSION_ID);
-		if (extensionPoint != null) {
-			for (IExtension extension : extensionPoint.getExtensions()) {
-				for (IConfigurationElement element : extension.getConfigurationElements()) {
-					if (element.getName().equals(SERVICE_ELEMENT_NAME)) {
-						String id = element.getAttribute(ATTR_ID);
-						String name = element.getAttribute(ATTR_NAME);
-						String priority = element.getAttribute(ATTR_PRIORITY);
-						IConfigurationElement[] natureConf = element.getChildren(NATURE_ELEMENT_NAME);
-						Set<String> natures = new HashSet<String>();
-						if (natureConf != null) {
-							for (IConfigurationElement nature : natureConf) {
-								String natureId = nature.getAttribute(ATTR_ID);
-								if (workspace.getNatureDescriptor(natureId) != null) {
-									natures.add(natureId);
-								}
-							}
-						}
-						IService service = new Service(id, name, priority, natures);
-						fServiceSet.add(service);
-						fServices.put(id, service);
-						for (String nature : natures) {
-							Set<IService> svcs = fNatureServices.get(nature);
-							if (svcs == null) {
-								svcs = new HashSet<IService>();
-								fNatureServices.put(nature, svcs);
-							}
-							svcs.add(service);
-						}
-					}
-				}
-			}
-		}
-        extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID, PROVIDER_EXTENSION_ID);
-		if (extensionPoint != null) {
-			for (IExtension extension : extensionPoint.getExtensions()) {
-				for (IConfigurationElement element : extension.getConfigurationElements()) {
-					if (element.getName().equals(PROVIDER_ELEMENT_NAME)) {
-						String id = element.getAttribute(ATTR_ID);
-						String name = element.getAttribute(ATTR_NAME);
-						String priority = element.getAttribute(ATTR_PRIORITY);
-						String serviceId = element.getAttribute(ATTR_SERVICE_ID);
-						IServiceProviderDescriptor desc = new ServiceProviderDescriptor(id, name, serviceId, priority);
-						IService service = fServices.get(serviceId);
-						if (service != null) {
-							service.addServiceProvider(desc);
-						} else {
-							Activator.getDefault().logErrorMessage(
-									NLS.bind(Messages.Services_invalidServiceId, serviceId));
-						}
-					}
-				}
-			}
-		}	
-	}
-	
-	/**
-	 * Create a service configuration with the specified id and name. Used when
-	 * restoring saved state.
-	 * 
-	 * @param id id of service configuration
-	 * @param name name of service configuration
-	 * @return service configuration
-	 */
-	private IServiceConfiguration newServiceConfiguration(String id, String name) {
-		IServiceConfiguration config = new ServiceConfiguration(id, name);
-		fConfigurations.put(id, config);
-		notifyListeners(new ServiceModelEvent(config, IServiceModelEvent.SERVICE_CONFIGURATION_ADDED));
-		return config;
-	}
-	
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProvider.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProvider.java
deleted file mode 100644
index f905d5e..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProvider.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.ptp.services.core.messages.Messages;
-import org.eclipse.ui.IMemento;
-
-/**
- * An abstract base class for service provider implementations. 
- * 
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- * @author vkong
- *
- */
-public abstract class ServiceProvider extends PlatformObject implements IServiceProvider, IServiceProviderDescriptor {
-	
-	private IServiceProviderDescriptor fDescriptor = null;
-	private final HashMap<String, String> fAttributes = new HashMap<String, String>();
-	
-	public ServiceProvider() {
-	}
-
-	public ServiceProvider(ServiceProvider provider) {
-		setDescriptor(provider.getDescriptor());
-		fAttributes.putAll(provider.getAttributes());
-	}
-
-	/**
-	 * Get the attributes for this service provider
-	 * 
-	 * @return service provider attributes
-	 */
-	public Map<String, String> getAttributes() {
-		return Collections.unmodifiableMap(fAttributes);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#getBoolean(java.lang.String, boolean)
-	 */
-	public boolean getBoolean(String key, boolean defaultValue) {
-		String value = getString(key, null);
-		boolean result = defaultValue;
-		if (value != null) {
-			result = Boolean.parseBoolean(value);
-		}
-		return result;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#getConfigurationString()
-	 */
-	public String getConfigurationString() {
-		return isConfigured() ? Messages.ServiceProvider_0 : Messages.ServiceProvider_1;
-	}
-	
-	/**
-	 * Get the descriptor for this service provider
-	 * 
-	 * @return service provider descriptor
-	 */
-	public IServiceProviderDescriptor getDescriptor() {
-		return fDescriptor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProviderDescriptor#getId()
-	 */
-	public String getId() {
-		if (fDescriptor == null) {
-			return null;
-		}
-		return fDescriptor.getId();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#getInt(java.lang.String, int)
-	 */
-	public int getInt(String key, int defaultValue) {
-		String value = getString(key, null);
-		int result = defaultValue;
-		if (value != null) {
-			try {
-				result = Integer.parseInt(value);
-			} catch (NumberFormatException e) {
-				// Use default
-			}
-		}
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProviderDescriptor#getName()
-	 */
-	public String getName() {
-		if (fDescriptor == null) {
-			return null;
-		}
-		return fDescriptor.getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProviderDescriptor#getPriority()
-	 */
-	public Integer getPriority() {
-		if (fDescriptor == null) {
-			return null;
-		}
-		return fDescriptor.getPriority();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProviderDescriptor#getServiceId()
-	 */
-	public String getServiceId() {
-		if (fDescriptor == null) {
-			return null;
-		}
-		return fDescriptor.getServiceId();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#getString(java.lang.String, java.lang.String)
-	 */
-	public String getString(String key, String defaultValue)
-	{
-		String value = fAttributes.get(key);
-		if (value == null) {
-			return defaultValue;
-		}
-		return value;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#putBoolean(java.lang.String, boolean)
-	 */
-	public void putBoolean(String key, boolean value) {
-		String strVal = Boolean.toString(value);
-		putString(key, strVal);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#putInt(java.lang.String, int)
-	 */
-	public void putInt(String key, int value) {
-		String strVal = Integer.toString(value);
-		putString(key, strVal);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#putString(java.lang.String, java.lang.String)
-	 */
-	public void putString(String key, String value) {
-		fAttributes.put(key, value);
-	}
-
-	/**
-	 * Restores the state of this provider from the
-	 * given <code>IMemento</code>.
-	 * 
-	 * NOTE: This should only be implemented if a provider 
-	 * wishes to override the default behavior.
-	 * 
-	 * @param memento for restoring the provider's state.
-	 */
-	public void restoreState(IMemento memento) {
-		fAttributes.clear();
-		for (String key : memento.getAttributeKeys()) {
-			fAttributes.put(key, memento.getString(key));
-		}
-	}
-
-	/**
-	 * Saves the state of this provider in the given
-	 * <code>IMemento</code>. 
-	 * 
-	 * NOTE: This should only be implemented if a provider  
-	 * wishes to override the default behavior.
-	 * 
-	 * @param memento for saving the provider's state.
-	 */
-	public void saveState(IMemento memento) {
-		for (String key : fAttributes.keySet()) {
-			memento.putString(key, fAttributes.get(key));
-		}
-	}
-
-	/**
-	 * Set the descriptor for this provider.
-	 * 
-	 * @param descriptor descriptor to set
-	 */
-	public void setDescriptor(IServiceProviderDescriptor descriptor) {
-		this.fDescriptor = descriptor;
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProviderDescriptor.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProviderDescriptor.java
deleted file mode 100644
index 9ea5202..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProviderDescriptor.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-
-/**
- * A description (but not an instance) of a service provider.
- *
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- * @author greg
- */
-public class ServiceProviderDescriptor implements IServiceProviderDescriptor {
-	private String fId;
-	private String fName;
-	private String fServiceId;
-	private Integer fPriority = Integer.MAX_VALUE;
-	
-	public ServiceProviderDescriptor(String id, String name, String serviceId, String priority) {
-		fId = id;
-		fName = name;
-		fServiceId = serviceId;
-		if (priority != null) {
-			try {
-				fPriority = Integer.parseInt(priority);
-			} catch (NumberFormatException e) {
-				// Ignore
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProviderDescriptor#getId()
-	 */
-	public String getId() {
-		return fId;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProviderDescriptor#getName()
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProviderDescriptor#getPriority()
-	 */
-	public Integer getPriority() {
-		return fPriority;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProviderDescriptor#getServiceId()
-	 */
-	public String getServiceId() {
-		return fServiceId;
-	}
-	
-	@Override
-	public boolean equals(Object o) {
-		if (!(o instanceof IServiceProviderDescriptor)) {
-			return false;
-		}
-		return fId.equals(((IServiceProviderDescriptor) o).getId()); 
-	}
-	
-	@Override
-	public int hashCode() {
-		return fId.hashCode();
-	}
-	
-	public String toString() {
-		return "ServiceProviderDescriptor(" + fId + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/messages/Messages.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/messages/Messages.java
deleted file mode 100644
index 1ccf209..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/messages/Messages.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.services.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME= "org.eclipse.ptp.services.core.messages.messages";//$NON-NLS-1$
-	
-	public static String ServiceModelManager_0;
-	public static String ServiceModelManager_1;
-
-	public static String ServiceModelManager_2;
-
-	public static String ServiceProvider_0;
-	public static String ServiceProvider_1;
-
-	public static String Services_invalidServiceId;
-	public static String Services_saveServiceError;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}		
-
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/messages/messages.properties b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/messages/messages.properties
deleted file mode 100644
index 06dfea1..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/messages/messages.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-ServiceModelManager_0=Unknown provider ID: 
-ServiceModelManager_1=Unknown service ID: 
-ServiceModelManager_2=Could not instantiate service provider
-ServiceProvider_0=Configured
-ServiceProvider_1=Not configured
-Services_invalidServiceId=Service provider refers to invalid service ID: {0}
-Services_saveServiceError=Service {0} could not be saved for project {1}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/Service.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/Service.java
deleted file mode 100644
index e4b2bce..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/Service.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.internal.core;
-
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceProviderDescriptor;
-
-/**
- * @author greg
- *
- */
-public class Service implements IService {
-	private String fServiceId;
-	private String fServiceName;
-	private Integer fServicePriority = Integer.MAX_VALUE;
-	private Set<String> fServiceNatures;
-	private Set<IServiceProviderDescriptor> fServiceProviderDescriptors = new HashSet<IServiceProviderDescriptor>();
-	private Map<String, IServiceProviderDescriptor> fIdToServiceProviderDescriptorMap = new HashMap<String, IServiceProviderDescriptor>();
-	
-	public Service(String id, String name, String priority, Set<String>natures) {
-		fServiceId = id;
-		fServiceName = name;
-		if (priority != null) {
-			try {
-				fServicePriority = Integer.parseInt(priority);
-			} catch (NumberFormatException e) {
-				// Ignore
-			}
-		}
-		fServiceNatures = natures;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IService#addServiceProvider(org.eclipse.ptp.services.core.IServiceProviderDescriptor)
-	 */
-	public void addServiceProvider(IServiceProviderDescriptor provider) {
-		fServiceProviderDescriptors.add(provider);
-		fIdToServiceProviderDescriptorMap.put(provider.getId(), provider);
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (o instanceof IService) {
-			return ((IService) o).getId().equals(fServiceId);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IService#getId()
-	 */
-	public String getId() {
-		return fServiceId;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IService#getName()
-	 */
-	public String getName() {
-		return fServiceName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IService#getNatures()
-	 */
-	public Set<String> getNatures() {
-		return fServiceNatures;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IService#getPriority()
-	 */
-	public Integer getPriority() {
-		return fServicePriority;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IService#getProvider(java.lang.String)
-	 */
-	public IServiceProviderDescriptor getProviderDescriptor(String id) {
-		return fIdToServiceProviderDescriptorMap.get(id);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IService#getProviders()
-	 */
-	public Set<IServiceProviderDescriptor> getProviders() {
-		return fServiceProviderDescriptors;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IService#getProvidersByPriority()
-	 */
-	public SortedSet<IServiceProviderDescriptor> getProvidersByPriority() {
-		SortedSet<IServiceProviderDescriptor> sortedProviders = 
-			new TreeSet<IServiceProviderDescriptor>(new Comparator<IServiceProviderDescriptor>() {
-				public int compare(IServiceProviderDescriptor o1, IServiceProviderDescriptor o2) {
-					int cmp = o1.getPriority().compareTo(o2.getPriority());
-					if (cmp != 0) {
-						return cmp;
-					}
-					return o1.getId().compareTo(o2.getId());
-				}
-			});
-		for (IServiceProviderDescriptor p : getProviders()) {
-			sortedProviders.add(p);
-		}
-		
-		return sortedProviders;
-	}
-	
-	@Override
-	public int hashCode() {
-		return fServiceId.hashCode();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IService#removeServiceProvider(org.eclipse.ptp.services.core.IServiceProviderDescriptor)
-	 */
-	public void removeServiceProvider(IServiceProviderDescriptor provider) {
-		fServiceProviderDescriptors.remove(provider);
-		fIdToServiceProviderDescriptorMap.remove(provider.getId());
-	}
-	
-	public String toString() {
-		return "Service(" + fServiceId + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceConfiguration.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceConfiguration.java
deleted file mode 100644
index 701ad27..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceConfiguration.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.internal.core;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelEvent;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-
-/**
- * A named configuration which consists of a mapping of services to providers.
- *
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- *
- * @see IService
- * @see IServiceProvider 
- * @author crecoskie
- *
- */
-public class ServiceConfiguration extends PlatformObject implements IServiceConfiguration {
-	
-	protected final String fId;
-	protected String fName;
-	protected ServiceModelManager fManager = ServiceModelManager.getInstance();
-	protected Map<IService, IServiceProvider> fServiceToProviderMap = new HashMap<IService, IServiceProvider>();
-
-	public ServiceConfiguration(String id, String name) {
-		fId = id;
-		fName = name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceConfiguration#getId()
-	 */
-	public String getId() {
-		return fId;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceConfiguration#getName()
-	 */
-	public String getName() {
-		return fName;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceConfiguration#getServiceProvider(org.eclipse.ptp.services.core.IService)
-	 */
-	public IServiceProvider getServiceProvider(IService service) {
-		return fServiceToProviderMap.get(service);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceConfiguration#getServices()
-	 */
-	public Set<IService> getServices() {
-		return Collections.unmodifiableSet(fServiceToProviderMap.keySet());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceConfiguration#getServicesByPriority()
-	 */
-	public SortedSet<IService> getServicesByPriority() {
-		SortedSet<IService> sortedServices = 
-			new TreeSet<IService>(new Comparator<IService>() {
-				public int compare(IService o1, IService o2) {
-					int cmp = o1.getPriority().compareTo(o2.getPriority());
-					if (cmp != 0) {
-						return cmp;
-					}
-					return o1.getId().compareTo(o2.getId());
-				}
-			});
-		for (IService s : getServices()) {
-			sortedServices.add(s);
-		}
-		
-		return sortedServices;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceConfiguration#removeService(org.eclipse.ptp.services.core.IService)
-	 */
-	public void removeService(IService service) {
-		if (fServiceToProviderMap.containsKey(service)) {
-			fServiceToProviderMap.remove(service);
-		}
-		fManager.notifyListeners(new ServiceModelEvent(this, IServiceModelEvent.SERVICE_CONFIGURATION_CHANGED));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceConfiguration#setName(java.lang.String)
-	 */
-	public void setName(String name) {
-		fName = name;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceConfiguration#setServiceProvider(org.eclipse.ptp.services.core.IService, org.eclipse.ptp.services.core.IServiceProvider)
-	 */
-	public void setServiceProvider(IService service, IServiceProvider provider) {
-		// Remove old mapping if one exists
-		fServiceToProviderMap.remove(service);
-		fServiceToProviderMap.put(service, provider);
-		fManager.notifyListeners(new ServiceModelEvent(this, IServiceModelEvent.SERVICE_CONFIGURATION_CHANGED));
-	}
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return "ServiceConfiguration: " + fName + " -> " + fServiceToProviderMap; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceModelEvent.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceModelEvent.java
deleted file mode 100644
index 1710e5e..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceModelEvent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.internal.core;
-
-import java.util.EventObject;
-
-import org.eclipse.ptp.services.core.IServiceModelEvent;
-
-
-public class ServiceModelEvent extends EventObject implements IServiceModelEvent {
-	private static final long serialVersionUID = 1L;
-	
-	private int type;
-
-	public ServiceModelEvent(Object source, int type) {
-		super(source);
-		this.type = type;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelEvent#getType()
-	 */
-	public int getType() {
-		return type;
-	}
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceModelEventManager.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceModelEventManager.java
deleted file mode 100644
index d3045c7..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceModelEventManager.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.internal.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.ptp.services.core.IServiceModelEvent;
-import org.eclipse.ptp.services.core.IServiceModelEventListener;
-
-
-public class ServiceModelEventManager {
-	private List<ListenerList> fEventListeners = new ArrayList<ListenerList>();
-	
-	public ServiceModelEventManager() {
-		for (int index = 1; index <= IServiceModelEvent.ALL_EVENTS; index <<= 1) {
-			fEventListeners.add(new ListenerList());
-		}
-	}
-
-	/**
-	 * Adds the given listener for service model events. Has no effect if an 
-	 * identical listener is already registered. 
-	 * <p>
-	 * Listeners can listen for several types of event as defined in
-	 * <code>IServiceModelEvent</code>. Clients are free to register for
-	 * any number of event types. Clients are guaranteed to only receive
-	 * event types for which they are registered.
-	 * </p>
-	 * 
-	 * @param listener the listener
-	 * @param eventMask the bit-wise OR of all event types of interest to the
-	 * listener
-	 * @see IServiceModelEventListener
-	 * @see IServiceModelEvent
-	 * @see #removeEventListener(IServiceModelEventListener)
-	 */
-	public void addEventListener(IServiceModelEventListener listener, int type) {
-		for (int index = 1, pos = 0; index <= IServiceModelEvent.ALL_EVENTS; index <<= 1, pos++) {
-			if ((type & index) == index) {
-				ListenerList list = fEventListeners.get(pos);
-				if (list != null) { // should never be null
-					list.add(listener);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Notify listeners of an event occurrence. Only listeners for the specific
-	 * event type will be notified.
-	 * 
-	 * @param event event to notify
-	 */
-	public void notifyListeners(IServiceModelEvent event) {
-		for (int index = 1, pos = 0; index <= IServiceModelEvent.ALL_EVENTS; index <<= 1, pos++) {
-			if ((event.getType() & index) == index) {
-				ListenerList list = fEventListeners.get(pos);
-				if (list != null) { // should never be null
-					for (Object obj : list.getListeners()) {
-						((IServiceModelEventListener)obj).handleEvent(event);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Removes the given listener for service model events. Has no effect if the 
-	 * listener is not registered. 
-	 * <p>
-	 * @param listener the listener
-	 * @see IServiceModelEventListener
-	 * @see IServiceModelEvent
-	 * @see #addEventListener(IServiceModelEventListener)
-	 */
-	public void removeEventListener(IServiceModelEventListener listener) {
-		for (ListenerList list : fEventListeners) {
-			list.remove(listener);
-		}
-	}
-}
diff --git a/core/org.eclipse.ptp.services.test/.classpath b/core/org.eclipse.ptp.services.test/.classpath
deleted file mode 100755
index 9c15632..0000000
--- a/core/org.eclipse.ptp.services.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="build"/>
-</classpath>
diff --git a/core/org.eclipse.ptp.services.test/.project b/core/org.eclipse.ptp.services.test/.project
deleted file mode 100644
index 91d7057..0000000
--- a/core/org.eclipse.ptp.services.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.services.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/core/org.eclipse.ptp.services.test/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.services.test/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 69193f2..0000000
--- a/core/org.eclipse.ptp.services.test/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Jun 12 12:21:56 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.ptp.services.test/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.services.test/META-INF/MANIFEST.MF
deleted file mode 100755
index 4d8fb9d..0000000
--- a/core/org.eclipse.ptp.services.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: PTP Services Test Plug-in
-Bundle-SymbolicName: org.eclipse.ptp.services.test;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.junit4;bundle-version="4.3.1",
- org.eclipse.ptp.services.core,
- org.eclipse.ptp.services.ui,
- org.eclipse.core.resources;bundle-version="3.4.0",
- org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.ui;bundle-version="3.4.0"
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.ptp.services.test.Activator
-Export-Package: org.eclipse.ptp.services.test,
- org.eclipse.ptp.services.test.handlers
diff --git a/core/org.eclipse.ptp.services.test/build.properties b/core/org.eclipse.ptp.services.test/build.properties
deleted file mode 100755
index b697fb4..0000000
--- a/core/org.eclipse.ptp.services.test/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/

-output.. = build/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml

diff --git a/core/org.eclipse.ptp.services.test/plugin.xml b/core/org.eclipse.ptp.services.test/plugin.xml
deleted file mode 100755
index 819bdd5..0000000
--- a/core/org.eclipse.ptp.services.test/plugin.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.services.core.services">
-      <service
-            id="TestService1"
-            name="Test Service 1">
-      </service>
-      <service
-            id="TestService2"
-            name="Test Service 2">
-      </service>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.services.core.providers">
-      <provider
-            class="org.eclipse.ptp.services.test.TestServiceProvider"
-            id="TestProvider1"
-            name="Test Provider 1"
-            priority="100"
-            serviceId="TestService1">
-      </provider>
-      <provider
-            class="org.eclipse.ptp.services.test.TestServiceProvider2"
-            id="TestProvider2"
-            name="Test Provider 2"
-            priority="1"
-            serviceId="TestService1">
-      </provider>
-      <provider
-            class="org.eclipse.ptp.services.test.TestServiceProvider3"
-            id="TestProvider3"
-            name="Test Provider 3"
-            priority="1"
-            serviceId="TestService2">
-      </provider>
-   </extension>
-
-
-      <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu?after=additions">
-         <menu
-               id="org.eclipse.ptp.services.ui.menus.servicesMenu"
-               label="Services"
-               mnemonic="M">
-            <command
-                  commandId="org.eclipse.ptp.services.ui.commands.launchWizard"
-                  id="org.eclipse.ptp.services.ui.menus.launchWizard"
-                  mnemonic="S">
-            </command>
-            <command
-                  commandId="org.eclipse.ptp.services.test.commands.printServiceModel"
-                  id="org.eclipse.ptp.services.test.menus.printServiceModel"
-                  style="push">
-            </command>
-         </menu>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            id="org.eclipse.ptp.services.ui.commands.category"
-            name="Services Category">
-      </category>
-      <command
-            categoryId="org.eclipse.ptp.services.ui.commands.category"
-            id="org.eclipse.ptp.services.ui.commands.launchWizard"
-            name="Launch Wizard...">
-      </command>
-      <command
-            categoryId="org.eclipse.ptp.services.ui.commands.category"
-            id="org.eclipse.ptp.services.test.commands.printServiceModel"
-            name="Print Service Model">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.ptp.services.ui.handlers.LaunchWizardHandler"
-            commandId="org.eclipse.ptp.services.ui.commands.launchWizard">
-      </handler>
-      <handler
-            class="org.eclipse.ptp.services.test.handlers.PrintServiceModelHandler"
-            commandId="org.eclipse.ptp.services.test.commands.printServiceModel">
-      </handler>
-   </extension>
-   
-</plugin>
diff --git a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/Activator.java b/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/Activator.java
deleted file mode 100644
index fee9e0b..0000000
--- a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/Activator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.ptp.services.test;
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.services.test"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	public void log(Throwable e) {
-		log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "Error", e)); //$NON-NLS-1$
-	}
-
-	public void log(IStatus status) {
-		getLog().log(status);
-	}
-	
-	public void logErrorMessage(String message) {
-		log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, message, null));
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/ServiceModelManagerTests.java b/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/ServiceModelManagerTests.java
deleted file mode 100755
index 9b42d07..0000000
--- a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/ServiceModelManagerTests.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.IServiceProviderDescriptor;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ServiceModelManagerTests {
-	IProject fProject;
-	IServiceConfiguration fConfig;
-	IService fService1;
-	IService fService2;
-	
-	void persistAndReplaceModel() throws CoreException, IOException {
-		File file = File.createTempFile("serviceModelTest", ".txt"); //$NON-NLS-1$ //$NON-NLS-2$
-		
-		ServiceModelManager manager = ServiceModelManager.getInstance();
-		
-		Writer writer = new BufferedWriter(new FileWriter(file));
-		try {
-			manager.saveModelConfiguration(writer);
-		} finally {
-			writer.close();
-		}
-		
-		Reader reader = new BufferedReader(new FileReader(file));
-		try {
-			manager.loadModelConfiguration(reader);
-		} finally {
-			reader.close();
-		}
-	}
-	
-	void addProvider(String providerId, IService service, IServiceConfiguration config) {
-		IServiceModelManager manager = ServiceModelManager.getInstance();
-		IServiceProviderDescriptor descriptor = service.getProviderDescriptor(providerId);
-		IServiceProvider provider = manager.getServiceProvider(descriptor);
-		config.setServiceProvider(service, provider);
-	}
-	
-	@Before
-	public void setUp() throws Exception {
-		fProject = ResourcesPlugin.getWorkspace().getRoot().getProject("testProject");
-		fProject.create(new NullProgressMonitor());
-		fConfig = ServiceModelManager.getInstance().newServiceConfiguration("myconf"); //$NON-NLS-1$
-	}
-	
-	@After
-	public void tearDown() throws Exception {
-		fProject.delete(true, new NullProgressMonitor());
-	}
-	
-	
-	@Test
-	public void testMultipleServices() throws Exception {
-		IServiceModelManager manager = ServiceModelManager.getInstance();
-		
-		fService1 = manager.getService("TestService1"); //$NON-NLS-1$
-		addProvider("TestProvider2", fService1, fConfig); //$NON-NLS-1$
-
-		fService2 = manager.getService("TestService2"); //$NON-NLS-1$
-		addProvider("TestProvider3", fService2, fConfig); //$NON-NLS-1$
-
-		manager.addConfiguration(fProject, fConfig);
-		
-		persistAndReplaceModel();
-		
-		IServiceConfiguration config = manager.getConfiguration(fProject, fConfig.getName());
-		assertNotSame(fConfig, config);
-		Set<IService> services = fConfig.getServices();
-		assertEquals(2, services.size());
-		for (IService service : services) {
-			if (service.getId().equals(fService1.getId())) {
-				assertServicesEquals(fService1, service, fConfig, config);
-			} else {
-				assertServicesEquals(fService2, service, fConfig, config);
-			}
-		}
-	}
-	
-	private static void assertServicesEquals(IService expected, IService actual, IServiceConfiguration expectedConfig, IServiceConfiguration actualConfig) {
-		assertEquals(expected.getId(), actual.getId());
-		IServiceProvider provider = expectedConfig.getServiceProvider(actual);
-		IServiceProvider provider2 = actualConfig.getServiceProvider(actual);
-		assertEquals(provider.getId(), provider2.getId());
-	}
-
-	@Test
-	public void testOneProvider() throws Exception {
-		IServiceModelManager manager = ServiceModelManager.getInstance();
-		
-		fService1 = manager.getService("TestService1"); //$NON-NLS-1$
-		addProvider("TestProvider2", fService1, fConfig); //$NON-NLS-1$
-		manager.addConfiguration(fProject, fConfig);
-		
-		persistAndReplaceModel();
-		
-		IServiceConfiguration config = manager.getConfiguration(fProject, fConfig.getName());
-		assertNotSame(fConfig, config);
-		Set<IService> services = fConfig.getServices();
-		assertEquals(1, services.size());
-		IService service = services.iterator().next();
-		assertServicesEquals(fService1, service, fConfig, config);
-	}
-}
diff --git a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider.java b/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider.java
deleted file mode 100755
index d8ee705..0000000
--- a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.test;
-
-import org.eclipse.ptp.services.core.ServiceProvider;
-import org.eclipse.ui.IMemento;
-
-public class TestServiceProvider extends ServiceProvider {
-	
-	public TestServiceProvider() {
-	}
-	
-	public boolean isConfigured() {
-		return true;
-	}
-
-	public void restoreState(IMemento providerMemento) {
-	}
-
-	public void saveState(IMemento providerMemento) {
-	}
-}
diff --git a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider2.java b/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider2.java
deleted file mode 100755
index 1b32f89..0000000
--- a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider2.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.test;
-
-import org.eclipse.ptp.services.core.ServiceProvider;
-import org.eclipse.ui.IMemento;
-
-public class TestServiceProvider2 extends ServiceProvider {
-
-	public TestServiceProvider2() {
-	}
-
-	public boolean isConfigured() {
-		return false;
-	}
-
-	public void restoreState(IMemento providerMemento) {
-	}
-
-	public void saveState(IMemento providerMemento) {
-	}
-}
diff --git a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider3.java b/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider3.java
deleted file mode 100755
index 3daa8a6..0000000
--- a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider3.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.test;
-
-import org.eclipse.ptp.services.core.ServiceProvider;
-import org.eclipse.ui.IMemento;
-
-public class TestServiceProvider3 extends ServiceProvider {
-
-	public TestServiceProvider3() {
-	}
-
-	public boolean isConfigured() {
-		return true;
-	}
-
-	public void restoreState(IMemento providerMemento) {
-	}
-
-	public void saveState(IMemento providerMemento) {
-	}
-}
diff --git a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/handlers/PrintServiceModelHandler.java b/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/handlers/PrintServiceModelHandler.java
deleted file mode 100644
index 4e708d7..0000000
--- a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/handlers/PrintServiceModelHandler.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.eclipse.ptp.services.test.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-
-
-public class PrintServiceModelHandler extends AbstractHandler {
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ServiceModelManager.getInstance().printServiceModel();
-		return null;
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/.classpath b/core/org.eclipse.ptp.services.ui/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/core/org.eclipse.ptp.services.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/core/org.eclipse.ptp.services.ui/.project b/core/org.eclipse.ptp.services.ui/.project
deleted file mode 100644
index 28a6be5..0000000
--- a/core/org.eclipse.ptp.services.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.services.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/core/org.eclipse.ptp.services.ui/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.services.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4abb5c1..0000000
--- a/core/org.eclipse.ptp.services.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Jun 05 18:42:17 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.ptp.services.ui/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.services.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7f7ce76..0000000
--- a/core/org.eclipse.ptp.services.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.ptp.services.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.services.ui.Activator
-Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ptp.services.core;bundle-version="1.0.0"
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.ptp.services.ui,
- org.eclipse.ptp.services.ui.dialogs,
- org.eclipse.ptp.services.ui.handlers,
- org.eclipse.ptp.services.ui.messages,
- org.eclipse.ptp.services.ui.wizards
diff --git a/core/org.eclipse.ptp.services.ui/about.html b/core/org.eclipse.ptp.services.ui/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/core/org.eclipse.ptp.services.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation 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
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.services.ui/build.properties b/core/org.eclipse.ptp.services.ui/build.properties
deleted file mode 100644
index bc3b0f2..0000000
--- a/core/org.eclipse.ptp.services.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
diff --git a/core/org.eclipse.ptp.services.ui/icons/etool16/new_hpc_proj.gif b/core/org.eclipse.ptp.services.ui/icons/etool16/new_hpc_proj.gif
deleted file mode 100644
index 930d58d..0000000
--- a/core/org.eclipse.ptp.services.ui/icons/etool16/new_hpc_proj.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.services.ui/plugin.properties b/core/org.eclipse.ptp.services.ui/plugin.properties
deleted file mode 100644
index b06478d..0000000
--- a/core/org.eclipse.ptp.services.ui/plugin.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#Properties file for org.eclipse.ptp.rdt.services
-Bundle-Vendor.0 = eclipse.org
-Bundle-Name.0 = PTP Services Model UI Plug-in
-
-ServicesViewCategory.name = Services
-ServiceConfigurationView.name = Service Configurations
-AddServiceConfiguration.label = Add...
-EditServiceConfiguration.label = Edit
-RemoveServiceConfiguration.label = Remove
-SetActiveServiceConfiguration.label = Set Active
diff --git a/core/org.eclipse.ptp.services.ui/plugin.xml b/core/org.eclipse.ptp.services.ui/plugin.xml
deleted file mode 100644
index 981abe5..0000000
--- a/core/org.eclipse.ptp.services.ui/plugin.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension-point id="providerContributors" name="Service Provider Contributors" schema="schema/providerContributors.exsd"/>
-   <extension-point id="serviceContributors" name="Service Contributors" schema="schema/serviceContributors.exsd"/>
-   <extension-point id="wizardExtensions" name="Service Configuration Wizard Extensions" schema="schema/wizardExtensions.exsd"/>
-   <extension
-		point="org.eclipse.ui.views">
-      <category
-		name="%ServicesViewCategory.name"
-		id="org.eclipse.ptp.services.ui.views">
-	 </category>
-  	 <view
-        category="org.eclipse.ptp.services.ui.views"
-        class="org.eclipse.ptp.services.ui.views.ServiceConfigurationView"
-        id="org.eclipse.ptp.services.ui.views.serviceConfigurationView"
-        name="%ServiceConfigurationView.name">
-     </view>
-   </extension>
-   <extension
-         point="org.eclipse.ui.propertyPages">
-      <page
-            class="org.eclipse.ptp.services.ui.ServiceConfigurationPropertyPage"
-            id="org.eclipse.ptp.services.ui.properties"
-            name="Service Configurations">
-         <enabledWhen>
-            <instanceof
-                  value="org.eclipse.core.resources.IProject">
-            </instanceof>
-         </enabledWhen>
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            category="org.eclipse.ptp.ui.preferences.ptpPreferencesPage"
-            class="org.eclipse.ptp.services.ui.preferences.ServiceConfigurationPreferencePage"
-            id="org.eclipse.ptp.services.ui.ServiceConfigurationPreference"
-            name="Service Configuration">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.adapters">
-      <factory
-            adaptableType="org.eclipse.ptp.services.core.IServiceConfiguration"
-            class="org.eclipse.ptp.services.internal.ui.adapters.ServiceModelWorkbenchAdapterFactory">
-         <adapter
-               type="org.eclipse.ui.model.IWorkbenchAdapter">
-         </adapter>
-         <adapter
-               type="org.eclipse.ui.model.IWorkbenchAdapter2">
-         </adapter>
-      </factory>
-      <factory
-            adaptableType="org.eclipse.ptp.services.core.IServiceProvider"
-            class="org.eclipse.ptp.services.internal.ui.adapters.ServiceModelWorkbenchAdapterFactory">
-         <adapter
-               type="org.eclipse.ui.model.IWorkbenchAdapter">
-         </adapter>
-         <adapter
-               type="org.eclipse.ui.model.IWorkbenchAdapter2">
-         </adapter>
-      </factory>
-      <factory
-            adaptableType="org.eclipse.ptp.services.core.IServiceModelManager"
-            class="org.eclipse.ptp.services.internal.ui.adapters.ServiceModelWorkbenchAdapterFactory">
-         <adapter
-               type="org.eclipse.ui.model.IWorkbenchAdapter">
-         </adapter>
-         <adapter
-               type="org.eclipse.ui.model.IWorkbenchAdapter2">
-         </adapter>
-      </factory>
-   </extension>
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            adaptable="false"
-            id="org.eclipse.ptp.services.ui.serviceConfiguration.popupMenu"
-            objectClass="org.eclipse.ptp.services.core.IServiceConfiguration">
-         <action
-               class="org.eclipse.ptp.services.internal.ui.actions.EditServiceConfigurationAction"
-               enablesFor="1"
-               id="org.eclipse.ptp.services.ui.actions.editServiceConfiguration"
-               label="%EditServiceConfiguration.label">
-         </action>
-         <action
-               class="org.eclipse.ptp.services.internal.ui.actions.RemoveServiceConfigurationAction"
-               enablesFor="+"
-               id="org.eclipse.ptp.services.ui.actions.removeServiceConfiguration"
-               label="%RemoveServiceConfiguration.label">
-         </action>
-         <action
-               class="org.eclipse.ptp.services.internal.ui.actions.SelectActiveServiceConfigurationAction"
-               enablesFor="1"
-               id="org.eclipse.ptp.services.ui.actions.selectActiveServiceConfiguration"
-               label="%SetActiveServiceConfiguration.label">
-         </action>
-      </objectContribution>
-      <viewerContribution
-            id="org.eclipse.ptp.services.ui.serviceConfiguration.popupMenu2"
-            targetID="org.eclipse.ptp.services.ui.views.serviceConfigurationView">
-         <action
-               class="org.eclipse.ptp.services.internal.ui.actions.AddServiceConfigurationAction"
-               enablesFor="*"
-               id="org.eclipse.ptp.services.ui.actions.addServiceConfiguration"
-               label="%AddServiceConfiguration.label">
-         </action>
-      </viewerContribution>
-   </extension>
-</plugin>
diff --git a/core/org.eclipse.ptp.services.ui/schema/providerContributors.exsd b/core/org.eclipse.ptp.services.ui/schema/providerContributors.exsd
deleted file mode 100644
index 8efc764..0000000
--- a/core/org.eclipse.ptp.services.ui/schema/providerContributors.exsd
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.services.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.services.ui" id="providerConfigurations" name="Service Provider Configuration UIs"/>
-      </appInfo>
-      <documentation>
-         Extension point to specify configuration UIs for service providers.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="providerContributor"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="providerContributor">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the ID of the service provider making this contribution.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  a fully qualified name of the Java class implementing &lt;samp&gt;org.eclipse.ptp.services.ui.IServiceProviderContributor&lt;/samp&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.services.ui.IServiceProviderContributor"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="configurationUIClass" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.services.ui.IServiceProviderConfiguration"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         3.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/core/org.eclipse.ptp.services.ui/schema/serviceContributors.exsd b/core/org.eclipse.ptp.services.ui/schema/serviceContributors.exsd
deleted file mode 100644
index 78b1d06..0000000
--- a/core/org.eclipse.ptp.services.ui/schema/serviceContributors.exsd
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.services.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.services.ui" id="serviceContributions" name="Service Contributions"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="serviceContributor"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="serviceContributor">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  the ID of the service making this UI conribution.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  a fully qualified name of the Java class implementing &lt;samp&gt;org.eclipse.ptp.services.ui.IServiceContributor&lt;/samp&gt;.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.services.ui.IServiceContributor"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiinfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/core/org.eclipse.ptp.services.ui/schema/wizardExtensions.exsd b/core/org.eclipse.ptp.services.ui/schema/wizardExtensions.exsd
deleted file mode 100644
index 4330a78..0000000
--- a/core/org.eclipse.ptp.services.ui/schema/wizardExtensions.exsd
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.ptp.services.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.services.ui" id="wizardExtensions" name="Service Configuration Wizard Extensions"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appInfo>
-            <meta.element />
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="wizardExtension"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="wizardExtension">
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.jface.wizard.IWizard"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiinfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/AddServiceConfigurationAction.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/AddServiceConfigurationAction.java
deleted file mode 100644
index be74bf4..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/AddServiceConfigurationAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.services.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class AddServiceConfigurationAction implements IViewActionDelegate {
-	
-	private IServiceModelManager fManager = ServiceModelManager.getInstance();
-	private IServiceConfiguration fConfiguration = null;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		IStructuredSelection structSel = (IStructuredSelection)selection;
-		if (structSel.size() == 1) {
-			Object selected = structSel.getFirstElement();
-			if (selected instanceof IServiceConfiguration) {
-				fConfiguration = (IServiceConfiguration)selected;
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		// Nothing
-	}
-
-	public void init(IViewPart view) {
-		// TODO Auto-generated method stub
-		
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/EditServiceConfigurationAction.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/EditServiceConfigurationAction.java
deleted file mode 100644
index 9e6a98f..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/EditServiceConfigurationAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.services.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class EditServiceConfigurationAction implements IObjectActionDelegate {
-	
-	private IServiceModelManager fManager = ServiceModelManager.getInstance();
-	private IServiceConfiguration fConfiguration = null;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		IStructuredSelection structSel = (IStructuredSelection)selection;
-		if (structSel.size() == 1) {
-			Object selected = structSel.getFirstElement();
-			if (selected instanceof IServiceConfiguration) {
-				fConfiguration = (IServiceConfiguration)selected;
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		// Nothing
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/RemoveServiceConfigurationAction.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/RemoveServiceConfigurationAction.java
deleted file mode 100644
index aa41ff8..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/RemoveServiceConfigurationAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.services.internal.ui.actions;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class RemoveServiceConfigurationAction implements IObjectActionDelegate {
-	
-	private IServiceModelManager fManager = ServiceModelManager.getInstance();
-	private List<IServiceConfiguration> fConfigurations = new ArrayList<IServiceConfiguration>();
-	private IWorkbenchPart fWorkbenchPart;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		String names = ""; //$NON-NLS-1$
-		for (int i = 0; i < fConfigurations.size(); i++) {
-			if (i > 0) {
-				names += ", "; //$NON-NLS-1$
-			}
-			names += "\n\t" + fConfigurations.get(i).getName(); //$NON-NLS-1$
-		}
-		
-		boolean remove = MessageDialog.openConfirm(fWorkbenchPart.getSite().getShell(),
-				Messages.RemoveServiceConfigurationAction_0,
-				Messages.RemoveServiceConfigurationAction_1
-				+ names);
-		
-		if (remove) {
-			for (IServiceConfiguration conf : fConfigurations) {
-				fManager.remove(conf);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		fConfigurations.clear();
-		IStructuredSelection structSel = (IStructuredSelection)selection;
-		for (Object selected : structSel.toArray()) {
-			if (selected instanceof IServiceConfiguration) {
-				fConfigurations.add((IServiceConfiguration)selected);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		fWorkbenchPart = targetPart;
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/SelectActiveServiceConfigurationAction.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/SelectActiveServiceConfigurationAction.java
deleted file mode 100644
index bda7a4c..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/actions/SelectActiveServiceConfigurationAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial Implementation
- *
- */
-package org.eclipse.ptp.services.internal.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class SelectActiveServiceConfigurationAction implements IObjectActionDelegate {
-	
-	private IServiceModelManager fManager = ServiceModelManager.getInstance();
-	private IServiceConfiguration fConfiguration = null;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		fManager.setActiveConfiguration(fConfiguration);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		IStructuredSelection structSel = (IStructuredSelection)selection;
-		if (structSel.size() == 1) {
-			Object selected = structSel.getFirstElement();
-			if (selected instanceof IServiceConfiguration) {
-				fConfiguration = (IServiceConfiguration)selected;
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		// Nothing
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceConfigurationWorkbenchAdapter.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceConfigurationWorkbenchAdapter.java
deleted file mode 100644
index d5aae05..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceConfigurationWorkbenchAdapter.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.internal.ui.adapters;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-public class ServiceConfigurationWorkbenchAdapter extends WorkbenchAdapter {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getChildren(java.lang.Object)
-	 */
-	@Override
-	public Object[] getChildren(Object parentElement) {
-		IServiceConfiguration conf = getServiceConfiguration(parentElement);
-		if (conf != null) {
-			Set<IServiceProvider> providers = new HashSet<IServiceProvider>();
-			for (IService service : conf.getServices()) {
-				providers.add(conf.getServiceProvider(service));
-			}
-			return providers.toArray();
-		}
-		return null;
-	}
-
-	/**
-	 * @param parentElement
-	 * @return
-	 */
-	private IServiceConfiguration getServiceConfiguration(Object parentElement) {
-		IServiceConfiguration conf = null;
-		if (parentElement instanceof IAdaptable) {
-			conf = (IServiceConfiguration) ((IAdaptable) parentElement).getAdapter(IServiceConfiguration.class);
-		}
-		return conf;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getImageDescriptor(java.lang.Object)
-	 */
-	@Override
-	public ImageDescriptor getImageDescriptor(Object object) {
-//		ResourceManagerAttributes.State status = ((IResourceManager) object).getState();
-//		return new ImageImageDescriptor(ParallelImages.rmImages[status.ordinal()]);
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getLabel(java.lang.Object)
-	 */
-	@Override
-	public String getLabel(Object object) {
-		final IServiceConfiguration conf = (IServiceConfiguration) object;
-		return conf.getName();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getParent(java.lang.Object)
-	 */
-	@Override
-	public Object getParent(Object object) {
-		return ServiceModelManager.getInstance();
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceModelWorkbenchAdapter.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceModelWorkbenchAdapter.java
deleted file mode 100644
index f3688ab..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceModelWorkbenchAdapter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.internal.ui.adapters;
-
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-public class ServiceModelWorkbenchAdapter extends WorkbenchAdapter {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getChildren(java.lang.Object)
-	 */
-	@Override
-	public Object[] getChildren(Object parentElement) {
-		return ((IServiceModelManager)parentElement).getConfigurations().toArray();
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceModelWorkbenchAdapterFactory.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceModelWorkbenchAdapterFactory.java
deleted file mode 100644
index 440077c..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceModelWorkbenchAdapterFactory.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.internal.ui.adapters;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.ui.model.IWorkbenchAdapter2;
-
-public class ServiceModelWorkbenchAdapterFactory implements IAdapterFactory {
-
-	private static final ServiceModelWorkbenchAdapter SERVICE_MODEL_WORKBENCH_ADAPTER =
-		new ServiceModelWorkbenchAdapter();
-	private static final ServiceConfigurationWorkbenchAdapter SERVICE_CONFIGURATION_WORKBENCH_ADAPTER =
-		new ServiceConfigurationWorkbenchAdapter();
-	private static final ServiceProviderWorkbenchAdapter SERVICE_PROVIDER_WORKBENCH_ADAPTER =
-		new ServiceProviderWorkbenchAdapter();
-
-	public Object getAdapter(Object adaptableObject, 
-			@SuppressWarnings("unchecked") Class adapterType) {
-		if (adapterType == IWorkbenchAdapter.class || adapterType == IWorkbenchAdapter2.class) {
-			if (adaptableObject instanceof IServiceModelManager) {
-				return SERVICE_MODEL_WORKBENCH_ADAPTER;
-			}
-			if (adaptableObject instanceof IServiceConfiguration) {
-				return SERVICE_CONFIGURATION_WORKBENCH_ADAPTER;
-			}
-			if (adaptableObject instanceof IServiceProvider) {
-				return SERVICE_PROVIDER_WORKBENCH_ADAPTER;
-			}
-		}
-		return null;
-	}
-
-	@SuppressWarnings("unchecked")
-	public Class[] getAdapterList() {
-		return new Class[] {IWorkbenchAdapter.class, IWorkbenchAdapter2.class};
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceProviderWorkbenchAdapter.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceProviderWorkbenchAdapter.java
deleted file mode 100644
index dac115b..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceProviderWorkbenchAdapter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.internal.ui.adapters;
-
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-public class ServiceProviderWorkbenchAdapter extends WorkbenchAdapter {
-	private IServiceModelManager fManager = ServiceModelManager.getInstance();
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getLabel(java.lang.Object)
-	 */
-	@Override
-	public String getLabel(Object object) {
-		IServiceProvider provider = (IServiceProvider)object;
-		return provider.getName() + " (" + fManager.getService(provider.getServiceId()).getName() + " Service)"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/Activator.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/Activator.java
deleted file mode 100644
index 58a8070..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/Activator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.ptp.services.ui;
-
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.services.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	public void log(Throwable e) {
-		log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, "Error", e)); //$NON-NLS-1$
-	}
-
-	public void log(IStatus status) {
-		getLog().log(status);
-	}
-	
-	public void log(String message) {
-		log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, message, null));
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceContributor.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceContributor.java
deleted file mode 100644
index 7fd51a6..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceContributor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.ui;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceProvider;
-
-/**
- * Interface that supplies wizard pages to configure a service.
- *
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- * @see IServiceProvider
- */
-public interface IServiceContributor {
-	/**
-	 * Retrieve the wizard pages to be displayed prior to configuring a provider
-	 * for the service.
-	 * 
-	 * @param service
-	 * @return wizard pages for the services.
-	 */
-	public WizardPage[] getWizardPages(IService service);
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceProviderConfiguration.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceProviderConfiguration.java
deleted file mode 100644
index 7d97c06..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceProviderConfiguration.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.ui;
-
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Interface that supplies a UI which can be launched to configure a service provider.
- *
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- * @deprecated
- * @see IServiceProviderContributor
- */
-public interface IServiceProviderConfiguration {
-	/**
-	 * Configure the service provider, which typically launches a dialog/wizard to allow the 
-	 * service provider to be configured (may include setting up and associating any required connections)
-	 * 
-	 * @param provider
-	 * @param parentShell parent SWT shell of the UI that is to be launched
-	 */
-	public void configureServiceProvider(IServiceProvider provider, Shell parentShell);
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceProviderContributor.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceProviderContributor.java
deleted file mode 100644
index 60e0def..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceProviderContributor.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.ui;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Interface that supplies a UI which can be launched to configure a service provider.
- *
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- * @see IServiceProvider
- */
-public interface IServiceProviderContributor {
-	/**
-	 * Configure the service provider, which typically launches a dialog/wizard to allow the 
-	 * service provider to be configured (may include setting up and associating any required connections)
-	 * 
-	 * @param provider
-	 * @param parentShell parent SWT shell of the UI that is to be launched
-	 * @deprecated
-	 */
-	public void configureServiceProvider(IServiceProvider provider, Shell parentShell);
-	
-	/**
-	 * Retrieve the wizard pages for a service provider
-	 * 
-	 * @param wizard the wizard that will display the pages
-	 * @param provider the provider being configured
-	 * @return wizard pages for the provider
-	 */
-	public WizardPage[] getWizardPages(IWizard wizard, IServiceProvider provider);
-	
-	/**
-	 * Retrieve the wizard for a service provider
-	 * 
-	 * @param provider the provider being configured
-	 * @param page next ServiceConfigurationWizardPage if we are being called by a ServiceConfigurationWizard, or null otherwise
-	 * @return the wizard to configure this provider
-	 */
-	public IWizard getWizard(IServiceProvider provider, IWizardPage page);
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceConfigurationPropertyPage.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceConfigurationPropertyPage.java
deleted file mode 100644
index a6e187e..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceConfigurationPropertyPage.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.ui;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.window.Window;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.ProjectNotConfiguredException;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ptp.services.ui.dialogs.ServiceConfigurationSelectionDialog;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.ptp.services.ui.wizards.ServiceModelWidget;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbenchPropertyPage;
-import org.eclipse.ui.dialogs.PropertyPage;
-
-/**
- * This class implements a project properties page which allows the user to
- * associate service configurations with the project
- * 
- * @author dave
- * 
- */
-public class ServiceConfigurationPropertyPage extends PropertyPage implements
-		IWorkbenchPropertyPage {
-	/**
-	 * Class to handle widget selection events
-	 * 
-	 * @author dave
-	 * 
-	 */
-	private class EventHandler implements SelectionListener {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org
-		 * .eclipse.swt.events.SelectionEvent)
-		 */
-		public void widgetDefaultSelected(SelectionEvent e) {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse
-		 * .swt.events.SelectionEvent)
-		 */
-		public void widgetSelected(SelectionEvent e) {
-			Object source;
-
-			source = e.getSource();
-			if (source == serviceConfigurationList) {
-				showSelectedConfiguration();
-			} else if (source == addButton) {
-				addServiceConfiguration();
-			} else if (source == removeButton) {
-				removeServiceConfiguration();
-			}
-		}
-	}
-
-	/**
-	 * Comparator class used to sort service configurations in ascending order
-	 * by name
-	 * 
-	 * @author dave
-	 * 
-	 */
-	private class ServiceConfigurationComparator implements Comparator {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-		 */
-		public int compare(Object o1, Object o2) {
-			return ((IServiceConfiguration) o1).getName().compareTo(
-					((IServiceConfiguration) o2).getName());
-		}
-	}
-
-	private Button addButton;
-	private IServiceConfiguration currentConfig;
-	private Vector<IServiceConfiguration> deletedServiceConfigurations;
-	private EventHandler eventHandler;
-	private Composite propertiesPane;
-	private Button removeButton;
-	private ServiceConfigurationComparator serviceConfigurationComparator;
-	private Table serviceConfigurationList;
-	private Composite serviceModelPane;
-	private ServiceModelWidget serviceModelWidget;
-	private Composite widgetPane;
-
-	/**
-	 * Create the service configuration properties page
-	 */
-	public ServiceConfigurationPropertyPage() {
-		super();
-		serviceConfigurationComparator = new ServiceConfigurationComparator();
-	}
-
-	/**
-	 * Add a new service configuration to the list of service configurations
-	 * used by this project
-	 */
-	private void addServiceConfiguration() {
-		ServiceConfigurationSelectionDialog dialog;
-		int status;
-		Set<IServiceConfiguration> configs;
-
-		// Display a dialog containing a list of available service
-		// configurations
-		try {
-			configs = ServiceModelManager.getInstance().getConfigurations(
-					getProject());
-		} catch (ProjectNotConfiguredException e) {
-			configs = new HashSet<IServiceConfiguration>();
-		}
-		dialog = new ServiceConfigurationSelectionDialog(getShell(), configs);
-		status = dialog.open();
-		if (status == Window.OK) {
-			IServiceConfiguration config;
-			TableItem item;
-
-			config = dialog.getSelectedConfiguration();
-			if (config != null) {
-				item = new TableItem(serviceConfigurationList, 0);
-				item.setData(config);
-				item.setText(config.getName());
-				ServiceModelManager.getInstance().addConfiguration(
-						getProject(), config);
-			}
-		}
-	}
-
-	@Override
-	protected Control createContents(Composite parent) {
-		GridLayout parentPaneLayout;
-		GridLayout propertiesPaneLayout;
-		GridLayout serviceConfigLayout;
-		FillLayout fillLayout;
-		RowLayout buttonLayout;
-		GridData layoutData;
-		Composite serviceConfigurationPane;
-		Composite buttonPane;
-		Control serviceModelControl;
-
-		eventHandler = new EventHandler();
-
-		fillLayout = new FillLayout();
-		layoutData = new GridData(SWT.LEFT, SWT.FILL, false, true);
-
-		// Create a top level composite for the widgets in this panel
-		parentPaneLayout = new GridLayout(1, true);
-		parent.setLayout(parentPaneLayout);
-
-		// Create the properties pane, which will contain the service
-		// configuration list
-		// and the current service configuration
-		propertiesPane = new Composite(parent, SWT.NONE);
-		propertiesPaneLayout = new GridLayout(2, true);
-		propertiesPaneLayout.makeColumnsEqualWidth = false;
-		propertiesPane.setLayout(propertiesPaneLayout);
-
-		// Create the pane for the service configuration list and then create
-		// the service configuration list
-		serviceConfigurationPane = new Composite(propertiesPane, SWT.NONE);
-		serviceConfigLayout = new GridLayout(1, true);
-		serviceConfigurationPane.setLayout(serviceConfigLayout);
-		serviceConfigurationPane.setLayoutData(layoutData);
-
-		serviceConfigurationList = new Table(serviceConfigurationPane,
-				SWT.SINGLE);
-		serviceConfigurationList.setLayoutData(layoutData);
-		serviceConfigurationList.setLinesVisible(true);
-		serviceConfigurationList.addSelectionListener(eventHandler);
-
-		// Create the pane which will contain the current service model
-		serviceModelPane = new Composite(propertiesPane, SWT.NONE);
-		;
-		serviceModelPane.setLayout(fillLayout);
-		serviceModelWidget = new ServiceModelWidget();
-		serviceModelControl = serviceModelWidget
-				.createContents(serviceModelPane);
-
-		// Create the pane and buttons to add and remove service configurations
-		buttonPane = new Composite(serviceConfigurationPane, SWT.NONE);
-		buttonLayout = new RowLayout();
-		buttonLayout.fill = true;
-		buttonLayout.center = false;
-		buttonLayout.justify = true;
-		buttonPane.setLayout(buttonLayout);
-		addButton = new Button(buttonPane, SWT.PUSH);
-		addButton.setText(Messages.ServiceConfigurationPropertyPage_0);
-		addButton.addSelectionListener(eventHandler);
-		removeButton = new Button(buttonPane, SWT.PUSH);
-		removeButton.setText(Messages.ServiceConfigurationPropertyPage_1);
-		removeButton.addSelectionListener(eventHandler);
-
-		widgetPane = propertiesPane;
-		// Fill in the list of service configurations currently used by this
-		// project
-		getProjectConfigurations();
-		return propertiesPane;
-	}
-
-	/**
-	 * Remove selected service configurations from the set of service
-	 * configurations known to the service model manager
-	 */
-	private void deleteServiceConfigurations() {
-		if (deletedServiceConfigurations != null) {
-			for (IServiceConfiguration config : deletedServiceConfigurations) {
-				ServiceModelManager.getInstance().removeConfiguration(
-						getProject(), config);
-			}
-			deletedServiceConfigurations.clear();
-		}
-	}
-
-	/**
-	 * Get the project Object
-	 * 
-	 * @return The project
-	 */
-	private IProject getProject() {
-		Object element = getElement();
-		IProject project = null;
-		if (element instanceof IProject) {
-			project = (IProject) element;
-		} else if (element instanceof IAdaptable) {
-			project = (IProject) ((IAdaptable) element)
-					.getAdapter(IProject.class);
-		}
-		return project;
-
-	}
-
-	/**
-	 * Get the list of service configuration used by this project, sort by name
-	 * and then populate the service configuration list.
-	 */
-	private void getProjectConfigurations() {
-		Object serviceConfigurations[];
-
-		try {
-			serviceConfigurations = ServiceModelManager.getInstance()
-					.getConfigurations(getProject()).toArray();
-			Arrays.sort(serviceConfigurations, serviceConfigurationComparator);
-			for (Object config : serviceConfigurations) {
-				TableItem item;
-
-				item = new TableItem(serviceConfigurationList, 0);
-				item.setData(config);
-				item.setText(0, ((IServiceConfiguration) config).getName());
-			}
-		} catch (ProjectNotConfiguredException e) {
-		}
-	}
-
-	/**
-	 * Delete service configurations when Apply button is pressed
-	 */
-	protected void performApply() {
-		deleteServiceConfigurations();
-		super.performApply();
-	}
-
-	/**
-	 * Delete service configurations when Ok button is pressed
-	 * 
-	 * @return Status from superclass indicating if Ok processing is to continue
-	 */
-	public boolean performOk() {
-		deleteServiceConfigurations();
-		return super.performOk();
-	}
-
-	/**
-	 * Remove the selected service configuration from the project
-	 */
-	private void removeServiceConfiguration() {
-		TableItem selection[];
-		IServiceConfiguration selectedConfig;
-
-		selection = serviceConfigurationList.getSelection();
-		if (selection.length > 0) {
-			selectedConfig = (IServiceConfiguration) selection[0].getData();
-			if (deletedServiceConfigurations == null) {
-				deletedServiceConfigurations = new Vector<IServiceConfiguration>();
-			}
-			// Selected service model is added to vector to be deleted during Ok
-			// or Apply button processing
-			deletedServiceConfigurations.add(selectedConfig);
-			serviceConfigurationList.remove(serviceConfigurationList
-					.getSelectionIndex());
-			serviceModelWidget.setServiceConfiguration(null);
-		}
-	}
-
-	/**
-	 * Show the details for the selected service configuration
-	 */
-	private void showSelectedConfiguration() {
-		TableItem selection[];
-		IServiceConfiguration selectedConfig;
-
-		selection = serviceConfigurationList.getSelection();
-		if (selection.length > 0) {
-			selectedConfig = (IServiceConfiguration) selection[0].getData();
-			if (selectedConfig != currentConfig) {
-				currentConfig = selectedConfig;
-				serviceModelWidget.setServiceConfiguration(selectedConfig);
-			}
-		}
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelUIManager.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelUIManager.java
deleted file mode 100644
index 18c0a4e..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelUIManager.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.ui;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceProviderDescriptor;
-
-/**
- * A singleton class which is the entry point to a service model which represents:
- * - the set of contributed services
- * - the set of providers which provide those services
- * - the service configurations for each project which specify which services are
- * 		mapped to which providers.
- *
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- */
-public class ServiceModelUIManager {
-	private final static String SERVICE_EXTENSION_ID = "serviceContributors"; //$NON-NLS-1$
-	private final static String PROVIDER_EXTENSION_ID = "providerContributors"; //$NON-NLS-1$
-	private final static String WIZARD_EXTENSION_ID = "wizardExtensions"; //$NON-NLS-1$
-	private final static String ATTR_ID = "id"; //$NON-NLS-1$
-	private final static String ATTR_CLASS = "class"; //$NON-NLS-1$
-	private final static String ATTR_UI_CLASS = "configurationUIClass"; //$NON-NLS-1$
-
-	private static ServiceModelUIManager fInstance;
-	
-	public static synchronized ServiceModelUIManager getInstance() {
-		if(fInstance == null)
-			fInstance = new ServiceModelUIManager();
-		return fInstance;
-	}
-	
-	/**
-	 * Get the configuration UI associated with a service.
-	 * 
-	 * @param service service
-	 * @return class implementing IServiceContributor
-	 */
-	public IServiceContributor getServiceContributor(IService service) {
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID,	SERVICE_EXTENSION_ID);
-		if (extensionPoint != null) {
-			for (IExtension extension : extensionPoint.getExtensions()) {
-				for (IConfigurationElement element : extension.getConfigurationElements()) {
-					if (element.getAttribute(ATTR_ID).equals(service.getId())) {
-						try {
-							return (IServiceContributor) element.createExecutableExtension(ATTR_CLASS);
-						} catch (Exception e) {
-							Activator.getDefault().log(e);
-							return null;
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Get the configuration UI associated with a service provider.
-	 * 
-	 * @param desc service provider descriptor
-	 * @return class implementing IServiceProviderContributor
-	 */
-	public IServiceProviderContributor getServiceProviderContributor(IServiceProviderDescriptor desc) {
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID,	PROVIDER_EXTENSION_ID);
-		if (extensionPoint != null) {
-			for (IExtension extension : extensionPoint.getExtensions()) {
-				for (IConfigurationElement element : extension.getConfigurationElements()) {
-					if (element.getAttribute(ATTR_ID).equals(desc.getId())) {
-						try {
-							return (IServiceProviderContributor) element.createExecutableExtension(ATTR_CLASS);
-						} catch (Exception e) {
-							Activator.getDefault().log(e);
-							return null;
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Get any wizard extensions.
-	 * 
-	 * @return IWizard providing a wizard extension
-	 */
-	public IWizard getWizardExtensions() {
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID,	WIZARD_EXTENSION_ID);
-		if (extensionPoint != null) {
-			for (IExtension extension : extensionPoint.getExtensions()) {
-				for (IConfigurationElement element : extension.getConfigurationElements()) {
-					try {
-						return (IWizard) element.createExecutableExtension(ATTR_CLASS);
-					} catch (Exception e) {
-						Activator.getDefault().log(e);
-						return null;
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * @param desc
-	 * @return
-	 * @deprecated
-	 */
-	public IServiceProviderConfiguration getServiceProviderConfigurationUI(IServiceProviderDescriptor desc) {
-		IServiceProviderConfiguration config = null;
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(Activator.PLUGIN_ID,	PROVIDER_EXTENSION_ID);
-		if (extensionPoint != null) {
-			for (IExtension extension : extensionPoint.getExtensions()) {
-				for (IConfigurationElement element : extension.getConfigurationElements()) {
-					if (element.getAttribute(ATTR_ID).equals(desc.getId())) {
-						try {
-							config = (IServiceProviderConfiguration) element.createExecutableExtension(ATTR_UI_CLASS);
-						} catch (Exception e) {
-							return null;
-						}
-					}
-				}
-			}
-		}
-		return config;
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/dialogs/ServiceConfigurationSelectionDialog.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/dialogs/ServiceConfigurationSelectionDialog.java
deleted file mode 100644
index 953e0a9..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/dialogs/ServiceConfigurationSelectionDialog.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.ptp.services.ui.dialogs;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Set;
-
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * Display a dialog prompting the user to select a service configuration to add
- * to the project. Only service configurations not currently used by the project
- * are diplayed.
- * 
- * @author dave
- * 
- */
-public class ServiceConfigurationSelectionDialog extends TitleAreaDialog {
-	/**
-	 * Class to handle widget selection events for this dialog.
-	 * 
-	 * @author dave
-	 * 
-	 */
-	private class EventHandler implements SelectionListener {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org
-		 * .eclipse.swt.events.SelectionEvent)
-		 */
-		public void widgetDefaultSelected(SelectionEvent e) {
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse
-		 * .swt.events.SelectionEvent)
-		 */
-		public void widgetSelected(SelectionEvent e) {
-			TableItem selection[];
-
-			selection = serviceConfigurationList.getSelection();
-			if (selection.length > 0) {
-				selectedConfig = (IServiceConfiguration) selection[0].getData();
-			}
-		}
-	}
-	/**
-	 * Comparator class used to sort service configurations in ascending order
-	 * by name
-	 * 
-	 * @author dave
-	 * 
-	 */
-	private class ServiceConfigurationComparator implements Comparator {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-		 */
-		public int compare(Object o1, Object o2) {
-			return ((IServiceConfiguration) o1).getName().compareTo(
-					((IServiceConfiguration) o2).getName());
-		}
-	}
-	private Table serviceConfigurationList;
-	private IServiceConfiguration selectedConfig;
-	private EventHandler eventHandler;
-
-	private ServiceConfigurationComparator serviceConfigurationComparator;
-
-	private Set<IServiceConfiguration> currentServiceConfigurations;
-
-	/**
-	 * Create a dialog listing the service configurations which can be selected
-	 * for the project
-	 * 
-	 * @param parentShell
-	 *            Shell to use when displaying the dialog
-	 * @param currentConfigs
-	 *            Set of service configurations currently used by the project
-	 */
-	public ServiceConfigurationSelectionDialog(Shell parentShell,
-			Set<IServiceConfiguration> currentConfigs) {
-		super(parentShell);
-		serviceConfigurationComparator = new ServiceConfigurationComparator();
-		currentServiceConfigurations = currentConfigs;
-	}
-
-	/**
-	 * Create the widgets used to display the list of available service
-	 * configurations
-	 * 
-	 * @param parent
-	 *            - The composite widget that is parent to the client area
-	 * @return Top level control for client area
-	 */
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite serviceConfigurationPane;
-		GridLayout layout;
-		GridData layoutData;
-
-		eventHandler = new EventHandler();
-		setTitle(Messages.ServiceConfigurationSelectionDialog_0);
-		setMessage(Messages.ServiceConfigurationSelectionDialog_1, SWT.NONE);
-		serviceConfigurationPane = new Composite(parent, SWT.NONE);
-		layout = new GridLayout(1, true);
-		serviceConfigurationPane.setLayout(layout);
-		layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		serviceConfigurationList = new Table(serviceConfigurationPane,
-				SWT.SINGLE);
-		serviceConfigurationList.setLinesVisible(true);
-		serviceConfigurationList.addSelectionListener(eventHandler);
-		serviceConfigurationList.setLayoutData(layoutData);
-		populateList();
-		return serviceConfigurationPane;
-	}
-
-	/**
-	 * Return the service configuration selected by the user
-	 * 
-	 * @return Selected service configuration
-	 */
-	public IServiceConfiguration getSelectedConfiguration() {
-		return selectedConfig;
-	}
-
-	/**
-	 * Fill in the list of available service configurations. Check if each
-	 * service is already used by the project. If not, then add it to the list
-	 * of available configurations.
-	 */
-	private void populateList() {
-		Object serviceConfigurations[];
-
-		serviceConfigurations = ServiceModelManager.getInstance()
-				.getConfigurations().toArray();
-		Arrays.sort(serviceConfigurations, serviceConfigurationComparator);
-		for (Object config : serviceConfigurations) {
-			TableItem item;
-
-			if (!currentServiceConfigurations.contains(config)) {
-				item = new TableItem(serviceConfigurationList, 0);
-				item.setData(config);
-				item.setText(0, ((IServiceConfiguration) config).getName());
-			}
-		}
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/dialogs/ServicesDialog.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/dialogs/ServicesDialog.java
deleted file mode 100644
index 9a87cb1..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/dialogs/ServicesDialog.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.ui.dialogs;
-
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * @author greg
- *
- */
-public class ServicesDialog extends TitleAreaDialog {
-	protected static final String SERVICE_KEY = "service-id"; //$NON-NLS-1$
-
-	private IService[] fSelectedServices = new IService[0];
-	private Table fTable;
-	private IService[] fServices;
-	
-	public ServicesDialog(Shell parentShell, IService[] services) {
-		super(parentShell);
-		this.fServices = services;
-		setShellStyle(getShellStyle() | SWT.SHEET);
-	}
-	
-	public IService[] getSelectedServices() {
-		return fSelectedServices;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.TitleAreaDialog#createDialogArea(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected Control createDialogArea(Composite parent) {
-        Composite container = (Composite) super.createDialogArea(parent);
-		GridLayout layout = new GridLayout(1, false);
-		container.setLayout(layout);
-
-		setTitle(Messages.ServicesDialog_0);
-		setMessage(Messages.ServicesDialog_1);
-
-		fTable = new Table(container, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-		fTable.setLinesVisible(false);
-		fTable.setHeaderVisible(false);
-		fTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		fTable.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				TableItem[] items = fTable.getSelection();
-				if (items.length == 0) {
-					return;
-				}
-				fSelectedServices = new IService[items.length];
-				for (int index = 0; index < items.length; index++) {
-					fSelectedServices[index] = (IService) items[index].getData(SERVICE_KEY);
-				}
-			}
-		});
-
-		createTableContent();
-		
-		fTable.setVisible(true);
-		return container;
-	}
-	
-	private void createTableContent() {
-		fTable.removeAll();
-		
-		for (IService service : fServices) {
-			TableItem item = new TableItem (fTable, SWT.NONE);
-			item.setText (0, service.getName());
-			item.setData(SERVICE_KEY, service);
-		}
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/handlers/LaunchWizardHandler.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/handlers/LaunchWizardHandler.java
deleted file mode 100644
index 433d7ca..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/handlers/LaunchWizardHandler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.services.ui.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ptp.services.ui.wizards.ServiceConfigurationWizard;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- */
-public class LaunchWizardHandler extends AbstractHandler {
-	private static IServiceConfiguration fConfig = ServiceModelManager.getInstance().newServiceConfiguration("test");
-	
-	/**
-	 * The constructor.
-	 */
-	public LaunchWizardHandler() {
-	}
-
-	/**
-	 * the command has been executed, so extract extract the needed information
-	 * from the application context.
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IWorkbenchWindow window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
-		ServiceConfigurationWizard wizard = new ServiceConfigurationWizard(fConfig);
-		WizardDialog dialog = new WizardDialog(window.getShell(), wizard);
-		dialog.open();
-		return null;
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/Messages.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/Messages.java
deleted file mode 100644
index 47b6bfb..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/Messages.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.services.ui.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME= "org.eclipse.ptp.services.ui.messages.messages";//$NON-NLS-1$
-	
-	public static String RemoveServiceConfigurationAction_0;
-	public static String RemoveServiceConfigurationAction_1;
-
-	public static String SelectActiveServiceConfigurationAction_0;
-
-	public static String ServiceConfigurationPreferencePage_0;
-	public static String ServiceConfigurationPreferencePage_1;
-	public static String ServiceConfigurationPreferencePage_2;
-	public static String ServiceConfigurationPreferencePage_3;
-	public static String ServiceConfigurationPreferencePage_4;
-	public static String ServiceConfigurationPreferencePage_5;
-	public static String ServiceConfigurationPreferencePage_6;
-
-	public static String ServiceConfigurationPropertyPage_0;
-	public static String ServiceConfigurationPropertyPage_1;
-	
-	public static String ServiceConfigurationSelectionDialog_0;
-	public static String ServiceConfigurationSelectionDialog_1;
-	
-	public static String ServiceConfigurationWizard_0;
-	public static String ServiceConfigurationWizard_1;
-	public static String ServiceConfigurationWizard_2;
-	public static String ServiceConfigurationWizard_3;
-	public static String ServiceConfigurationWizard_4;
-	public static String ServiceConfigurationWizard_5;
-	public static String ServiceConfigurationWizard_6;
-
-	public static String ServiceConfigurationWizardPage_0;
-
-	public static String ServiceModelWidget_0;
-	public static String ServiceModelWidget_1;
-	public static String ServiceModelWidget_2;
-	public static String ServiceModelWidget_3;
-	public static String ServiceModelWidget_4;
-	public static String ServiceModelWidget_5;
-	public static String ServiceModelWidget_6;
-	public static String ServiceModelWidget_7;
-
-	public static String ServiceModelWidget_8;
-
-	public static String ServicesDialog_0;
-	public static String ServicesDialog_1;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}	
-
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/messages.properties b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/messages.properties
deleted file mode 100644
index 890759b..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/messages.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-RemoveServiceConfigurationAction_0=Remove Service Configurations
-RemoveServiceConfigurationAction_1=Are you sure you want to remove the following service configuration(s)?\n
-SelectActiveServiceConfigurationAction_0=Set Active Service Configuration
-ServiceConfigurationPreferencePage_0=Service Configuration
-ServiceConfigurationPreferencePage_1=Name
-ServiceConfigurationPreferencePage_2=Project
-ServiceConfigurationPreferencePage_3=Add
-ServiceConfigurationPreferencePage_4=Edit
-ServiceConfigurationPreferencePage_5=Delete
-ServiceConfigurationPreferencePage_6=new config
-ServiceConfigurationPropertyPage_0=Add
-ServiceConfigurationPropertyPage_1=Remove
-ServiceConfigurationSelectionDialog_0=Available Service Configurations
-ServiceConfigurationSelectionDialog_1=Select Service Configuration
-ServiceConfigurationWizard_1=HPC Project Configuration
-ServiceConfigurationWizard_0=This page allows you to make any final additions or configure any remaining services
-ServiceConfigurationWizard_2=This wizard will help you configure Eclipse for HPC application development
-ServiceConfigurationWizard_3=You will be given an opportunity to configure each aspect of the development environment.
-ServiceConfigurationWizard_4=If you make a mistake or configure something incorrectly, simply click on the "Back" button.
-ServiceConfigurationWizard_5=Do not show this page again.
-ServiceConfigurationWizard_6=HPC Project Configuration Wizard
-ServiceConfigurationWizardPage_0=Select a Provider:
-ServiceModelWidget_0=Service
-ServiceModelWidget_1=Provider
-ServiceModelWidget_2=Configure...
-ServiceModelWidget_3=Status
-ServiceModelWidget_4=Not configured
-ServiceModelWidget_5=Configured
-ServiceModelWidget_6=Add...
-ServiceModelWidget_7=Remove
-ServiceModelWidget_8=Service "{0}" has no providers\!
-ServicesDialog_0=Available Services
-ServicesDialog_1=Select a service to add to the configuration
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/preferences/ServiceConfigurationPreferencePage.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/preferences/ServiceConfigurationPreferencePage.java
deleted file mode 100644
index a647c76..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/preferences/ServiceConfigurationPreferencePage.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.ui.preferences;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.ProjectNotConfiguredException;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.ptp.services.ui.wizards.ServiceConfigurationWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * This class implements a preference page which can be used to view a list of
- * service configurations, to create new service configurations or to delete
- * existing service configurations. This page also displays a list of projects
- * using a service configuration.
- * 
- * @author dave
- * 
- */
-public class ServiceConfigurationPreferencePage extends PreferencePage
-		implements IWorkbenchPreferencePage {
-	/**
-	 * This class implements the ICellModifier required in order to make the
-	 * service configuration table editable.
-	 * 
-	 * @author dave
-	 * 
-	 */
-	private class ConfigCellModifier implements ICellModifier {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object,
-		 * java.lang.String)
-		 */
-		public boolean canModify(Object element, String property) {
-			// The table is a single column table which is always editable.
-			return true;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object,
-		 * java.lang.String)
-		 */
-		public Object getValue(Object element, String property) {
-			// Return the existing name of the service configuration. This way,
-			// If the user is just clicking on service configuration names, then
-			// we don't clobber existing names.
-			return ((IServiceConfiguration) element).getName();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object,
-		 * java.lang.String, java.lang.Object)
-		 */
-		public void modify(Object element, String property, Object value) {
-			IServiceConfiguration config;
-			TableItem item;
-			// Update the service configuration name with the selected value
-			item = (TableItem) element;
-			config = (IServiceConfiguration) item.getData();
-			config.setName((String) value);
-			item.setText((String) value);
-		}
-	}
-
-	/**
-	 * Handle widget selection events for this page
-	 * 
-	 * @author dave
-	 * 
-	 */
-	private class EventHandler implements SelectionListener {
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-		}
-
-		/**
-		 * Handle selection events for widgets in this page
-		 * 
-		 * @param e
-		 *            The selection event to be handled
-		 */
-		public void widgetSelected(SelectionEvent e) {
-			Object source;
-
-			source = e.getSource();
-			if (source == addButton) {
-				addServiceConfiguration();
-			} else if (source == editButton) {
-				editServiceConfiguration();
-			} else if (source == removeButton) {
-				removeServiceConfiguration();
-			} else if (source == serviceConfigurationTable) {
-				setSelectedConfig();
-			}
-		}
-
-	}
-
-	/**
-	 * Comparator class used to sort projects in ascending order by name
-	 * 
-	 * @author dave
-	 * 
-	 */
-	private class ProjectComparator implements Comparator {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-		 */
-		public int compare(Object o1, Object o2) {
-			return ((IProject) o1).getName().compareTo(
-					((IProject) o2).getName());
-		}
-	}
-
-	/**
-	 * Comparator class used to sort service configurations in ascending order
-	 * by name
-	 * 
-	 * @author dave
-	 * 
-	 */
-	private class ServiceConfigurationComparator implements Comparator {
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-		 */
-		public int compare(Object o1, Object o2) {
-			return ((IServiceConfiguration) o1).getName().compareTo(
-					((IServiceConfiguration) o2).getName());
-		}
-	}
-
-	private Button addButton;
-	private ConfigCellModifier configCellModifier;
-	private List<IServiceConfiguration> deletedServiceConfigurations;
-	private Button editButton;
-	private EventHandler eventHandler;
-	private TableColumn projectColumn;
-	private ProjectComparator projectComparator;
-	private Table projectTable;
-	private Button removeButton;
-	private IServiceConfiguration selectedConfiguration;
-	private TableItem selectedTableItem;
-	private TableColumn serviceConfigurationColumn;
-	private ServiceConfigurationComparator serviceConfigurationComparator;
-	private Table serviceConfigurationTable;
-	private TableViewer serviceConfigurationViewer;
-
-	public ServiceConfigurationPreferencePage() {
-		super();
-	}
-
-	public ServiceConfigurationPreferencePage(String title) {
-		super(title);
-	}
-
-	public ServiceConfigurationPreferencePage(String title,
-			ImageDescriptor image) {
-		super(title, image);
-	}
-
-	/**
-	 * Add a service configuration to the set of service configurations
-	 */
-	private void addServiceConfiguration() {
-		IServiceConfiguration config;
-		int status;
-
-		// Create a new service configuration then invoke the service
-		// configuration wizard using
-		// this service configuration. If the user presses ok, then add a new
-		// service configuration to
-		// the list.
-		config = ServiceModelManager.getInstance().newServiceConfiguration(
-				Messages.ServiceConfigurationPreferencePage_6);
-		ServiceConfigurationWizard wizard = new ServiceConfigurationWizard(
-				config);
-		WizardDialog dialog = new WizardDialog(getShell(), wizard);
-		status = dialog.open();
-		if (status == Window.OK) {
-			TableItem item;
-
-			item = new TableItem(serviceConfigurationTable, 0);
-			item.setData(config);
-			item.setText(0, config.getName());
-		}
-	}
-
-	/**
-	 * Create the contents for this page
-	 * 
-	 * @param parent
-	 *            - The parent widget for the client area
-	 */
-	@Override
-	protected Control createContents(Composite parent) {
-		Control mainPane;
-
-		mainPane = createWidgets(parent);
-		populateServiceConfigurationList();
-		return mainPane;
-	}
-
-	/**
-	 * Create the widgets for this page
-	 * 
-	 * @param parent
-	 *            The parent widget for the client area
-	 * @return
-	 */
-	private Control createWidgets(Composite parent) {
-		GridLayout layout;
-		Composite preferencePane;
-		Composite buttonPane;
-		TextCellEditor configEditor[];
-		String configProperties[];
-		GridData layoutData;
-		RowLayout buttonLayout;
-
-		eventHandler = new EventHandler();
-
-		preferencePane = new Composite(parent, SWT.NONE);
-		layout = new GridLayout(3, false);
-		layout.marginBottom = 0;
-		layout.marginLeft = 0;
-		layout.marginRight = 0;
-		layout.marginTop = 0;
-		layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		preferencePane.setLayout(layout);
-
-		serviceConfigurationTable = new Table(preferencePane, SWT.SINGLE);
-		serviceConfigurationTable.addSelectionListener(eventHandler);
-		serviceConfigurationTable.setHeaderVisible(true);
-		serviceConfigurationTable.setLinesVisible(true);
-		serviceConfigurationTable.setLayoutData(layoutData);
-
-		serviceConfigurationColumn = new TableColumn(serviceConfigurationTable,
-				SWT.NONE, 0);
-		serviceConfigurationColumn
-				.setText(Messages.ServiceConfigurationPreferencePage_0);
-		serviceConfigurationColumn.pack();
-		serviceConfigurationViewer = new TableViewer(serviceConfigurationTable);
-
-		configEditor = new TextCellEditor[1];
-		configEditor[0] = new TextCellEditor(serviceConfigurationTable);
-		configProperties = new String[1];
-		configProperties[0] = Messages.ServiceConfigurationPreferencePage_1;
-
-		configCellModifier = new ConfigCellModifier();
-		serviceConfigurationViewer.setCellModifier(configCellModifier);
-		serviceConfigurationViewer.setCellEditors(configEditor);
-		serviceConfigurationViewer.setColumnProperties(configProperties);
-		serviceConfigurationTable.addSelectionListener(eventHandler);
-
-		projectTable = new Table(preferencePane, SWT.SINGLE);
-		projectTable.setHeaderVisible(true);
-		projectTable.setLinesVisible(true);
-		projectTable.setLayoutData(layoutData);
-
-		projectColumn = new TableColumn(projectTable, SWT.NONE, 0);
-		projectColumn.setText(Messages.ServiceConfigurationPreferencePage_2);
-		projectColumn.pack();
-
-		buttonPane = new Composite(preferencePane, SWT.NONE);
-		buttonLayout = new RowLayout(SWT.VERTICAL);
-		buttonLayout.fill = true;
-		buttonLayout.center = false;
-		buttonPane.setLayout(buttonLayout);
-
-		addButton = new Button(buttonPane, SWT.PUSH);
-		addButton.setText(Messages.ServiceConfigurationPreferencePage_3);
-		addButton.addSelectionListener(eventHandler);
-		editButton = new Button(buttonPane, SWT.PUSH);
-		editButton.setText(Messages.ServiceConfigurationPreferencePage_4);
-		editButton.addSelectionListener(eventHandler);
-		editButton.setEnabled(false);
-		removeButton = new Button(buttonPane, SWT.PUSH);
-		removeButton.setText(Messages.ServiceConfigurationPreferencePage_5);
-		removeButton.addSelectionListener(eventHandler);
-		removeButton.setEnabled(false);
-
-		return preferencePane;
-	}
-
-	/**
-	 * Remove selected service configurations from the set of service
-	 * configurations known to the service model manager
-	 */
-	private void deleteServiceConfigurations() {
-		if (deletedServiceConfigurations != null) {
-			for (IServiceConfiguration config : deletedServiceConfigurations) {
-				ServiceModelManager.getInstance().remove(config);
-			}
-			deletedServiceConfigurations.clear();
-		}
-	}
-
-	/**
-	 * Edit an existing service configuration
-	 */
-	private void editServiceConfiguration() {
-		ServiceConfigurationWizard wizard;
-		WizardDialog dialog;
-		int status;
-
-		if (selectedConfiguration != null) {
-			wizard = new ServiceConfigurationWizard(selectedConfiguration);
-			dialog = new WizardDialog(getShell(), wizard);
-			status = dialog.open();
-		}
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-
-	/**
-	 * Delete service configurations when Apply button is pressed
-	 */
-	protected void performApply() {
-		deleteServiceConfigurations();
-		super.performApply();
-	}
-
-	/**
-	 * Delete service configurations when Ok button is pressed
-	 * 
-	 * @return Status from superclass indicating if Ok processing is to continue
-	 */
-	public boolean performOk() {
-		deleteServiceConfigurations();
-		return super.performOk();
-	}
-
-	/**
-	 * Fill in the list of service configurations
-	 */
-	private void populateServiceConfigurationList() {
-		Object serviceConfigurations[];
-
-		// Get the service configurations set, sort by name and update the table
-		// with the list
-		serviceConfigurationComparator = new ServiceConfigurationComparator();
-		serviceConfigurations = ServiceModelManager.getInstance()
-				.getConfigurations().toArray();
-		Arrays.sort(serviceConfigurations, serviceConfigurationComparator);
-		for (Object config : serviceConfigurations) {
-			TableItem item;
-
-			item = new TableItem(serviceConfigurationTable, 0);
-			item.setData(config);
-			item.setText(0, ((IServiceConfiguration) config).getName());
-		}
-	}
-
-	/**
-	 * Remove the selected service configuration from the set of service
-	 * configurations
-	 */
-	private void removeServiceConfiguration() {
-		int idx;
-
-		idx = serviceConfigurationTable.indexOf(selectedTableItem);
-		if (idx != -1) {
-			int itemCount;
-
-			serviceConfigurationTable.remove(idx);
-			if (deletedServiceConfigurations == null) {
-				deletedServiceConfigurations = new Vector<IServiceConfiguration>();
-			}
-			// Add deleted service configuration to vector to be processed
-			// when Apply or Ok is pressed.
-			deletedServiceConfigurations.add(selectedConfiguration);
-			itemCount = projectTable.getItemCount();
-			if (itemCount > 0) {
-				projectTable.remove(0, itemCount - 1);
-			}
-		}
-	}
-
-	/**
-	 * Record the selected service configuration and enable the edit and remove
-	 * service configuration buttons.
-	 */
-	private void setSelectedConfig() {
-		TableItem selection[];
-
-		selection = serviceConfigurationTable.getSelection();
-		if (selection.length > 0) {
-			selectedTableItem = selection[0];
-			selectedConfiguration = (IServiceConfiguration) selectedTableItem
-					.getData();
-			showProjectsForConfiguration(selectedConfiguration);
-			editButton.setEnabled(true);
-			removeButton.setEnabled(true);
-		}
-	}
-
-	/**
-	 * Build a list of projects using the selected service configuration, sort
-	 * by project name then update the project table with the list of projects
-	 * 
-	 * @param config
-	 */
-	private void showProjectsForConfiguration(IServiceConfiguration config) {
-		Object projects[];
-
-		projectComparator = new ProjectComparator();
-		projects = ServiceModelManager.getInstance()
-				.getProjectsForConfiguration(config).toArray();
-		Arrays.sort(projects, projectComparator);
-		projectTable.removeAll();
-		for (Object project : projects) {
-			TableItem item;
-
-			item = new TableItem(projectTable, 0);
-			item.setText(((IProject) project).getName());
-		}
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/views/ServiceConfigurationView.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/views/ServiceConfigurationView.java
deleted file mode 100644
index c10983f..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/views/ServiceConfigurationView.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.ui.views;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.resource.FontDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.resource.LocalResourceManager;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelEvent;
-import org.eclipse.ptp.services.core.IServiceModelEventListener;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-import org.eclipse.ui.part.ViewPart;
-
-public class ServiceConfigurationView extends ViewPart {
-
-	/**
-	 * Listener for service configuration selection events.
-	 */
-	private class ServiceModelEventListener implements IServiceModelEventListener {
-		public void handleEvent(IServiceModelEvent event) {
-			refreshViewer();
-		}
-	}
-	
-	private class ServiceConfigurationLabelProvider extends WorkbenchLabelProvider {
-		
-		private Font selectedFont;
-		private Font unSelectedFont;
-		
-		public ServiceConfigurationLabelProvider(Font font) {
-			unSelectedFont = font;
-			FontData fd = font.getFontData()[0];
-			FontData selectedFontData = new FontData(fd.getName(), fd.getHeight(), SWT.BOLD);
-			selectedFont = (Font)new LocalResourceManager(JFaceResources.getResources()).get(FontDescriptor.createFrom(selectedFontData));
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.model.WorkbenchLabelProvider#getFont(java.lang.Object)
-		 */
-		@Override
-		public Font getFont(Object element) {
-			IServiceConfiguration conf = getServiceConfiguration(element);
-			if (conf != null && conf == fManager.getActiveConfiguration()) {
-				return selectedFont;
-			}
-			return unSelectedFont;
-		}
-		
-		private IServiceConfiguration getServiceConfiguration(Object parentElement) {
-			IServiceConfiguration conf = null;
-			if (parentElement instanceof IAdaptable) {
-				conf = (IServiceConfiguration) ((IAdaptable) parentElement).getAdapter(IServiceConfiguration.class);
-			}
-			return conf;
-		}
-	}
-
-	private TreeViewer fViewer;
-	private IServiceModelManager fManager = ServiceModelManager.getInstance();
-
-	public ServiceConfigurationView() {
-		fManager.addEventListener(new ServiceModelEventListener(), 
-				IServiceModelEvent.SERVICE_CONFIGURATION_SELECTED |
-				IServiceModelEvent.SERVICE_CONFIGURATION_ADDED |
-				IServiceModelEvent.SERVICE_CONFIGURATION_REMOVED);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createPartControl(Composite parent) {
-		fViewer = new TreeViewer(parent, SWT.MULTI);
-		fViewer.setContentProvider(new WorkbenchContentProvider());
-		fViewer.setLabelProvider(new ServiceConfigurationLabelProvider(fViewer.getTree().getFont()));
-
-		fViewer.setInput(ServiceModelManager.getInstance());
-
-		createContextMenu();
-
-		// ----------------------------------------------------------------------
-		// Enable property sheet updates when tree items are selected.
-		// Note for this to work each item in the tree must either implement
-		// IPropertySource, or support IPropertySource.class as an adapter type
-		// in its AdapterFactory.
-		// ----------------------------------------------------------------------
-		getSite().setSelectionProvider(fViewer);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#dispose()
-	 */
-	public synchronized void dispose() {
-		super.dispose();
-	}
-
-	public Font getFont() {
-		if (fViewer == null) {
-			return null;
-		}
-		return fViewer.getTree().getFont();
-	}
-
-	/**
-	 * Refresh the tree viewer when the model changes
-	 */
-	public void refreshViewer() {
-		fViewer.getControl().getDisplay().asyncExec(new Runnable(){
-			public void run() {
-				fViewer.refresh();
-			}
-		});
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()
-	 */
-	public void setFocus() {
-		fViewer.getControl().setFocus();
-	}
-	
-	/**
-	 * Create the popup menu
-	 */
-	private void createContextMenu() {
-		MenuManager menuManager = new MenuManager("#PopupMenu", "org.eclipse.ptp.services.ui.views.serviceConfigurationView.contextMenu"); //$NON-NLS-1$
-		menuManager.setRemoveAllWhenShown(true);
-		Menu menu = menuManager.createContextMenu(fViewer.getControl());
-		fViewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(menuManager, fViewer);
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/NewServiceConfigurationProjectWizard.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/NewServiceConfigurationProjectWizard.java
deleted file mode 100644
index faebfb2..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/NewServiceConfigurationProjectWizard.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.services.ui.wizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class NewServiceConfigurationProjectWizard extends Wizard implements INewWizard {
-
-	private class IntroPage extends WizardPage {
-
-		public IntroPage(String pageName) {
-			super(pageName);
-			setTitle(pageName);
-			setDescription(Messages.ServiceConfigurationWizard_2);
-		}
-
-		public void createControl(Composite parent) {
-			Composite canvas = new Composite(parent, SWT.NONE);
-			GridLayout canvasLayout = new GridLayout(1, false);
-			canvas.setLayout(canvasLayout);
-			
-			Label label = new Label(canvas, SWT.NONE);
-			label.setText(Messages.ServiceConfigurationWizard_3);
-			
-			Label label2 = new Label(canvas, SWT.NONE);
-			label2.setText(Messages.ServiceConfigurationWizard_4);
-			
-			Button button = new Button(canvas, SWT.CHECK);
-			button.setText(Messages.ServiceConfigurationWizard_5);
-			GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
-			button.setLayoutData(data);
-			
-			setControl(canvas);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
-		 */
-		@Override
-		public boolean isPageComplete() {
-			return true;
-		}
-		
-	}
-	
-	private IWorkbench fWorkbench = null;
-	private IStructuredSelection fSelection = null;
-	
-	public NewServiceConfigurationProjectWizard() {
-		setForcePreviousAndNextButtons(true);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	@Override
-	public void addPages() {
-		addPage(new IntroPage(Messages.ServiceConfigurationWizard_6));
-		addPage(new ServiceConfigurationSelectionWizardPage("Service Configuration Selection"));
-	}
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		fWorkbench = workbench;
-		fSelection = selection;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		return true;
-	}
-	
-	/**
-	 * @return the Selection
-	 */
-	public IStructuredSelection getSelection() {
-		return fSelection;
-	}
-
-	/**
-	 * @return the Workbench
-	 */
-	public IWorkbench getWorkbench() {
-		return fWorkbench;
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationSelectionWizardPage.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationSelectionWizardPage.java
deleted file mode 100644
index bc9a844..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationSelectionWizardPage.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.services.ui.wizards;
-
-import java.util.Set;
-import java.util.SortedSet;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardNode;
-import org.eclipse.jface.wizard.WizardSelectionPage;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.IServiceProviderDescriptor;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class ServiceConfigurationSelectionWizardPage extends WizardSelectionPage {
-
-	private class ServiceNode implements IWizardNode {
-		private INewWizard fWizard = null;
-		private IWorkbench fWorkbench = null;
-		private IStructuredSelection fSelection = null;
-
-		public ServiceNode(IWorkbench workbench, IStructuredSelection selection) {
-			fWorkbench = workbench;
-			fSelection = selection;
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.wizard.IWizardNode#dispose()
-		 */
-		public void dispose() {
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.wizard.IWizardNode#getExtent()
-		 */
-		public Point getExtent() {
-			return new Point(-1, -1);
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.wizard.IWizardNode#getWizard()
-		 */
-		public IWizard getWizard() {
-			if (fWizard == null) {
-				fWizard = new ServiceConfigurationWizard(getServiceConfiguration());
-				fWizard.addPages();
-				fWizard.init(fWorkbench, fSelection);
-			}
-			return fWizard;
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.wizard.IWizardNode#isContentCreated()
-		 */
-		public boolean isContentCreated() {
-			return fWizard != null;
-		}
-		
-	}
-	
-	private IServiceConfiguration fServiceConfiguration;
-
-	/**
-	 * @param fWizard
-	 * @param pageName
-	 */
-	public ServiceConfigurationSelectionWizardPage(String pageName) {
-		super(pageName);
-		setTitle(pageName);
-		setDescription("Create or select a service configuration for the project");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-        Composite container = new Composite(parent, SWT.NONE);
-
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 1;
-        container.setLayout(layout);
-        setControl(container);
-        
-        IServiceModelManager manager = ServiceModelManager.getInstance();
-        Set<IServiceConfiguration> configs = manager.getConfigurations();
-        
-        if (configs.size() > 0) {
-	        Label label1 = new Label(container, SWT.LEFT);
-	        label1.setText("One or more service configurations already exist.");
-
-	        Label label2 = new Label(container, SWT.LEFT);
-	        label2.setText("If you wish to use an existing configuration, select it from the list.");
-	        
-	        new ServiceConfigurationWidget(configs).createContents(container);
-        } else {
-	        Label label1 = new Label(container, SWT.LEFT);
-	        label1.setText("You do not have any existing service configurations, so this wizard will help you create a new one.");
-
-	        Label label2 = new Label(container, SWT.LEFT);
-	        label2.setText("The new configuration will be saved with your project, and can be used when creating new projects in the future.");
-	        
-	        IServiceConfiguration config = manager.newServiceConfiguration("Default");
-	        for (IService service : manager.getServices()) {
-				SortedSet<IServiceProviderDescriptor> providers = service.getProvidersByPriority();
-				if (providers.size() > 0) {
-					IServiceProvider provider = ServiceModelManager.getInstance().getServiceProvider(providers.iterator().next());
-					config.setServiceProvider(service, provider);
-				}
-			}
-	        
-	        setServiceConfiguration(config);
-	        setSelectedNode(new ServiceNode(((NewServiceConfigurationProjectWizard)getWizard()).getWorkbench(), ((NewServiceConfigurationProjectWizard)getWizard()).getSelection()));
-        }
-	}
-
-	/**
-	 * @return the fServiceConfiguration
-	 */
-	private IServiceConfiguration getServiceConfiguration() {
-		return fServiceConfiguration;
-	}
-	
-	/**
-	 * @param fServiceConfiguration the fServiceConfiguration to set
-	 */
-	private void setServiceConfiguration(IServiceConfiguration fServiceConfiguration) {
-		this.fServiceConfiguration = fServiceConfiguration;
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWidget.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWidget.java
deleted file mode 100644
index 0b96ae0..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWidget.java
+++ /dev/null
@@ -1,463 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.services.ui.wizards;
-
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.layout.TableColumnLayout;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.IServiceProviderDescriptor;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ptp.services.ui.Activator;
-import org.eclipse.ptp.services.ui.IServiceProviderContributor;
-import org.eclipse.ptp.services.ui.ServiceModelUIManager;
-import org.eclipse.ptp.services.ui.dialogs.ServicesDialog;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-/**
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- */
-public class ServiceConfigurationWidget extends Wizard implements INewWizard {
-	
-	public class AddListener implements Listener {
-		public void handleEvent(Event event) {
-			Set<IService> displaySet = new HashSet<IService>();
-			Set<IService> configServices = getServiceConfiguration().getServices();
-			for (IService service : ServiceModelManager.getInstance().getServices()) {
-				if (!configServices.contains(service)) {
-					displaySet.add(service);
-				}
-			}
-			
-			ServicesDialog dialog = new ServicesDialog(getShell(), displaySet.toArray(new IService[0]));
-			if (dialog.open() == Dialog.OK) {
-				IService[] selectedServices = dialog.getSelectedServices();
-				for (IService service : selectedServices) {
-					SortedSet<IServiceProviderDescriptor> providers = getProvidersByPriority(service);
-					if (providers.size() > 0) {
-						IServiceProvider provider = ServiceModelManager.getInstance().getServiceProvider(providers.iterator().next());
-//						addTableRow(service, provider);
-						getServiceConfiguration().setServiceProvider(service, provider);
-					} else {
-						Activator.getDefault().log(NLS.bind(Messages.ServiceModelWidget_8, service.getId()));
-					}
-				}
-				updateAddRemoveButtons();
-			}
-		}
-	}
-	
-	public class ConfigureListener implements Listener {
-		public void handleEvent(Event event) {
-			// launch the configuration UI for the service provider
-			TableItem[] selection = fTable.getSelection();
-			if (selection.length == 0) {
-				return;
-			}
-			TableItem item = selection[0];
-			IServiceProvider provider = (IServiceProvider) item.getData(PROVIDER_KEY);
-
-			IServiceProviderContributor contrib = ServiceModelUIManager.getInstance().getServiceProviderContributor(provider);
-			IWizard wizard = contrib.getWizard(provider, null);
-			WizardDialog dialog = new WizardDialog(getShell(), wizard);
-			dialog.open();
-			
-			String configString = provider.getConfigurationString();
-			// column 2 holds the configuration string of the provider's current configuration 
-			if (configString == null) {
-				configString = Messages.ServiceModelWidget_4;
-			}
-			item.setText(2, configString);
-			
-			// allow container page to check if configurations are set
-			if (fConfigChangeListener != null) {
-				fConfigChangeListener.handleEvent(null);
-			}
-		}
-	}
-	
-	public class RemoveListener implements Listener {
-		public void handleEvent(Event event) {
-			TableItem[] items = fTable.getSelection();
-			if (items.length == 0) {
-				return;
-			}
-			for (TableItem item : items) {
-				IService service = (IService) item.getData(SERVICE_KEY);
-				if (service != null) {
-					getServiceConfiguration().removeService(service);
-				}
-				fTable.remove(fTable.indexOf(item));
-			}
-			updateAddRemoveButtons();
-		}
-	}
-	
-	protected static final String PROVIDER_KEY = "provider-id"; //$NON-NLS-1$
-	protected static final String SERVICE_KEY = "service-id"; //$NON-NLS-1$
-
-	protected Set<IServiceConfiguration> fServiceConfigurations;
-	protected IServiceConfiguration fServiceConfiguration;
-	protected Map<String, String> fServiceIDToSelectedProviderID;
-	protected Map<String, IServiceProvider> fProviderIDToProviderMap;
-	protected Table fTable;
-	protected Button fConfigureButton;
-	protected Button fAddButton;
-	protected Button fRemoveButton;
-	protected Listener fConfigChangeListener = null;
-	protected IWorkbench fWorkbench = null;
-	protected IStructuredSelection fSelection = null;
-	
-	public ServiceConfigurationWidget(Set<IServiceConfiguration> serviceConfigurations) {
-		fServiceConfigurations = serviceConfigurations;
-	}
-	
-	public Control createContents(Composite parent) {
-		Composite canvas = new Composite(parent, SWT.NONE);
-		GridLayout canvasLayout = new GridLayout(2, false);
-		canvas.setLayout(canvasLayout);
-		
-		Composite tableParent = new Composite(canvas, SWT.NONE);
-		tableParent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
-		fTable = new Table (tableParent, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL);
-		fTable.setLinesVisible (true);
-		fTable.setHeaderVisible (true);
-		
-		TableColumnLayout layout = new TableColumnLayout();
-		String[] titles = {"Project", "Configuration", "Status"};
-		for (int i=0; i<titles.length; i++) {
-			TableColumn column = new TableColumn (fTable, SWT.NONE);
-			column.setText (titles [i]);
-			int width = ColumnWeightData.MINIMUM_WIDTH;
-			
-			// set the column widths
-			switch (i) {
-			case 0: // Project name... usually short
-				width = 100;
-				break;
-
-			case 1: // Configuation name... usually short
-				width = 100;
-				break;
-
-			case 2: // configuration status... typically short
-				width = 100;
-				break;
-
-			}
-			
-			layout.setColumnData(column, new ColumnWeightData(1, width, true));
-			
-
-		}
-		tableParent.setLayout(layout);
-		fTable.setLayout(new FillLayout());
-		
-		createTableContent();
-		
-		fTable.setVisible(true);
-		
-		Composite buttonParent = new Composite(canvas, SWT.NONE);
-		GridLayout buttonLayout = new GridLayout(1, true);
-		buttonParent.setLayout(buttonLayout);
-		buttonParent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		fConfigureButton = new Button(buttonParent, SWT.PUSH);
-		fConfigureButton.setEnabled(false);
-		fConfigureButton.setText(Messages.ServiceModelWidget_2);
-		fConfigureButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Listener configureListener = getConfigureListener();
-		fConfigureButton.addListener(SWT.Selection, configureListener);
-		
-		fAddButton = new Button(buttonParent, SWT.PUSH);
-		fAddButton.setEnabled(true);
-		fAddButton.setText(Messages.ServiceModelWidget_6);
-		fAddButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Listener addListener = getAddListener();
-		fAddButton.addListener(SWT.Selection, addListener);
-		
-		fRemoveButton = new Button(buttonParent, SWT.PUSH);
-		fRemoveButton.setEnabled(false);
-		fRemoveButton.setText(Messages.ServiceModelWidget_7);
-		fRemoveButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Listener removeListener = getRemoveListener();
-		fRemoveButton.addListener(SWT.Selection, removeListener);
-
-		updateAddRemoveButtons();
-		
-		return canvas;
-	}
-	
-	/**
-	 * @return the configuration change listener
-	 */
-	public Listener getConfigChangeListener() {
-		return fConfigChangeListener;
-	}
-	
-	public Map<String, IServiceProvider> getProviderIDToProviderMap() {
-		return fProviderIDToProviderMap;
-	}
-	
-	/**
-	 * Get the service configuration for this widget
-	 * 
-	 * @return service configuration
-	 */
-	public IServiceConfiguration getServiceConfiguration() {
-		return fServiceConfiguration;
-	}
-	
-	public Map<String, String> getServiceIDToSelectedProviderID() {
-		return fServiceIDToSelectedProviderID;
-	}
-	
-	public Table getTable() {
-		return fTable;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		fWorkbench = workbench;
-		fSelection = selection;
-	}
-	
-	/**
-	 * Sub-class may override behaviour
-	 * @return true if all available services have been configured
-	 */
-	public boolean isConfigured() {
-		return isConfigured(null, fServiceIDToSelectedProviderID, getProviderIDToProviderMap());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	@Override
-	public boolean performFinish() {
-		return true;
-	}
-
-	/**
-	 * Listens for changes in service provider configuration
-	 * @param configChangeListener the configuration change listener to set
-	 */
-	public void setConfigChangeListener(Listener configChangeListener) {
-		fConfigChangeListener = configChangeListener;
-	}
-
-	public void setProviderIDToProviderMap(
-			Map<String, IServiceProvider> providerIDToProviderMap) {
-		fProviderIDToProviderMap = providerIDToProviderMap;
-	}
-
-	public void setServiceIDToSelectedProviderID(
-			Map<String, String> serviceIDToSelectedProviderID) {
-		fServiceIDToSelectedProviderID = serviceIDToSelectedProviderID;
-	}
-
-	public void setTable(Table table) {
-		fTable = table;
-	}
-
-	private void addTableRow(IServiceConfiguration config) {
-		TableItem item = new TableItem (fTable, SWT.NONE);
-
-		// column 0 lists the name of the configuration
-		item.setText (0, config.getName());
-		
-		// column 1 holds the status string
-		item.setText(1, "Not configured");
-
-		item.setData(SERVICE_KEY, config);
-
-		// allow container page to check if configurations are set
-		if (fConfigChangeListener != null) {
-			fConfigChangeListener.handleEvent(null);
-		}
-	}
-	
-	/**
-	 * Return the set of providers sorted by priority
-	 * 
-	 * @param service service containing providers
-	 * @return sorted providers
-	 */
-	private SortedSet<IServiceProviderDescriptor> getProvidersByPriority(IService service) {
-		SortedSet<IServiceProviderDescriptor> sortedProviders = 
-			new TreeSet<IServiceProviderDescriptor>(new Comparator<IServiceProviderDescriptor>() {
-				public int compare(IServiceProviderDescriptor o1, IServiceProviderDescriptor o2) {
-					return o2.getPriority().compareTo(o1.getPriority());
-				}
-			});
-		for (IServiceProviderDescriptor p : service.getProviders()) {
-			sortedProviders.add(p);
-		}
-		
-		return sortedProviders;
-	}
-	
-	/**
-	 * Get a the service provider for the descriptor. Keeps a cache of service providers.
-	 * 
-	 * @param descriptor descriptor for the service provider
-	 * @return service provider
-	 */
-	private IServiceProvider getServiceProvider(IServiceProviderDescriptor descriptor) {
-		IServiceProvider serviceProvider = getProviderIDToProviderMap().get(descriptor.getId());
-		
-		if (serviceProvider == null) {
-			serviceProvider = ServiceModelManager.getInstance().getServiceProvider(descriptor);
-			getProviderIDToProviderMap().put(descriptor.getId(), serviceProvider);
-		}
-		
-		return serviceProvider;
-	}
-	
-	/**
-	 * Generate the services, providers and provider configuration available for
-	 * the given configuration in the table
-	 * 
-	 * Sub-classes may override its behaviour
-	 * @param project
-	 */
-	protected void createTableContent() {
-		fTable.removeAll();
-		
-		for (IServiceConfiguration config : fServiceConfigurations) {
-			addTableRow(config);
-		}
-	}
-	
-	//sub class may override to change behaviour
-	protected Listener getAddListener() {
-		return new AddListener();		
-	}
-	
-	//sub class may override to change behaviour
-	protected Listener getConfigureListener() {
-		return new ConfigureListener();		
-	}
-
-	/**
-	 * Find available remote services and service providers for a given project
-	 */
-	protected Set<IService> getContributedServices(IProject project) {		
-		IServiceModelManager modelManager = ServiceModelManager.getInstance();
-		Set<IService> allApplicableServices = new LinkedHashSet<IService>();
-		
-		if (project != null) {
-		
-			String[] natureIds = new String[] {};			
-			try {
-				//get the project natures of the project
-				natureIds = project.getDescription().getNatureIds();			
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}		
-	
-			for (int i = 0; i < natureIds.length; i++) {
-				String natureId = natureIds[i];
-				Set<IService> services = modelManager.getServices(natureId);
-				if (services != null)
-					allApplicableServices.addAll(services);
-			}
-		}
-		return allApplicableServices;
-	}
-		
-	//sub class may override to change behaviour
-	protected Listener getRemoveListener() {
-		return new RemoveListener();		
-	}
-	
-	/**
-	 * Determine if all service providers have been configured
-	 * @param project
-	 * @param serviceIDToSelectedProviderID
-	 * @param providerIDToProviderMap
-	 * @return true if all service providers have been configured
-	 */
-	protected boolean isConfigured(IProject project, Map<String, String> serviceIDToSelectedProviderID, Map<String, IServiceProvider> providerIDToProviderMap) {
-		Set<IService> allApplicableServices = getContributedServices(project);
-		Iterator<IService> iterator = allApplicableServices.iterator();
-		boolean configured = true;
-		while (iterator.hasNext()) {
-			String providerID = serviceIDToSelectedProviderID.get(iterator.next().getId());
-			if (providerID == null)
-				return false;
-			else {
-				IServiceProvider provider = providerIDToProviderMap.get(providerID);
-				if (provider == null)
-					return false;
-				else
-					configured = configured && provider.isConfigured();
-			}
-		}
-		return configured;
-	}
-
-	protected void updateAddRemoveButtons() {
-		Set<IService> services = ServiceModelManager.getInstance().getServices();
-		fAddButton.setEnabled(services.size() > fTable.getItemCount());
-		fRemoveButton.setEnabled(fTable.getItemCount() > 0);
-	}
-
-	/**
-	 * Enable/disable the configure button in this widget based on the service provider descriptor selected
-	 * @param enabled
-	 */
-	protected void updateConfigureButton(IServiceProviderDescriptor descriptor) {
-		IServiceProviderContributor contrib = ServiceModelUIManager.getInstance().getServiceProviderContributor(descriptor);
-		fConfigureButton.setEnabled(contrib != null);
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWizard.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWizard.java
deleted file mode 100644
index cf13991..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWizard.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.services.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardNode;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jface.wizard.WizardSelectionPage;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.ui.IServiceContributor;
-import org.eclipse.ptp.services.ui.ServiceModelUIManager;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class ServiceConfigurationWizard extends Wizard implements INewWizard {
-
-	private class ServicesPage extends WizardSelectionPage {
-		private class WizardExtensionNode implements IWizardNode {
-			private IWizard fWizard = null;
-			
-			public WizardExtensionNode(IWizard wizard) {
-				fWizard = wizard;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.jface.wizard.IWizardNode#dispose()
-			 */
-			public void dispose() {
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.jface.wizard.IWizardNode#getExtent()
-			 */
-			public Point getExtent() {
-				return new Point(-1, -1);
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.jface.wizard.IWizardNode#getWizard()
-			 */
-			public IWizard getWizard() {
-				return fWizard;
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.jface.wizard.IWizardNode#isContentCreated()
-			 */
-			public boolean isContentCreated() {
-				return fWizard != null;
-			}
-			
-		}
-		
-		public ServicesPage(String pageName) {
-			super(pageName);
-			setTitle(pageName);
-			setDescription(Messages.ServiceConfigurationWizard_0);
-		}
-
-		public void createControl(Composite parent) {
-			setControl(new ServiceModelWidget(fServiceConfiguration).createContents(parent));
-			INewWizard wizard = (INewWizard)ServiceModelUIManager.getInstance().getWizardExtensions();
-			if (wizard != null) {
-				wizard.init(getWorkbench(), getSelection());
-				wizard.addPages();
-				setSelectedNode(new WizardExtensionNode(wizard));
-			}
-		}
-	}
-
-	private final IServiceConfiguration fServiceConfiguration;
-	private IWorkbench fWorkbench = null;
-	private IStructuredSelection fSelection = null;
-
-	public ServiceConfigurationWizard(IServiceConfiguration serviceConfiguration) {
-		setForcePreviousAndNextButtons(true);
-		fServiceConfiguration = serviceConfiguration;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	@Override
-	public void addPages() {
-		setWizardPages(getWizardPagesFromServiceConfiguration(fServiceConfiguration));
-		addPage(new ServicesPage(Messages.ServiceConfigurationWizard_1));
-	}
-	
-	/**
-	 * @return the Selection
-	 */
-	public IStructuredSelection getSelection() {
-		return fSelection;
-	}
-
-	/**
-	 * @return
-	 */
-	public IServiceConfiguration getServiceConfiguration() {
-		return fServiceConfiguration;
-	}
-	
-	/**
-	 * @return the Workbench
-	 */
-	public IWorkbench getWorkbench() {
-		return fWorkbench;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		fWorkbench = workbench;
-		fSelection = selection;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		return true;
-	}
-	
-	private WizardPage[] getWizardPagesFromServiceConfiguration(IServiceConfiguration serviceConfiguration) {
-		List<WizardPage> wizardPages = new ArrayList<WizardPage>();
-		for (IService service : serviceConfiguration.getServicesByPriority()) {
-			IServiceContributor contrib = ServiceModelUIManager.getInstance().getServiceContributor(service);
-			if (contrib != null) {
-				WizardPage[] pages = contrib.getWizardPages(service);
-				for (WizardPage page : pages) {
-					wizardPages.add(page);
-				}
-			}
-		}
-		
-		return wizardPages.toArray(new WizardPage[wizardPages.size()]);
-	}
-
-	private void setWizardPages(WizardPage[] pages) {
-		for (IWizardPage page : pages) {
-			addPage(page);
-		}
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWizardPage.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWizardPage.java
deleted file mode 100644
index 590d2f8..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWizardPage.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.services.ui.wizards;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.IServiceProviderDescriptor;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ptp.services.ui.IServiceProviderContributor;
-import org.eclipse.ptp.services.ui.ServiceModelUIManager;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-public class ServiceConfigurationWizardPage extends WizardPage {
-
-	private final IService fService;
-	private IWizard fChildWizard = null;
-
-	private ArrayList<IServiceProviderDescriptor> fProviderComboList = new ArrayList<IServiceProviderDescriptor>();
-	
-	/**
-	 * @param fWizard
-	 * @param pageName
-	 */
-	public ServiceConfigurationWizardPage(IService service, String pageName) {
-		super(pageName);
-		fService = service;
-		setPageComplete(false);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-        Composite container = new Composite(parent, SWT.NONE);
-
-        GridLayout layout = new GridLayout();
-        layout.numColumns = 2;
-        container.setLayout(layout);
-        setControl(container);
-        
-        Label providerLabel = new Label(container, SWT.LEFT);
-        providerLabel.setText(Messages.ServiceConfigurationWizardPage_0);
-        
-        final Combo providerCombo = new Combo(container, SWT.DROP_DOWN | SWT.READ_ONLY);
-        providerCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-        providerCombo.addSelectionListener(new SelectionListener() {
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			public void widgetSelected(SelectionEvent e) {
-				handleComboSelection(providerCombo);
-			}
-        });
-
-        createComboContents(providerCombo);
-	}
-	
-	/**
-     * The <code>WizardSelectionPage</code> implementation of 
-     * this <code>IWizardPage</code> method returns the first page 
-     * of the currently selected wizard if there is one.
-     */
-    public IWizardPage getNextPage() {
-    	if (fChildWizard != null) {
-    		return fChildWizard.getStartingPage();
-    	}
-    	return super.getNextPage();
-    }
-
-	/**
-	 * @param combo
-	 */
-	private void handleComboSelection(Combo combo) {
-		int index = combo.getSelectionIndex();
-		IServiceProvider provider = ServiceModelManager.getInstance().getServiceProvider(fProviderComboList.get(index));
-		IServiceConfiguration config = ((ServiceConfigurationWizard)getWizard()).getServiceConfiguration();
-		config.setServiceProvider(getService(), provider);
-		fChildWizard = null; // need to set fChildWizard to null so we get the next service configuration page
-		if (!provider.isConfigured()) {
-			IWizardPage page = getNextPage();
-			IServiceProviderContributor contrib = ServiceModelUIManager.getInstance().getServiceProviderContributor(provider);
-			if (contrib != null) {
-				fChildWizard = contrib.getWizard(provider, page);
-			}
-		}
-		setPageComplete(true);
-	}
-	
-	/**
-	 * @param combo
-	 */
-	protected void createComboContents(Combo combo) {
-		IServiceConfiguration config = ((ServiceConfigurationWizard)getWizard()).getServiceConfiguration();
-		IServiceProvider provider = config.getServiceProvider(getService());
-		int index = 0;
-		int selection = 0;
-		combo.removeAll();
-		for (IServiceProviderDescriptor descriptor : getService().getProvidersByPriority()) {
-			combo.add(descriptor.getName());
-			fProviderComboList.add(index, descriptor);
-			if (descriptor.getId().equals(provider.getId())) {
-				selection = index;
-			}
-			index++;
-		}
-		combo.select(selection);
-		handleComboSelection(combo);
-	}
-	
-    /**
-	 * @return
-	 */
-	protected IService getService() {
-		return fService;
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceModelWidget.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceModelWidget.java
deleted file mode 100644
index 51f0766..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceModelWidget.java
+++ /dev/null
@@ -1,542 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.services.ui.wizards;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.layout.TableColumnLayout;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.IServiceProviderDescriptor;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ptp.services.ui.IServiceProviderContributor;
-import org.eclipse.ptp.services.ui.ServiceModelUIManager;
-import org.eclipse.ptp.services.ui.dialogs.ServicesDialog;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-
-/**
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as
- * part of a work in progress. There is no guarantee that this API will work or
- * that it will remain the same. Please do not use this API without consulting
- * with the RDT team.
- * 
- */
-public class ServiceModelWidget {
-	
-	public class AddListener implements Listener {
-		public void handleEvent(Event event) {
-			Set<IService> displaySet = new HashSet<IService>();
-			Set<IService> configServices = getServiceConfiguration().getServices();
-			/*
-			 * Calculate the set of services to display. Only include services that 
-			 * are not in the configuration and that have one or more providers.
-			 */
-			for (IService service : ServiceModelManager.getInstance().getServices()) {
-				if (!configServices.contains(service) && service.getProviders().size() > 0) {
-					displaySet.add(service);
-				}
-			}
-			
-			ServicesDialog dialog = new ServicesDialog(getShell(), displaySet.toArray(new IService[0]));
-			if (dialog.open() == Dialog.OK) {
-				IService[] selectedServices = dialog.getSelectedServices();
-				for (IService service : selectedServices) {
-					SortedSet<IServiceProviderDescriptor> providers = service.getProvidersByPriority();
-					IServiceProvider provider = ServiceModelManager.getInstance().getServiceProvider(providers.iterator().next());
-					addTableRow(service, provider);
-					getServiceConfiguration().setServiceProvider(service, provider);
-				}
-				updateAddRemoveButtons();
-			}
-		}
-	}
-	
-	public class ConfigureListener implements Listener {
-		public void handleEvent(Event event) {
-			// launch the configuration UI for the service provider
-			TableItem[] selection = fTable.getSelection();
-			if (selection.length == 0) {
-				return;
-			}
-			TableItem item = selection[0];
-			IServiceProvider provider = (IServiceProvider) item.getData(PROVIDER_KEY);
-
-			IServiceProviderContributor config = ServiceModelUIManager.getInstance().getServiceProviderContributor(provider);
-			IWizard wizard = config.getWizard(provider, null);
-			WizardDialog dialog = new WizardDialog(getShell(), wizard);
-			dialog.open();
-			
-			String configString = provider.getConfigurationString();
-			// column 2 holds the configuration string of the provider's current configuration 
-			if (configString == null) {
-				configString = Messages.ServiceModelWidget_4;
-			}
-			item.setText(2, configString);
-			
-			// allow container page to check if configurations are set
-			if (fConfigChangeListener != null) {
-				fConfigChangeListener.handleEvent(null);
-			}
-		}
-	}
-	
-	public class RemoveListener implements Listener {
-		public void handleEvent(Event event) {
-			TableItem[] items = fTable.getSelection();
-			if (items.length == 0) {
-				return;
-			}
-			for (TableItem item : items) {
-				IService service = (IService) item.getData(SERVICE_KEY);
-				if (service != null) {
-					getServiceConfiguration().removeService(service);
-				}
-				fTable.remove(fTable.indexOf(item));
-			}
-			updateAddRemoveButtons();
-		}
-	}
-	
-	protected static final String PROVIDER_KEY = "provider-id"; //$NON-NLS-1$
-	protected static final String SERVICE_KEY = "service-id"; //$NON-NLS-1$
-
-	protected IServiceConfiguration fServiceConfiguration;
-	protected Map<String, String> fServiceIDToSelectedProviderID;
-	protected Map<String, IServiceProvider> fProviderIDToProviderMap;
-	protected Table fTable;
-	protected Button fConfigureButton;
-	protected Button fAddButton;
-	protected Button fRemoveButton;
-	
-	protected Listener fConfigChangeListener = null;
-	
-	private Shell fShell;
-	
-	public ServiceModelWidget() {
-		fServiceIDToSelectedProviderID = new HashMap<String, String>();
-		fProviderIDToProviderMap = new HashMap<String, IServiceProvider>();
-	}
-	
-	public ServiceModelWidget(IServiceConfiguration serviceConfiguration) {
-		fServiceConfiguration = serviceConfiguration;
-		fServiceIDToSelectedProviderID = new HashMap<String, String>();
-		fProviderIDToProviderMap = new HashMap<String, IServiceProvider>();
-	}
-	
-	private void addTableRow(IService service, IServiceProvider provider) {
-		TableItem item = new TableItem (fTable, SWT.NONE);
-
-		// column 0 lists the name of the service
-		item.setText (0, service.getName());
-		item.setData(SERVICE_KEY, service);
-		
-		// column 1 holds a dropdown with a list of providers
-		// default entry is the first provider if there is one		
-		item.setText(1, provider.getName());
-		item.setData(PROVIDER_KEY, provider);
-		
-		// column 2 holds the status string
-		item.setText(2, provider.getConfigurationString());
-		
-		fServiceIDToSelectedProviderID.put(service.getId(), provider.getId());
-
-		// allow container page to check if configurations are set
-		if (fConfigChangeListener != null) {
-			fConfigChangeListener.handleEvent(null);
-		}
-	}
-	
-	public Control createContents(Composite parent) {
-		fShell = parent.getShell();
-		
-		Composite canvas = new Composite(parent, SWT.NONE);
-		GridLayout canvasLayout = new GridLayout(2, false);
-		canvas.setLayout(canvasLayout);
-		
-		Composite tableParent = new Composite(canvas, SWT.NONE);
-		tableParent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
-		fTable = new Table(tableParent, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL);
-		fTable.setLinesVisible (true);
-		fTable.setHeaderVisible (true);
-		
-		TableColumnLayout layout = new TableColumnLayout();
-		// create the columns and headers... note fourth column holds "Configure..." buttons and hence has no title.
-		String[] titles = {Messages.ServiceModelWidget_0, Messages.ServiceModelWidget_1, Messages.ServiceModelWidget_3};
-		for (int i=0; i<titles.length; i++) {
-			TableColumn column = new TableColumn (fTable, SWT.NONE);
-			column.setText (titles [i]);
-			int width = ColumnWeightData.MINIMUM_WIDTH;
-			
-			// set the column widths
-			switch (i) {
-			case 0: // Service name... usually short
-				width = 100;
-				break;
-
-			case 1: // provider name... typically long
-				width = 250;
-				break;
-				
-			case 2: // configuration status... typically short
-				width = 100;
-				break;
-
-			}
-			
-			layout.setColumnData(column, new ColumnWeightData(1, width, true));
-			
-
-		}
-		tableParent.setLayout(layout);
-		fTable.setLayout(new FillLayout());
-		
-		createTableContent();
-		
-		fTable.setVisible(true);
-		
-		final TableEditor editor = new TableEditor(fTable);
-		editor.horizontalAlignment = SWT.BEGINNING;
-		editor.grabHorizontal = true;
-		fTable.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				int selectionIndex = fTable.getSelectionIndex();
-				if (selectionIndex == -1) {
-					fConfigureButton.setEnabled(false);
-					return;
-				}
-				final TableItem item = fTable.getItem(selectionIndex);
-				IService service = (IService) item.getData(SERVICE_KEY);
-				IServiceProvider provider = (IServiceProvider) item.getData(PROVIDER_KEY);
-				
-				updateConfigureButton(provider);
-				
-				final CCombo combo = new CCombo(fTable, SWT.READ_ONLY);
-				
-				// populate with list of providers
-				int index = 0;
-				final List<IServiceProviderDescriptor> providerIds = new LinkedList<IServiceProviderDescriptor>();
-				SortedSet<IServiceProviderDescriptor> providers = service.getProvidersByPriority();
-				for (IServiceProviderDescriptor descriptor : providers) {
-					combo.add(descriptor.getName(), index);
-					providerIds.add(descriptor);
-					if (descriptor.getId().equals(provider.getId())) {
-						combo.select(index);
-					}
-					++index;
-				}
-				
-				combo.setFocus();
-				Listener listener = new Listener() {
-					public void handleEvent(Event event) {
-						switch (event.type) {
-						case SWT.FocusOut:
-							combo.dispose();
-							break;
-						case SWT.Selection:
-							int selection = combo.getSelectionIndex();
-							if (selection == -1) {
-								return;
-							}
-							IServiceProviderDescriptor descriptor = providerIds.get(selection);
-							IServiceProvider provider = getServiceProvider(descriptor);
-							
-							/*
-							 * Set the provider name in the second field of the row
-							 */
-							item.setText(1, provider.getName());
-							item.setData(PROVIDER_KEY, provider);
-
-							updateConfigureButton(descriptor);							
-							
-							/*
-							 * Set the configured status in the third field
-							 */
-							item.setText(2, provider.getConfigurationString());
-
-							/*
-							 * Update the configuration
-							 */
-							IService service = (IService) item.getData(SERVICE_KEY);
-							fServiceIDToSelectedProviderID.put(service.getId(), descriptor.getId());
-							getServiceConfiguration().setServiceProvider(service, provider);
-							
-							// allow container page to check if configurations are set
-							if (fConfigChangeListener != null) {
-								fConfigChangeListener.handleEvent(null);
-							}
-							
-							combo.dispose();
-							break;
-						}
-					}
-				};
-				combo.addListener(SWT.FocusOut, listener);
-				combo.addListener(SWT.Selection, listener);
-
-				editor.setEditor(combo, item, 1);
-			}
-		});
-		
-		Composite buttonParent = new Composite(canvas, SWT.NONE);
-		GridLayout buttonLayout = new GridLayout(1, true);
-		buttonParent.setLayout(buttonLayout);
-		buttonParent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		fConfigureButton = new Button(buttonParent, SWT.PUSH);
-		fConfigureButton.setEnabled(false);
-		fConfigureButton.setText(Messages.ServiceModelWidget_2);
-		fConfigureButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Listener configureListener = getConfigureListener();
-		fConfigureButton.addListener(SWT.Selection, configureListener);
-		
-		fAddButton = new Button(buttonParent, SWT.PUSH);
-		fAddButton.setEnabled(true);
-		fAddButton.setText(Messages.ServiceModelWidget_6);
-		fAddButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Listener addListener = getAddListener();
-		fAddButton.addListener(SWT.Selection, addListener);
-		
-		fRemoveButton = new Button(buttonParent, SWT.PUSH);
-		fRemoveButton.setEnabled(false);
-		fRemoveButton.setText(Messages.ServiceModelWidget_7);
-		fRemoveButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Listener removeListener = getRemoveListener();
-		fRemoveButton.addListener(SWT.Selection, removeListener);
-
-		updateAddRemoveButtons();
-		
-		return canvas;
-	}
-	
-	/**
-	 * Generate the services, providers and provider configuration available for
-	 * the given configuration in the table
-	 * 
-	 * Sub-classes may override its behaviour
-	 * @param project
-	 */
-	protected void createTableContent() {
-		fTable.removeAll();
-		
-		if (getServiceConfiguration() != null) {
-			for (IService service : getServiceConfiguration().getServices()) {
-				addTableRow(service, getServiceConfiguration().getServiceProvider(service));
-			}
-		}
-	}
-	
-	//sub class may override to change behaviour
-	protected Listener getAddListener() {
-		return new AddListener();		
-	}
-	
-	/**
-	 * @return the configuration change listener
-	 */
-	public Listener getConfigChangeListener() {
-		return fConfigChangeListener;
-	}
-	
-	//sub class may override to change behaviour
-	protected Listener getConfigureListener() {
-		return new ConfigureListener();		
-	}
-	
-	/**
-	 * Find available remote services and service providers for a given project
-	 */
-	protected Set<IService> getContributedServices(IProject project) {		
-		IServiceModelManager modelManager = ServiceModelManager.getInstance();
-		Set<IService> allApplicableServices = new LinkedHashSet<IService>();
-		
-		if (project != null) {
-		
-			String[] natureIds = new String[] {};			
-			try {
-				//get the project natures of the project
-				natureIds = project.getDescription().getNatureIds();			
-			} catch (CoreException e) {
-				e.printStackTrace();
-			}		
-	
-			for (int i = 0; i < natureIds.length; i++) {
-				String natureId = natureIds[i];
-				Set<IService> services = modelManager.getServices(natureId);
-				if (services != null)
-					allApplicableServices.addAll(services);
-			}
-		}
-		return allApplicableServices;
-	}
-	
-	public Map<String, IServiceProvider> getProviderIDToProviderMap() {
-		return fProviderIDToProviderMap;
-	}
-	
-	//sub class may override to change behaviour
-	protected Listener getRemoveListener() {
-		return new RemoveListener();		
-	}
-
-	/**
-	 * Get the service configuration for this widget
-	 * 
-	 * @return service configuration
-	 */
-	public IServiceConfiguration getServiceConfiguration() {
-		return fServiceConfiguration;
-	}
-
-	public Map<String, String> getServiceIDToSelectedProviderID() {
-		return fServiceIDToSelectedProviderID;
-	}
-
-	/**
-	 * Get a the service provider for the descriptor. Keeps a cache of service providers.
-	 * 
-	 * @param descriptor descriptor for the service provider
-	 * @return service provider
-	 */
-	private IServiceProvider getServiceProvider(IServiceProviderDescriptor descriptor) {
-		IServiceProvider serviceProvider = getProviderIDToProviderMap().get(descriptor.getId());
-		
-		if (serviceProvider == null) {
-			serviceProvider = ServiceModelManager.getInstance().getServiceProvider(descriptor);
-			getProviderIDToProviderMap().put(descriptor.getId(), serviceProvider);
-		}
-		
-		return serviceProvider;
-	}
-
-	private Shell getShell() {
-		return fShell;
-	}
-
-	public Table getTable() {
-		return fTable;
-	}
-	
-	/**
-	 * Sub-class may override behaviour
-	 * @return true if all available services have been configured
-	 */
-	public boolean isConfigured() {
-		return isConfigured(null, fServiceIDToSelectedProviderID, getProviderIDToProviderMap());
-	}
-
-	/**
-	 * Determine if all service providers have been configured
-	 * @param project
-	 * @param serviceIDToSelectedProviderID
-	 * @param providerIDToProviderMap
-	 * @return true if all service providers have been configured
-	 */
-	protected boolean isConfigured(IProject project, Map<String, String> serviceIDToSelectedProviderID, Map<String, IServiceProvider> providerIDToProviderMap) {
-		Set<IService> allApplicableServices = getContributedServices(project);
-		Iterator<IService> iterator = allApplicableServices.iterator();
-		boolean configured = true;
-		while (iterator.hasNext()) {
-			String providerID = serviceIDToSelectedProviderID.get(iterator.next().getId());
-			if (providerID == null)
-				return false;
-			else {
-				IServiceProvider provider = providerIDToProviderMap.get(providerID);
-				if (provider == null)
-					return false;
-				else
-					configured = configured && provider.isConfigured();
-			}
-		}
-		return configured;
-	}
-	
-	/**
-	 * Listens for changes in service provider configuration
-	 * @param configChangeListener the configuration change listener to set
-	 */
-	public void setConfigChangeListener(Listener configChangeListener) {
-		fConfigChangeListener = configChangeListener;
-	}
-	
-	public void setProviderIDToProviderMap(
-			Map<String, IServiceProvider> providerIDToProviderMap) {
-		fProviderIDToProviderMap = providerIDToProviderMap;
-	}
-	
-	/**
-	 * Set the service configuration for this widget
-	 * 
-	 * @param service configuration
-	 */
-	public void setServiceConfiguration(IServiceConfiguration config) {
-		fServiceConfiguration = config;
-		if (config != null) {
-			createTableContent();
-		}
-	}
-	
-	public void setServiceIDToSelectedProviderID(
-			Map<String, String> serviceIDToSelectedProviderID) {
-		fServiceIDToSelectedProviderID = serviceIDToSelectedProviderID;
-	}
-
-	public void setTable(Table table) {
-		fTable = table;
-	}
-		
-	protected void updateAddRemoveButtons() {
-		Set<IService> services = ServiceModelManager.getInstance().getServices();
-		fAddButton.setEnabled(services.size() > fTable.getItemCount());
-		fRemoveButton.setEnabled(fTable.getItemCount() > 0);
-	}
-	
-	/**
-	 * Enable/disable the configure button in this widget based on the service provider descriptor selected
-	 * @param enabled
-	 */
-	protected void updateConfigureButton(IServiceProviderDescriptor descriptor) {
-		IServiceProviderContributor config = ServiceModelUIManager.getInstance().getServiceProviderContributor(descriptor);
-		fConfigureButton.setEnabled(config != null);
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceProviderConfigurationWizard.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceProviderConfigurationWizard.java
deleted file mode 100644
index de01a7b..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceProviderConfigurationWizard.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 The Regents of the University of California. 
- * This material was produced under U.S. Government contract W-7405-ENG-36 
- * for Los Alamos National Laboratory, which is operated by the University 
- * of California for the U.S. Department of Energy. The U.S. Government has 
- * rights to use, reproduce, and distribute this software. NEITHER THE 
- * GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
- * ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
- * to produce derivative works, such modified software should be clearly marked, 
- * so as not to confuse it with the version available from LANL.
- * 
- * Additionally, this program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * LA-CC 04-115
- *******************************************************************************/
-package org.eclipse.ptp.services.ui.wizards;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.ui.IServiceProviderContributor;
-import org.eclipse.ptp.services.ui.ServiceModelUIManager;
-
-public class ServiceProviderConfigurationWizard extends Wizard {
-
-	protected final IWizardPage fPageLink;
-	protected final IServiceProvider fProvider;
-	
-	/**
-	 * Create wizard with pages from a single service provider.
-	 * 
-	 * @param provider service provider we are configuring
-	 * @param page next ServiceConfigurationWizardPage if we are being called by a ServiceConfigurationWizard, or null otherwise
-	 */
-	public ServiceProviderConfigurationWizard(IServiceProvider provider, IWizardPage page) {
-		fProvider = provider;
-		fPageLink = page;
-		setForcePreviousAndNextButtons(true);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#addPages()
-	 */
-	@Override
-	public void addPages() {
-		IServiceProviderContributor contrib = ServiceModelUIManager.getInstance().getServiceProviderContributor(fProvider);
-		if (contrib != null) {
-			for (IWizardPage page : contrib.getWizardPages(this, fProvider)) {
-				addPage(page);
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
-	 */
-	@Override
-	public IWizardPage getNextPage(IWizardPage page) {
-		IWizardPage nextPage = super.getNextPage(page);
-		if (nextPage == null) {
-			return fPageLink;
-		}
-		return nextPage;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	public boolean performFinish() {
-		return true;
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceProviderConfigurationWizardPage.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceProviderConfigurationWizardPage.java
deleted file mode 100644
index befea34..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceProviderConfigurationWizardPage.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.services.ui.wizards;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-
-public abstract class ServiceProviderConfigurationWizardPage extends WizardPage {
-
-	/**
-	 * @param wizard
-	 * @param pageName
-	 */
-	public ServiceProviderConfigurationWizardPage(String pageName) {
-		super(pageName);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public abstract void createControl(Composite parent);
-}
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.classpath b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.project b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.project
deleted file mode 100644
index 73133d1..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rdt.managedbuilder.xlc.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.settings/org.eclipse.jdt.core.prefs b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 827d2b8..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Mar 30 10:27:17 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 106a1a5..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.ptp.rdt.managedbuilder.xlc.ui;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.ptp.rdt.managedbuilder.xlc.ui.Activator
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.managedbuilder.core;bundle-version="5.0.100",
- org.eclipse.cdt.managedbuilder.xlc.core;bundle-version="5.0.0",
- org.eclipse.cdt.managedbuilder.xlc.ui;bundle-version="6.0.0",
- org.eclipse.ptp.rdt.core;bundle-version="1.0.0",
- org.eclipse.core.resources;bundle-version="3.5.0",
- org.eclipse.ptp.rdt.services;bundle-version="1.0.1",
- org.eclipse.ptp.remote.core;bundle-version="2.1.0",
- org.eclipse.cdt.core;bundle-version="5.1.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.rdt.managedbuilder.xlc.ui
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/about.html b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/about.html
deleted file mode 100644
index 1f6787d..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>April 30, 2009</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation 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
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/build.properties b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/build.properties
deleted file mode 100644
index 0dc34f7..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.properties b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.properties
deleted file mode 100644
index e0efd70..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.properties
+++ /dev/null
@@ -1,436 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName = Remote XL C/C++ Managed Build UI Plugin
-providerName = Eclipse.org
-
-variableDescription = XL C/C++ Compiler Root Location
-
-#Build model names
-TargetName.xlc.exe = Remote Executable (XL C/C++)
-TargetName.xlc.so = Remote Shared Library (XL C/C++)
-TargetName.xlc.lib = Remote Static Library(XL C/C++)
-
-# Default Configuration Names
-# START NON-TRANSLATABLE
-ConfigName.Rel = Release
-ConfigName.Dbg = Debug
-# END NON-TRANSLATABLE
-
-# Generic tool-chain names
-ToolChainName.Rel=Remote XL C/C++ Tool Chain
-ToolChainName.Dbg=Remote XL C/C++ Tool Chain
-
-# Generic platform names
-PlatformName.Rel=Release Platform
-PlatformName.Dbg=Debug Platform
-
-# Generic builder names
-BuilderName.Rel=GNU Make
-BuilderName.Dbg=GNU Make
-
-# Tool names
-ToolName.compiler.xlc.c = Remote XL C Compiler
-ToolName.compiler.xlc.cpp = Remote XL C++ Compiler
-ToolName.linker.xlc.c = Remote XL C Executable Linker
-ToolName.linker.xlc.cpp = Remote XL C++ Executable Linker
-ToolName.archiver.xlc = Archiver
-ToolName.assembler.xlc = XL Assembler
-ToolName.linker.xlc.cpp.so = Remote XL C++ Shared Object Linker
-ToolName.linker.xlc.c.so = Remote XL C Shared Object Linker
-
-# Generic Category Names
-OptionCategory.Linking = Linking
-OptionCategory.Libs = Libraries and Paths
-OptionCategory.ifp = Integer and Floating Point
-OptionCategory.cc = Compiler Customization
-OptionCategory.lm = Listings and Messages
-OptionCategory.ecd = Error Checking and Debugging
-OptionCategory.Input = Input Control
-OptionCategory.Output = Output Control
-OptionCategory.Optimize=Optimization
-OptionCategory.Comp = Compatibility
-OptionCategory.Misc=Miscellaneous
-OptionCategory.Assembler=Assembler Options
-OptionCategory.General=General
-OptionCategory.objcc=Object code control
-
-
-# generic names used by multiple options
-Option.none = none
-Option.default = default
-
-# Miscellaneous options
-Option.compiler.other = Other compiler flags
-
-# Input Control options
-Option.Preproccomments = Preserve comments in pre-processed output (-C)
-Option.DefSym = Define a macro name (-D)
-Option.InclPaths = Specify an additional search path for #include s (-I)
-Option.UndefSym = Undefine a macro name (-U)
-Option.altivec = Enable compiler support for vector data types (-qaltivec)
-Option.asm = Control the interpretation of and subsequent generation of code for asm statement (-qasm)
-Option.asm.default = Default
-Option.asm.stdcpp = Standard (-qasm=stdcpp)
-Option.asm.gcc = GCC (-qasm=gcc)
-Option.Cstdinc = Specify C standard search location (-qc_stdinc)
-Option.cppstdinc = Specify C++ standard search location (-qcpp_stdinc)
-Option.qcomplexgccincl = Wrap include files in GCC pragmas (-qcomplexgccincl)
-Option.Nocplus = Don't recognize C++ comments in C source files(-qnocpluscmt)
-Option.Mbcs = Enable recognition of multi-byte characters (-qmbcs)
-Option.Digraph = Enable recognition of digraph characters (-qdigraph)
-Option.Dollar = Allow $ symbols to be used in identifiers (-qdollar)
-Option.Incdirfirst =  Change the search path (-qidirfirst)
-Option.ignprag = Ignore certain pragmas (-qignprag=)
-Option.ignprag.disjoint = disjoint
-Option.ignprag.isolated = isolated
-Option.ignprag.all = all
-Option.ignprag.ibm = IBM(R)
-Option.ignprag.omp = omp
-Option.Keyword = Treat specified name as a keyword(-qkeyword)
-Option.langlvl = Language level (-qlanglvl=)
-Option.langlvl.classic = classic
-Option.langlvl.extended = extended
-Option.langlvl.saa = SAA
-Option.langlvl.saal2 = SAA Level 2
-Option.langlvl.stdc89 = C89 standard
-Option.langlvl.stdc99 = C99 standard
-Option.langlvl.extc89 = C89 with extensions
-Option.langlvl.extc99 = C99 with extensions
-Option.langlvl.ucs = UCS
-Option.Macpstr = Convert pascal string literals into null-terminated string literals (-qmacpstr)
-Option.Pascal = Recognize and accept the keyword pascal (-qpascal)
-Option.sourcetype = Override source type (-qsourcetype)
-Option.sourcetype.c = c
-Option.sourcetype.c++ = C++
-Option.sourcetype.assembler = assembler
-Option.stdframework = Search standard framework directories (-qstdframework)
-Option.frameworkdirs = Specify additional framework directories (-qframeworkdir)
-Option.Input = Don't search the default search path directories (-qnostdinc)
-Option.Warn.Syntax =Perform syntax checking without generating an object file(-qsyntaxonly) 
-Option.Trigraph=Recognize tri-graph key combinations
-Option.Utf=Enable recognition of UTF literal syntax (-qutf)
-Option.plus = Compile any file as a C++ file (-+)
-Option.cinc = Insert extern "C" {} in the specified include files (-qcinc)
-Option.gcc_c_stdinc = Change GCC headers search location (-qgcc_c_stdinc)
-Option.gcc_cpp_stdinc = Change G++ headers search location (-qgcc_cpp_stdinc)
-
-# Output Control options
-
-Option.Trace=Preview the steps for compilation(-#)
-Option.bmaxdata=Maximum size of the area shared by the static data and the heap (-bmaxdata=)
-Option.c=Pass the source files through compiler component only(-c)
-Option.PreprocOnly=Preprocess the source files and create an output preprocessed source file (-E)
-Option.PreprocRemoveComments=Remove comments from preprocessed output (-C!)
-Option.M=Create an output file that contains targets for the make command (-M)
-Option.ma=Substitute inline code for calls to alloca (-ma)
-Option.o=Specify an output location for the files created by the compiler (-o) 
-Option.P=Preprocess the source files and create an output preprocessed source file for each source file(-P)
-Option.Assem=Generate an assembler language file for each source file(-S)
-Option.Strip=Strip symbol table, line number information and relocation information from source file(-s)
-Option.64=Select 64-bit compiler mode(-q64)
-Option.Align=Specify what alignment rules compiler uses for compilation(-qalign)
-Option.Align.Full=full
-Option.Align.Natural=natural
-Option.Align.twobyte=two byte
-Option.Align.packed=packed
-Option.Align.bitpacked=bit packed
-Option.alloca=Substitute inline code for calls to function alloca(-qalloca)
-Option.Bitfields=Specify if bit fields are signed(-qbitfields)
-Option.Bitfields.signed = signed
-Option.Bitfields.unsigned = unsigned
-Option.Chars=Specify if chars are signed
-Option.chars.signed = signed (-qchars=signed)
-Option.chars.unsigned = unsigned (-qcharse=unsigned)
-Option.enablevmx=Enable generation of VMX instructions(-qenablevmx)
-Option.Enum=Specify the amount of storage occupied by enumerations(-qenum=)
-Option.enum.Int=Int
-Option.enum.Intlong=Intlong
-Option.enum.small=small
-Option.enum.1=1
-Option.enum.2=2
-Option.enum.4=4
-Option.enum.8=8
-Option.Pic=Generate position independent code suitable for use in libraries(-qpic=)
-Option.Pic.Small=Small
-Option.Pic.Large=Large
-Option.noro=Do not place string literals in read only storage (-qnoro)
-Option.noroconst=Do not place constant values in read only storage (-qnoroconst)
-Option.roptr=Place constant pointers in read only storage (-qroptr) 
-Option.Statsym=Generate symbols for static variables (-qstatsym )
-Option.xcall=Generate code to treat static functions as external functions (-qxcall )
-Option.funcset=Place instructions for each function in a separate object file control section or csect (-qfuncset)
-Option.ppline=Enable generation of #line directive in the preprocessed output (-qppline)
-Option.upconv=Preserve the unsigned specification when performing integral promotions (-qupconv)
-Option.namemangling=Name mangling scheme for external symbol names (-qnamemangling=)
-Option.namemangling.v10.name=Name mangling scheme for external symbol names (-qnamemangling=)
-Option.namemangling.ansi = ANSI (-qnamemangling=ansi)
-Option.namemangling.v6 = VisualAge(R) C++ v6 (-qnamemangling=v6)
-Option.namemangling.v5 = VisualAge(R) C++ v5 (-qnamemangling=v5)
-Option.namemangling.v4 = VisualAge(R) C++ v4 (-qnamemangling=v4)
-Option.namemangling.v3 = Compatibility mode (-qnamemangling=v3)
-Option.namemangling.v7=IBM XL C/C++ v7 (-qnamemangling=v7)
-Option.namemangling.v8=IBM XL C/C++ v8 (-qnamemangling=v8)
-Option.namemangling.v9=IBM XL C/C++ v9 (-qnamemangling=v9)
-Option.namemangling.v10=IBM XL C/C++ v10 (-qnamemangling=v10)
-Option.objectmodel = Object model (-qobjmodel=)
-Option.objectmodel.classic = classic (-qobjmodel=classic)
-Option.objectmodel.ibm = IBM(R) (-qobjmodel=ibm)
-Option.rtti = Generate RunTime Type Information (-qrtti)
-Option.rtti.all = all (-qrrti=all)
-Option.rtti.type = type (-qrtti=type)
-Option.rtti.dynamiccast = dynamic cast (-qrtti=dynamiccast)
-Option.saveopt = Save the command line compiler options into an object file  (-qsaveopt)
-Option.staticinline = Treat inline functions as static (-qstaticinline)
-Option.statsym = Add static variables to the symbol table  (-qstatsym)
-Option.threaded = Enable multi-threaded execution (-qthreaded)
-Option.unique = Generate unique names for static constructor/deconstructor file compilation units (-qunique)
-Option.unique.v10 = Generate unique names for static constructor/deconstructor file compilation units (-qunique)
-Option.novftable = Do not generate virtual function table (-qnovftable)
-Option.vrsave = Maintain the VRSAVE register (-qvrsave)
-Option.weaksymbol = Generate weak symbols (-qweaksymbol)
-Option.macros=Emit macro definitions to preprocessed output (-qshowmacros)
-Option.macros.all=all (-qshowmacros=all)
-Option.macros.pre=predefined (-qshowmacros=pre)
-Option.macros.nopre=no macros (-qshowmacros=nopre)
-Options.timestamps=Suppress insert of implicit timestamps into an object file (-qnotimestamps)
-
-# Optimization options
-Option.OptLevel = Optimization level
-Option.Optimize.Optimize = -O
-Option.Optimize.Level2 = -O2
-Option.Optimize.Level3 = -O3
-Option.Optimize.Level4 = -O4
-Option.Optimize.Level5 = -O5
-Option.inlining = Function inlining
-Option.inlining.Q = inline all functions (-Q)
-Option.inlining.Qexclamation = disable inlining (-Q!)
-Option.Qplus = Specify functions to be inlined(-Q+name1:name2:...:nameN)
-Option.Qminus = Specify functions to not inline (-Q-name1:name2:...:nameN)
-Option.aggrcopy = Enable destructive copy operations for structs and unions
-Option.aggrcopy.nooverlap=no overlap (-qaggrcopy=nooverlap)
-Option.aggrcopy.overlap=overlap (-qaggrcopy=overlap)
-Option.alias= Apply aliasing instructions to compilation unit (-qalias=)
-Option.alias.addrtaken= Variables are not disjoint from pointers (-qalias=addrtaken)
-Option.alias.noaddrtaken=Variables are disjoint from pointers unless their address is taken (-qalias=notaddrtaken)
-Option.alias.allptrs=Pointers are aliased (-qalias=allptrs)
-Option.alias.noallptrs=Pointers are never aliased (-qalias=noallptrs)
-Option.alias.ansi=Pointers can only point to an object of the same type (-qalias=ansi)
-Option.alias.noansi=Pointers can point to an object of a different type (-qalias=notansi)
-Option.alias.typeptr=Pointers to different types are aliased (-qalias=typeptr)
-Option.alias.notypeptr=Pointers to different types are never aliased (-qalias=notypeptr)
-Option.optimization.arch = Specify the processor architecture to generate code and optimize for (-qarch=)
-Option.optimization.arch.ppc64 = PowerPC(R) 64-bit
-Option.optimization.arch.ppcgr = PowerPC(R) with graphics instructions
-Option.optimization.arch.ppc64gr = PowerPC(R) 64-bit with graphics instructions
-Option.optimization.arch.ppc64grsq = PowerPC(R) 64-bit with graphics and square root instructions
-Option.optimization.arch.ppc64v = PowerPC(R) 64-bit with AltiVec
-Option.optimization.tune = Specify the processor architecture to tune code for (-qtune=)
-Option.optimization.tune.auto = auto
-Option.optimization.assert = Assert program behaviours (-qassert=)
-Option.optimization.Cache = Specify the cache configuration (-qcache=option1:option2:...:optionN)
-Option.compact = Avoid transformations that lead to code expansion (-qcompact)
-Option.optimization.dataimported = Name the variables to be imported (-qdataimported=name1:name2:...:nameN)
-Option.optimization.datalocal = Name the variables which are local (-qdatalocal=name1:name2:...:nameN)
-Option.directstorage = Write-through enabled or cache-inhibited storage may be referenced (-qdirectstorage)
-Option.optimization.exceptionhandling = Exception handling
-Option.optimization.exceptionhandling.eh = Enable exception handling (-qeh)
-Option.optimization.exceptionhandling.noeh = Disable exception handling (-qnoeh)
-Option.optimization.exceptionhandling.v5 = VisualAge(R) C++ v5.0 compatibility
-Option.optimization.exceptionhandling.v6 = VisualAge(R) C++ v6.0 compatibility
-Option.fdpr = Include data required by fdpr utility (-qfdpr)
-Option.optimization.hot = Perform high-order loop analysis and transformations during optimization (-qhot=)
-Option.ignerrno = Perform optimizations which assume errno is not modified by system calls (-qignerrno)
-Option.optimization.inline = Attempt to inline functions (-qinline=)
-Option.optimization.ipa = Customize interprocedural analysis optimizations(-qipa=)
-Option.optimization.isolatedcall = Functions in source file that have no side effects (-qisolated_call=name1:name2:...:nameN)
-Option.optimization.keepinlines = 
-Option.largepage = Exploit large page heaps available on POWER4(TM) systems running AIX(R) 5.1D or later (-qlargepage)
-Option.libansi = Assume all functions in the name of ansi C function are system functions (-qlibansi)
-Option.pdf1 = Tune optimizations through Profile Directed Feedback: first run (-qpdf1)
-Option.pdf2 = Tune optimizations through Profile Directed Feedback: second run (-qpdf2)
-Option.optimization.Prefetch = Disable generation of prefetching instructions in compiled code (-qnoprefetch)
-Option.optimization.procimported = Mark functions as imported (-qprocimported=)
-Option.optimization.proclocal = Mark functions as local (-qlocal=)
-Option.optimization.procimported = Mark functions as imported (-qprocimported=)
-Option.optimization.procunknown = Mark functions as unknown (-qprocunknown=)
-Option.optimization.showpdf = Add additional call and block count profiling information to the executable (-qshowpdf)
-Option.optimization.smallstack = Reduce the size of the stack frame (-qsmallstack)
-Option.optimization.smp = Enable parallelization of code (-qsmp)
-Option.optimization.smp.v10 = Specify parallelization of code (-qsmp=name1:name2:...:nameN)
-Option.optimization.smp.v10.tooltip=Possible values: nostackcheck, opt, norec_locks, noomp, nonested_par, \nexplicit, auto, omp, nested_par, noauto, noexplicit, noopt, rec_locks, \nschedule=(runtime | auto | affinity=n | dynamic=n | guided=n | static=n), stackcheck, threshold=n
-Option.optimization.Spill = Specify the register allocation spill area (-qspill=)
-Option.optimization.Strict=Turn off aggressive optimizations (-qstrict)
-Option.optimization.Strict.v10 = Specify the optimizations (-qstrict=name1:name2:...:nameN)
-Option.optimization.Strict.v10.tooltip=Possible values: all, none, precision, noprecision, exceptions, noexceptions, \nieeefp, noieeefp, nans, nonans, infinities, noinfinities, subnormals, nosubnormals, \nzerosigns, nozerosigns, operationprecision, nooperationprecision, order, noorder, \nassociation, noassociation, reductionorder, noreductionorder, guards, noguards, library, nolibrary
-Option.optimization.loopinduction = Loop induction settings
-Option.optimization.strict_induction = Strict induction
-Option.optimization.nostrict_induction = No induction
-Option.optimization.tocdata = Mark data as local
-Option.optimization.w = Specify options to pass to specific compiler components  (-W)
-
-# Linker Options
-Option.Linking.b = Control how shared objects are processed by the editor (-b)
-Option.linking.brtl = Enable runtime linking for the output file (-brtl)
-Option.linking.bundle = 
-Option.Linking.bundle_loader
-Option.Linking.e = Set the entry name for the shared executable(-e )
-Option.Linking.f = 
-Option.linking.G = Create a shared object enabled for runtime linking (-G)
-Option.Linking.L = Search the path directory for the library files specified by the -lkey option (-L)
-Option.Linking.l = Search the specified library file(-l)
-Option.linking.r = Produce a relocatable object (-r)
-Option.Linking.Z = Specify a prefix for library search path (-Z)
-Option.linking.inlglue = Generate fast external linkage (-qinlglue)
-Option.linking.lib = Link with standard system libraries (-qlib)
-Option.Linking.mkshrobj = Create a shared object from generated object files (-qmkshrobj)
-Option.Linking.priority = Specify the priority level for initialization of static objects (-qpriority)
-Option.Linker.EnableRun=Enable Run time linking (-brtl)
-Option.Linker.NoStartFiles=Do not use standard start files (-nostartfiles)
-Option.Linker.NoDefLibs=Do not use default libraries (-nodefaultlibs)
-Option.Linker.NoStdLibs=No startup or default libs (-nostdlib)
-Option.Linker.Strip=Strip all symbol information (-s)
-Option.Linker.Strip.debug=Strip debug symbol information (-S)
-Option.Linker.Static=No shared libraries (-bstatic)
-Option.Linker.WLinker=Other options (-Wl, [option1,option2,...optionN])
-Option.Linker.Flags=Other linker flags
-Option.Libs=Libraries (-l)
-Option.Libsearch=Library search path (-L)
-Option.UserObjs=Other objects
-Option.Linker.Shared=Shared (-qmkshrobj)
-Option.Linker.SOName=Shared object name (-o=)
-Option.Linker.Implib=Import Library name (-Wl,--out-implib=)
-Option.Linker.Defname=DEF file name (-Wl,--output-def=)
-Option.linking.bundle = Create a bundle (-bundle)
-Option.linking.bundle_loader = Specify the name of bundle loader program (-bundle_loader=)
-Option.linking.f = Specify file containing a list of object files for the compiler to pass to the linker (-f)
-Option.linking.expfile = Save all the exported symbols in the designated file (-qexpfile=)
-
-#Archiver options
-Option.Archiver.Flags=Other archiver flags
-
-# Integer and Floating Point options
-Option.y = Specify compile time rounding mode (-y)
-Option.y.n = n
-Option.y.m = m
-Option.y.p = p
-Option.y.z = z
-Option.float = Specify floating point options (-qfloat=)
-Option.flttrap = Trap floating point exceptions (-qflttrap=)
-Option.longlong = Allow long long integer types in the program
-Option.longlong.longlong = Allow long long (-qlonglong)
-Option.longlong.nolonglong = Do not allow long long (-qnolonglong)
-Option.rndflt = Control compile-time rounding mode of floating point expressions( -qrndflt)
-Option.rndflt.nearest = Nearest
-Option.rndflt.minusinf = Minus infinity
-Option.rndflt.plusinf = Plus infinity
-Option.rndflt.zero = Zero
-Option.dfp = Decimal floating-point support for types and literals
-Option.dfp.enabled = Enabled (-qdfp)
-Option.dfp.disabled = Disabled (-qnodfp)
-
-# Compiler Customization options
-Option.B = Determine substitute program path name (-B)
-Option.F = Specify alternate configuration file (-F)
-Option.t = Add prefix to designated programs (-t)
-Option.maxmem = Amount of memory used during optimization (-qmaxmem=)
-Option.path = Alternate program name for compiler components (-qpath=)
-Option.tls = Specify the thread local storage model (-qtls=)
-Option.tls.unsupported=unsupported
-Option.tls.default=default
-Option.tls.global-dynamic=global-dynamic
-Option.tls.initial-exec=initial-exec
-Option.tls.local-dynamic=local-dynamic
-Option.tls.local-exec=local-exec
-Option.tls.notls=No tls
-
-# Listings and Messages options
-Option.V = Report information on the progress of compilation (-V)
-Option.Warn.nowarn = Suppress warnings and low-level messages (-w)
-Option.Warn.Pedandic=Pedantic (-pedantic)
-Option.Warn.PedErrors=Pedantic warnings as errors (-pedantic-errors)
-Option.Warn.nowarn=Inhibit all warnings (-w)
-Option.Warn.allwarn=All warnings (-Wall)
-Option.Warn.toerrs=Warnings as errors (-Werror)
-Option.attr = Produce a compiler listing (-qattr)
-Option.attr.noattr = Does not produce an attribute listing for identifiers in program (-qnoattr)
-Option.attr.fullattr = Report attributes of all identifiers (-qattr=full)
-Option.attr.attr = Report attributes of only used identifiers (-qattr)
-Option.flag = Specify the minimum severity level of the diagnostic messages (-qflag=)
-Option.format = Warn of possible problems with string input and output format specifications (-qformat=)
-Option.halt = Instruct the compiler to stop after compilation if it encounters errors of specified severity or higher (-qhalt=)
-Option.halt.information = Information (-qhalt=i)
-Option.halt.warning = Warning (-qhalt=w)
-Option.halt.error = Error (-qhalt=e)
-Option.halt.severeError = Severe error (-qhalt=s)
-Option.halt.unrecoverableError = Unrecoverable error (-qhalt=u)
-Option.info = Produce informational messages (-qinfo=)
-Option.list = Produce a compiler listing that includes an object listing (-qlist)
-Option.listopt = Produce a compiler listing that displays all options in effect(-qlistopt)
-Option.phsinfo = Report the time taken in each compilation phase (-qphsinfo)
-Option.noprint = Suppress all listings (-qnoprint )
-Option.report = Instruct the compiler to produce transformation reports (-qreport)
-Option.showinc = Show all included files in the source listing (-qshowinc)
-Option.source = Produce a compiler listing and include the source code (-qsource)
-Option.srcmsg = Add the corresponding source code lines to the diagnostic messages in stderr file (-qsrcmsg)
-Option.suppress = Suppress the specified informational or warning messages (-qsuppress=)
-Option.tabsize = Change the tab-size (-qtabsize=)
-Option.xref = Produce a cross reference listing of identifiers (-qxref)
-Option.xref.noxref = Do not report identifiers in the program (-qnoxref)
-Option.xref.fullxref = Report all the identifiers in the program (-qxref = full)
-Option.xref.xref = Report only those identifiers which are used (-qxref)
-Option.warnfourcharconsts = Enable warning of four-character constants in source
-Option.report = Produce listing files that show how sections of code have been optimized (-qreport)
-
-# Error Checking and Debugging
-Option.g = Generate debugging information (-g)
-Option.optdebug = Enable debugging of optimized code (-qoptdebug)
-Option.DebugLevel=Debug Level
-Option.Debug.Min=Minimal (-g1)
-Option.Debug.Def=Default (-g)
-Option.Debug.Max=Maximum (-g3)
-Option.Debug.Other=Other debugging flags
-Option.Debug.gprof=Generate gprof information (-pg)
-Option.Debug.prof=Generate prof information (-p)
-Option.Debug.Unref=Include information about unreferenced symbols (-qdbxextra)
-Option.p = Generate prof information (-p)
-Option.pg = Generate gprof information (-pg)
-Option.check = Generate code which performs certain types of runtime checking (-qcheck)
-Option.dbxextra = Include all typedefs, structs, unions, enums for debugging (-qdbxextra)
-Option.extchk = Generate bind-time type checking information and check for compile time consistency (-qextchk)
-Option.fullpath = Preserve absolute path name of source files used with -g option (-qfullpath)
-Option.genproto = Produce ANSI prototypes from K&R definitions
-Option.genproto = Generate prototypes with parameter names
-Option.genproto.parmgenproto = Include parameter names in prototypes
-Option.heapdebug = Enable debug versions of memory management functions (-qheapdebug)
-Option.initauto = Initialize the automatic variables (-qinitauto=)
-Option.linedebug = Generate line number and source file name info for the debugger (-qlinedebug)
-Option.maxerr = Halt compilation after this many errors (-qmaxerr=)
-Option.proto = All functions are prototyped (-qproto)
-
-
-# Assembler options
-Option.Xlc.Assembler.Flags=Other assembler flags
-Option.Xlc.Assembler.warn.suppress=Suppress warnings (-W)
-Option.Xlc.Assembler.version=Announce version (-v)
-
-
-# XL C/C++ Preference page
-XLCompilerPreferencePage.name = XL C/C++ Compiler
-XLCompilerPropertyPage.name = XL C/C++ Compiler
-
-
-
-
-Bundle-Vendor = Eclipse.org
-Bundle-Name = XL C/C++ Remote Managed Build Support
-builder.name = Remote GNU Make
-extension.name = Remote XL C/C++ Per Project Profile
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.xml b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.xml
deleted file mode 100644
index feb60f0..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
-      <managedBuildRevision
-            fileVersion="4.0.0">
-      </managedBuildRevision>
-      <builder
-            commandLauncher="org.eclipse.ptp.rdt.core.remotemake.RemoteCommandLauncher"
-            id="org.eclipse.ptp.rdt.managedbuilder.xlc.ui.builder1"
-            isAbstract="false"
-            isVariableCaseSensitive="false"
-            name="%builder.name"
-            superClass="cdt.managedbuild.target.gnu.builder">
-      </builder>
-      <projectType
-            buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
-            id="org.eclipse.ptp.rdt.managedbuild.target.xlc.exe"
-            isAbstract="false"
-            isTest="false"
-            name="%TargetName.xlc.exe"
-            projectEnvironmentSupplier="org.eclipse.ptp.rdt.managedbuilder.xlc.ui.RemoteProjectEnvironmentSupplier"
-            projectMacroSupplier="org.eclipse.cdt.managedbuilder.xlc.ui.XLCProjectMacroSupplier">
-      	<configuration
-      		name="%ConfigName.Dbg"
-      		artifactExtension="exe"
-      		cleanCommand="rm -rf"
-      		errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
-			id="org.eclipse.ptp.rdt.managedbuild.config.xlc.exe.debug">
-			<toolChain
-                  archList="all"
-                  configurationEnvironmentSupplier="org.eclipse.cdt.managedbuilder.xlc.aix.AixConfigurationEnvironmentSupplier"
-                  id="org.eclipse.ptp.rdt.managedbuild.toolchain.xlc.exe.debug"
-                  name="%ToolChainName.Dbg"
-                  osList="all"
-                  targetTool="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.debug;org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.debug">
-			      <targetPlatform
-					  id="org.eclipse.ptp.rdt.managedbuild.target.xlc.platform.exe.debug"
-				 	  name="%PlatformName.Dbg"
-                      binaryParser="org.eclipse.cdt.core.XCOFF32"            					  
-					  osList="all"					  
-					  archList="all">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="org.eclipse.ptp.rdt.managedbuilder.xlc.builder.base"
-					  id="org.eclipse.ptp.rdt.managedbuilder.xlc.builder.exe.debug">		              
-			      </builder>
-			      <tool
-                      id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.compiler.exe.debug"
-                      superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.compiler.base">
-                      <option
-                          id="org.eclipse.ptp.rdt.xlc.cpp.compiler.exe.debug.option.optimization.level"
-                          defaultValue="xlc.c.compiler.optimization.level.none"
-                          superClass="xlc.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-						  id="org.eclipse.ptp.rdt.xlc.cpp.compiler.exe.debug.option.debugging.g"
-                          defaultValue="true"
-                          superClass="xlc.c.compiler.option.ecd.g">
-                      </option>
-                  </tool>
-                  <tool
-					  id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.compiler.exe.debug"
-                      superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.compiler.base">
-					  <option
-						  id="org.eclipse.ptp.rdt.xlc.c.compiler.exe.debug.option.optimization.level"
-						  defaultValue="xlc.c.optimization.level.none"
-						  superClass="xlc.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="org.eclipse.ptp.rdt.xlc.c.compiler.exe.debug.option.debugging.g"
-						  defaultValue="true"
-						  superClass="xlc.c.compiler.option.ecd.g">
-					  </option>
-                  </tool>
-                  <tool
-                      id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.debug"
-                      superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.base">
-                  </tool>
-                  <tool
-                      id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.debug"
-                      superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.base">
-                  </tool>                  
-				  <tool
-					  id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.assembler.exe.debug"
-					  superClass="cdt.managedbuild.tool.xlc.assembler">
-				  </tool>
-			 </toolChain>  
-		</configuration>
-		<configuration
-			name="%ConfigName.Rel"
-			artifactExtension="exe"
-			cleanCommand="rm -rf"
-			errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
-			id="org.eclipse.ptp.rdt.managedbuild.config.xlc.exe.release">
-			<toolChain
-                  archList="all"
-                  id="org.eclipse.ptp.rdt.managedbuild.toolchain.xlc.exe.release"
-                  name="%ToolChainName.Rel"
-                  osList="all"
-                  targetTool="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.release;org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.release">
-		          <targetPlatform
-		              id="org.eclipse.ptp.rdt.managedbuild.target.xlc.platform.exe.release"
-		              name="%PlatformName.Rel"		             
-		              binaryParser="org.eclipse.cdt.core.XCOFF32"
-		              osList="all"
-		              archList="all">		              
-		          </targetPlatform>
-				  <builder
-				  	  superClass="org.eclipse.ptp.rdt.managedbuilder.xlc.builder.base"
-				      id="org.eclipse.ptp.rdt.managedbuilder.xlc.builder.release">
-				  </builder> 
-				  <tool
-                      id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.compiler.exe.release"
-                      superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.compiler.base">                     
-					  <option
-						  id="org.eclipse.ptp.rdt.xlc.cpp.compiler.exe.release.option.optimization.level"
-						  defaultValue="xlc.c.optimization.level.Level5"
-						  superClass="xlc.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="org.eclipse.ptp.rdt.xlc.cpp.compiler.exe.release.option.debugging.g"
-						  defaultValue="false"
-						  superClass="xlc.c.compiler.option.ecd.g">
-					  </option>
-                  </tool>
-                  <tool
-                      id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.compiler.exe.release"
-                      superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.compiler.base">                          
-					  <option
-						  id="org.eclipse.ptp.rdt.xlc.c.compiler.exe.release.option.optimization.level"
-						  defaultValue="xlc.c.optimization.level.Level5"
-						  superClass="xlc.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="org.eclipse.ptp.rdt.xlc.c.compiler.exe.release.option.debugging.g"
-						  defaultValue="false"
-						  superClass="xlc.c.compiler.option.ecd.g">
-					  </option>
-                  </tool>
-                  <tool
-                      id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.release"
-                      superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.base">
-                  </tool> 
-                  <tool
-                      id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.release"
-                      superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.base">
-                  </tool>  
-				  <tool
-					  id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.assembler.exe.release"
-					  superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.assembler.exe.base">
-				  </tool>
-            </toolChain>
-            
-		</configuration>
-	</projectType>	
-	<toolChain
-                  archList="all"
-                  configurationEnvironmentSupplier="RemoteConfigurationEnvironmentSupplier"
-                  id="org.eclipse.ptp.rdt.managedbuild.toolchain.xlc.base"
-                  name="%ToolChainName.Dbg"
-                  osList="all"
-                  targetTool="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.debug;org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.debug">
-			  	  <builder
-					  superClass="org.eclipse.ptp.rdt.managedbuilder.xlc.ui.builder1"
-					  id="org.eclipse.ptp.rdt.managedbuilder.xlc.builder.base">		              
-			      </builder>
-			      <tool
-                      id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.compiler.base"
-                      superClass="cdt.managedbuild.tool.xlc.cpp.compiler">
-                  </tool>
-                  <tool
-					  id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.compiler.base"
-                      superClass="cdt.managedbuild.tool.xlc.c.compiler">
-                  </tool>
-                  <tool
-                      id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.base"
-                      superClass="cdt.managedbuild.tool.xlc.c.linker">
-                  </tool>
-                  <tool
-                      id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.base"
-                      superClass="cdt.managedbuild.tool.xlc.cpp.linker">
-                  </tool>                  
-				  <tool
-					  id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.assembler.exe.base"
-					  superClass="cdt.managedbuild.tool.xlc.assembler">
-				  </tool>
-			 </toolChain>        		
-   </extension>
-   <extension
-         id="RemoteXLCPerProjectProfile"
-         name="%extension.name"
-         point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
-     <scannerInfoCollector
-            class="org.eclipse.ptp.rdt.core.remotemake.ProjectDescriptionCollector"
-            scope="project"/>
-     		<!-- The ScannerInfoProvider search for the information needed by the profile and send it to the ScannerInfoCollector -->
-		<scannerInfoProvider providerId="org.eclipse.ptp.rdt.managedbuilder.xlc.ui.specsFile">
-			<!-- Specifies the compiler command that returns the information about standard include directories and standard definitions -->
-			<!-- The compiler command used will be always a C compiler command -->
-			<!-- The output for C or C++ projects will be different as the ScannerInfoProvider substitute the ${specs_file} variable below with a dummy "c" file or "cpp" file -->
-			<run
-					arguments="-E -v ${specs_file_path}"
-					command="${XL_compilerRoot}/xlC"
-					class="org.eclipse.ptp.rdt.core.remotemake.RemoteSpecsRunSIProvider">
-			</run>
-			<!-- Specifies the parser for the output generated by the compiler with the above command line -->
-			<scannerInfoConsoleParser
-					class="org.eclipse.cdt.make.xlc.core.scannerconfig.XlCSpecsConsoleParser">
-			</scannerInfoConsoleParser>
-		</scannerInfoProvider>
-   </extension>
-
-</plugin>
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/RemoteConfigurationEnvironmentSupplier.java b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/RemoteConfigurationEnvironmentSupplier.java
deleted file mode 100644
index a48d2ea..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/RemoteConfigurationEnvironmentSupplier.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable;
-import org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier;
-import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider;
-import org.eclipse.cdt.managedbuilder.internal.envvar.BuildEnvVar;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.ptp.rdt.core.RDTLog;
-import org.eclipse.ptp.rdt.core.serviceproviders.IRemoteExecutionServiceProvider;
-import org.eclipse.ptp.rdt.core.services.IRDTServiceConstants;
-import org.eclipse.ptp.rdt.services.core.IService;
-import org.eclipse.ptp.rdt.services.core.IServiceConfiguration;
-import org.eclipse.ptp.rdt.services.core.IServiceProvider;
-import org.eclipse.ptp.rdt.services.core.ProjectNotConfiguredException;
-import org.eclipse.ptp.rdt.services.core.ServiceModelManager;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-
-
-/**
- * Supplies remote environment variables on a per-configuration basis.
- * Right now it actually doesn't take into account service model configurations, so this just
- * acts the same as the RemoteProjectEnvironmentSupplier at the moment.
- * 
- * @author crecoskie
- *
- */
-@SuppressWarnings("restriction")
-public class RemoteConfigurationEnvironmentSupplier implements
-		IConfigurationEnvironmentVariableSupplier {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier#getVariable(java.lang.String, org.eclipse.cdt.managedbuilder.core.IConfiguration, org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider)
-	 */
-	public IBuildEnvironmentVariable getVariable(String variableName,
-			IConfiguration configuration, IEnvironmentVariableProvider provider) {
-		Map<String, String> envMap = getRemoteEnvironment(configuration.getManagedProject());
-		String value = envMap.get(variableName) == null ? new String() : envMap.get(variableName);
-		IBuildEnvironmentVariable envVar = new BuildEnvVar(variableName, value);
-		return envVar;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier#getVariables(org.eclipse.cdt.managedbuilder.core.IConfiguration, org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider)
-	 */
-	public IBuildEnvironmentVariable[] getVariables(
-			IConfiguration configuration, IEnvironmentVariableProvider provider) {
-		List<IBuildEnvironmentVariable> vars = new LinkedList<IBuildEnvironmentVariable>();
-		Map<String, String> remoteEnvMap = null;
-		
-		remoteEnvMap = getRemoteEnvironment(configuration.getManagedProject());
-		
-		if (remoteEnvMap != null) {
-			for (String var : remoteEnvMap.keySet()) {
-				String value = remoteEnvMap.get(var);
-
-				IBuildEnvironmentVariable buildEnvVar = new BuildEnvVar(var,
-						value);
-				vars.add(buildEnvVar);
-			}
-
-			return vars.toArray(new IBuildEnvironmentVariable[0]);
-		}
-		
-		else
-			return new IBuildEnvironmentVariable[0];
-	}
-	
-	/**
-	 * @param project
-	 * @param remoteEnvMap
-	 * @return
-	 */
-	private Map<String, String> getRemoteEnvironment(IManagedProject project) {
-		IProject iProj = (IProject) project.getOwner();
-		Map<String, String> remoteEnvMap = new HashMap<String, String>();
-
-		ServiceModelManager smm = ServiceModelManager.getInstance();
-
-		try {
-			IServiceConfiguration serviceConfig = smm
-					.getActiveConfiguration(iProj);
-			IService buildService = smm
-					.getService(IRDTServiceConstants.SERVICE_BUILD);
-			IServiceProvider serviceProvider = serviceConfig
-					.getServiceProvider(buildService);
-			IRemoteExecutionServiceProvider executionProvider = null;
-			if (serviceProvider instanceof IRemoteExecutionServiceProvider) {
-				executionProvider = (IRemoteExecutionServiceProvider) serviceProvider;
-			}
-
-			if (executionProvider != null) {
-
-				IRemoteServices remoteServices = executionProvider
-						.getRemoteServices();
-
-				IRemoteConnection connection = executionProvider
-						.getConnection();
-
-				if (!connection.isOpen()) {
-					try {
-						connection.open(null);
-					} catch (RemoteConnectionException e) {
-						RDTLog.logError(e);
-					}
-				}
-
-				List<String> command = new LinkedList<String>();
-
-				IRemoteProcessBuilder processBuilder = remoteServices
-						.getProcessBuilder(connection, command);
-
-				remoteEnvMap = processBuilder.environment();
-
-			}
-		} catch (ProjectNotConfiguredException e) {
-			// We can get here when the environment supplier is called during
-			// project creation, since the service model is not yet setup.
-			// Swallow the error.
-		}
-		return remoteEnvMap;
-	}
-
-}
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/Activator.java b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/Activator.java
deleted file mode 100644
index 1e67eb2..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.ptp.rdt.managedbuilder.xlc.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rdt.managedbuilder.xlc.ui";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/RemoteProjectEnvironmentSupplier.java b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/RemoteProjectEnvironmentSupplier.java
deleted file mode 100644
index 59378d7..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/RemoteProjectEnvironmentSupplier.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rdt.managedbuilder.xlc.ui;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.managedbuilder.internal.envvar.BuildEnvVar;
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable;
-import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider;
-import org.eclipse.cdt.managedbuilder.envvar.IProjectEnvironmentVariableSupplier;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.ptp.rdt.core.RDTLog;
-import org.eclipse.ptp.rdt.core.serviceproviders.IRemoteExecutionServiceProvider;
-import org.eclipse.ptp.rdt.core.services.IRDTServiceConstants;
-import org.eclipse.ptp.rdt.services.core.IService;
-import org.eclipse.ptp.rdt.services.core.IServiceConfiguration;
-import org.eclipse.ptp.rdt.services.core.IServiceProvider;
-import org.eclipse.ptp.rdt.services.core.ProjectNotConfiguredException;
-import org.eclipse.ptp.rdt.services.core.ServiceModelManager;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-
-/**
- * Supplies environment variables from the remote system.
- * 
- * @author crecoskie
- *
- */
-@SuppressWarnings("restriction")
-public class RemoteProjectEnvironmentSupplier implements
-		IProjectEnvironmentVariableSupplier {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IProjectEnvironmentVariableSupplier#getVariable(java.lang.String, org.eclipse.cdt.managedbuilder.core.IManagedProject, org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider)
-	 */
-	public IBuildEnvironmentVariable getVariable(String variableName,
-			IManagedProject project, IEnvironmentVariableProvider provider) {
-		Map<String, String> envMap = getRemoteEnvironment(project);
-		String value = envMap.get(variableName) == null ? new String() : envMap.get(variableName);
-		IBuildEnvironmentVariable envVar = new BuildEnvVar(variableName, value);
-		return envVar;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.managedbuilder.envvar.IProjectEnvironmentVariableSupplier#getVariables(org.eclipse.cdt.managedbuilder.core.IManagedProject, org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider)
-	 */
-	public IBuildEnvironmentVariable[] getVariables(IManagedProject project,
-			IEnvironmentVariableProvider provider) {
-		
-		List<IBuildEnvironmentVariable> vars = new LinkedList<IBuildEnvironmentVariable>();
-		Map<String, String> remoteEnvMap = null;
-		
-		remoteEnvMap = getRemoteEnvironment(project);
-		
-		if (remoteEnvMap != null) {
-			for (String var : remoteEnvMap.keySet()) {
-				String value = remoteEnvMap.get(var);
-
-				IBuildEnvironmentVariable buildEnvVar = new BuildEnvVar(var,
-						value);
-				vars.add(buildEnvVar);
-			}
-
-			return vars.toArray(new IBuildEnvironmentVariable[0]);
-		}
-		
-		else
-			return new IBuildEnvironmentVariable[0];
-
-	}
-
-	/**
-	 * @param project
-	 * @param remoteEnvMap
-	 * @return
-	 */
-	private Map<String, String> getRemoteEnvironment(IManagedProject project) {
-		IProject iProj = (IProject) project.getOwner();
-		Map<String, String> remoteEnvMap = new HashMap<String, String>();
-
-		ServiceModelManager smm = ServiceModelManager.getInstance();
-
-		try {
-			IServiceConfiguration serviceConfig = smm
-					.getActiveConfiguration(iProj);
-			IService buildService = smm
-					.getService(IRDTServiceConstants.SERVICE_BUILD);
-			IServiceProvider serviceProvider = serviceConfig
-					.getServiceProvider(buildService);
-			IRemoteExecutionServiceProvider executionProvider = null;
-			if (serviceProvider instanceof IRemoteExecutionServiceProvider) {
-				executionProvider = (IRemoteExecutionServiceProvider) serviceProvider;
-			}
-
-			if (executionProvider != null) {
-
-				IRemoteServices remoteServices = executionProvider
-						.getRemoteServices();
-
-				IRemoteConnection connection = executionProvider
-						.getConnection();
-
-				if (!connection.isOpen()) {
-					try {
-						connection.open(null);
-					} catch (RemoteConnectionException e) {
-						RDTLog.logError(e);
-					}
-				}
-
-				List<String> command = new LinkedList<String>();
-
-				IRemoteProcessBuilder processBuilder = remoteServices
-						.getProcessBuilder(connection, command);
-
-				remoteEnvMap = processBuilder.environment();
-
-			}
-		} catch (ProjectNotConfiguredException e) {
-			// We can get here when the environment supplier is called during
-			// project creation, since the service model is not yet setup.
-			// Swallow the error.
-		}
-		return remoteEnvMap;
-	}
-}
-
-
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath b/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath
deleted file mode 100644
index 3aaeea8..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="src" path="suite"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.project b/rdt/org.eclipse.ptp.rdt.ui.tests/.project
deleted file mode 100644
index f21926c..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rdt.ui.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs b/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f9482f2..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Nov 19 13:50:59 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index f8a5ddf..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests Plug-in
-Bundle-SymbolicName: org.eclipse.ptp.rdt.ui.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: com.ibm.icu;bundle-version="3.8.1",
- org.eclipse.ptp.rdt.core;bundle-version="1.0.0",
- org.eclipse.ptp.rdt.core.tests;bundle-version="1.0.0",
- org.eclipse.ptp.rdt.ui;bundle-version="1.0.0",
- org.eclipse.cdt.ui.tests;bundle-version="5.0.2",
- org.eclipse.cdt.ui;bundle-version="5.0.2",
- org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.ptp.rdt.services;bundle-version="1.0.1",
- org.eclipse.cdt.core;bundle-version="5.0.2",
- org.eclipse.cdt.core.tests;bundle-version="5.0.1",
- org.junit;bundle-version="3.8.2",
- org.eclipse.ui;bundle-version="3.4.0",
- org.eclipse.core.resources;bundle-version="3.4.0",
- org.eclipse.jface.text;bundle-version="3.4.0",
- org.eclipse.ui.editors;bundle-version="3.4.0"
-Export-Package: org.eclipse.ptp.rdt.ui.tests.navigation,
- org.eclipse.ptp.rdt.ui.tests.suite
-Bundle-Activator: org.eclipse.ptp.rdt.ui.tests.RDTUITestPlugin
-Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.ui.part
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties b/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties
deleted file mode 100644
index 0a56acc..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = test/,\
-           suite/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c b/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c
deleted file mode 100644
index ed3b53d..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#import "test.h"
-
-int main(int argc, char **argv) {
-
-}
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h b/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h
deleted file mode 100644
index e69de29..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h
+++ /dev/null
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java b/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java
deleted file mode 100644
index 49c77c6..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.ptp.rdt.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class RDTUITestPlugin extends AbstractUIPlugin {
-
-	
-	private static RDTUITestPlugin plugin;
-	
-	public RDTUITestPlugin() {
-		super();
-		plugin = this;
-	}
-
-	public static RDTUITestPlugin getDefault() {
-		return plugin;
-	}
-}
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java b/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java
deleted file mode 100644
index db76260..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.ptp.rdt.ui.tests.suite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-/**
- * Tests that do not require a connection to a remote server.
- */
-public class UIBasicTestSuite extends TestCase {
-	public static Test suite() {
-		TestSuite suite = new TestSuite(UIBasicTestSuite.class.getName());
-		// TODO add some tests
-		return suite;
-	}
-}
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java b/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java
deleted file mode 100644
index 7b468b7..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.ptp.rdt.ui.tests.suite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.ptp.rdt.ui.tests.navigation.NavigationTests;
-
-
-/**
- * Tests that require a connection to be run,
- * this suite must be launched from a ConnectionSuite.
- */
-public class UIConnectionTestSuite extends TestCase {
-	public static Test suite() {
-		TestSuite suite = new TestSuite(UIConnectionTestSuite.class.getName());
-		
-		suite.addTest(NavigationTests.suite());
-		
-		return suite;
-	}
-}
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java b/rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java
deleted file mode 100644
index 6602c74..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.eclipse.ptp.rdt.ui.tests.navigation;
-
-import java.net.URI;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.index.IIndex;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-import org.eclipse.cdt.internal.ui.editor.ASTProvider;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.cdt.ui.tests.text.EditorTestHelper;
-import org.eclipse.cdt.ui.tests.text.selection.CPPSelectionTestsAnyIndexer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ptp.internal.rdt.core.index.RemoteFastIndexer;
-import org.eclipse.ptp.internal.rdt.ui.search.actions.OpenDeclarationsAction;
-import org.eclipse.ptp.rdt.core.tests.ConnectionManager;
-import org.eclipse.ptp.rdt.core.tests.RemoteTestProject;
-import org.eclipse.ptp.rdt.services.core.ServiceModelManager;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
-
-@SuppressWarnings("restriction")
-
-public class NavigationTests extends CPPSelectionTestsAnyIndexer {
-
-	private static final int MAX_WAIT_TIME = 120000;
-
-	/* I think a lot of the tests that fail do so because of two reasons:
-	 * - Headers are not being skipped as they should be, 
-	 *  
-	 */
-	private static final String[] TESTS_TO_RUN = {
-		"testBug93281",
-		"testBug207320",
-		"testTemplateClassMethod_207320",
-		//"testBasicDefinition", // FAIL cannot reproduce failure
-		"testBasicTemplateInstance_207320",
-		"testBug86829A",
-		//"testCPPSpecDeclsDefs", // FAIL cannot reproduce failure
-		"testBug168533",
-		"testBug95225",
-		//"testBug95202", // FAIL, should not fail when headers are skipped properly
-		"testBug101287",
-		"testBug102258",
-		"testBug103323",
-		"testBug78354",
-		//"testBug103697", // FAIL trying to use local path which fails
-		//"testBug108202", // FAIL
-		//"testCNavigationInCppProject_bug183973", // FAIL
-		//"testFuncWithTypedefForAnonymousStruct_190730", // FAIL
-		//"testFuncWithTypedefForAnonymousEnum_190730", // FAIL
-		"testMacroNavigation",
-		"testMacroNavigation_Bug208300",
-		"testIncludeNavigation",
-		//"testNavigationCppCallsC", // FAIL
-		//"testNavigationCCallsCpp", // FAIL
-		"testNavigationInDefinedExpression_215906",
-	};
-	
-	public static Test suite() {
-		//return suite(NavigationTests.class);
-		TestSuite suite = new TestSuite();
-		for(String testName : TESTS_TO_RUN)
-			suite.addTest(new NavigationTests(testName));
-		return suite;
-	}
-	
-	
-	private static final String PROJECT_NAME = "navigation_test_project";
-	
-	@Override
-	protected String getEditorID() {
-		return "org.eclipse.pdt.rdt.ui.editor.CEditor";
-	}
-
-	@Override
-	protected void waitUntilFileIsIndexed(IIndex index, IFile file, int maxmillis) throws Exception {
-		Thread.sleep(10000);
-        CCorePlugin.getIndexManager().joinIndexer(MAX_WAIT_TIME, new NullProgressMonitor());
-	}
-
-	public NavigationTests(String name) {
-		super(name, RemoteFastIndexer.ID);
-	}
-	
-	@Override
-	protected IASTNode testF3(IFile file, int offset, int length) throws ParserException, CoreException {
-		if (offset < 0)
-			throw new ParserException("offset can not be less than 0 and was " + offset); //$NON-NLS-1$
-		
-        IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-        IEditorPart part = null;
-        try {
-            part = page.openEditor(new FileEditorInput(file), getEditorID(), true); //$NON-NLS-1$
-        } catch (PartInitException e) {
-            assertFalse(true);
-        }
-        
-        if (part instanceof CEditor) {
-        	CEditor editor= (CEditor) part;
-    		EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 100, 500, 10);
-            ((AbstractTextEditor)part).getSelectionProvider().setSelection(new TextSelection(offset,length));
-            
-            final OpenDeclarationsAction action = (OpenDeclarationsAction) editor.getAction("OpenDeclarations"); //$NON-NLS-1$
-            action.runSync();
-			
-        	// update the file/part to point to the newly opened IFile/IEditorPart
-            part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); 
-            assertTrue (part instanceof CEditor);
-            editor= (CEditor) part;
-    		EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 100, 500, 10);
-
-    		// the action above should highlight the declaration, so now retrieve it and use that selection to get the IASTName selected on the TU
-            ISelection sel= editor.getSelectionProvider().getSelection();
-            
-            final IASTName[] result= {null};
-            if (sel instanceof ITextSelection) {
-            	final ITextSelection textSel = (ITextSelection)sel;
-            	ITranslationUnit tu = (ITranslationUnit)editor.getInputCElement();
-        		IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, new NullProgressMonitor(), new ASTRunnable() {
-        			public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException {
-        				result[0]= ast.getNodeSelector(null).findName(textSel.getOffset(), textSel.getLength());
-        				return Status.OK_STATUS;
-        			}
-        		});
-        		assertTrue(ok.isOK());
-				return result[0];
-            }
-        }
-        
-        return null;
-    }
-	
-
-	protected void setUp() throws Exception {
-		//super.setUp();
-		
-		IWorkbenchPage page= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		IViewReference[] refs= page.getViewReferences();
-		for (int i = 0; i < refs.length; i++) {
-			IViewReference viewReference = refs[i];
-			page.setPartState(viewReference, IWorkbenchPage.STATE_RESTORED);
-		}
-		
-		URI projectRootURI = ConnectionManager.getInstance().getWorkspaceURI(PROJECT_NAME);
-		RemoteTestProject remoteProject = new RemoteTestProject(PROJECT_NAME, projectRootURI);
-		
-		ConnectionManager.getInstance().resetServiceModel(remoteProject.getName());
-		ServiceModelManager.getInstance().printServiceModel();
-		
-		fCProject = remoteProject.getCProject();
-	
-		CCorePlugin.getIndexManager().setIndexerId(fCProject, RemoteFastIndexer.ID);
-	}
-	
-	
-	protected void tearDown() throws Exception {
-		super.tearDown(); 
-	}
-
-}
diff --git a/releng/.cvsignore b/releng/.cvsignore
deleted file mode 100644
index 3a4edf6..0000000
--- a/releng/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.project
diff --git a/releng/org.eclipse.ptp.pldt.upc-feature/.project b/releng/org.eclipse.ptp.pldt.upc-feature/.project
deleted file mode 100644
index 78a6bbc..0000000
--- a/releng/org.eclipse.ptp.pldt.upc-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.upc-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.pldt.upc-feature/build.properties b/releng/org.eclipse.ptp.pldt.upc-feature/build.properties
deleted file mode 100644
index 8c26e98..0000000
--- a/releng/org.eclipse.ptp.pldt.upc-feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               license.html,\
-               epl-v10.html
-generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.ptp.pldt.upc-feature/epl-v10.html b/releng/org.eclipse.ptp.pldt.upc-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.pldt.upc-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.pldt.upc-feature/feature.properties b/releng/org.eclipse.ptp.pldt.upc-feature/feature.properties
deleted file mode 100644
index 3b5db94..0000000
--- a/releng/org.eclipse.ptp.pldt.upc-feature/feature.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright (c) 2005,2008 IBM Corporation
-#
-# features.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=PTP Parallel Language Development Tools UPC Support
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds a range of static analysis and programming assistance tools.
-
-# copyright
-copyright=\
-Copyright (c) 2006,2008 IBM\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.pldt.upc-feature/feature.xml b/releng/org.eclipse.ptp.pldt.upc-feature/feature.xml
deleted file mode 100644
index ea97668..0000000
--- a/releng/org.eclipse.ptp.pldt.upc-feature/feature.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.pldt.upc"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.pldt.common">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license>
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/galileo"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.cdt.core" version="4.0.2" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.cdt.ui"/>
-      <import plugin="org.eclipse.help"/>
-      <import plugin="org.eclipse.cdt.doc.user"/>
-      <import plugin="org.eclipse.ptp.pldt.common"/>
-      <import plugin="org.eclipse.cdt.core.parser.upc" version="5.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.upc"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.pldt.upc-feature/license.html b/releng/org.eclipse.ptp.pldt.upc-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.pldt.upc-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.releng/.cvsignore b/releng/org.eclipse.ptp.releng/.cvsignore
deleted file mode 100644
index 3d9429e..0000000
--- a/releng/org.eclipse.ptp.releng/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-results
-tools
diff --git a/releng/org.eclipse.ptp.releng/.project b/releng/org.eclipse.ptp.releng/.project
deleted file mode 100644
index 4f01de7..0000000
--- a/releng/org.eclipse.ptp.releng/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.releng</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.releng/build.sh b/releng/org.eclipse.ptp.releng/build.sh
deleted file mode 100644
index da9788b..0000000
--- a/releng/org.eclipse.ptp.releng/build.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2008, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#*******************************************************************************
-
-# export display for running the tests
-export DISPLAY=:1
-
-# set up to use the Java 5 JRE
-export PATH=/opt/public/common/ibm-java2-ppc-50/bin:$PATH
-
-# make sure we're in the releng project dir 
-cd `dirname $0`
-
-umask 0022
-
-# Checkout basebuilder to run the build
-mkdir -p tools
-cd tools
-cvs -d:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse \
-	checkout -r R35_RC2 org.eclipse.releng.basebuilder
-cd ..
-
-# Let's go!
-java -jar tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar \
-	-ws gtk -arch ppc -os linux -application org.eclipse.ant.core.antRunner $*
-
-exit 0
diff --git a/releng/org.eclipse.ptp.releng/build.xml b/releng/org.eclipse.ptp.releng/build.xml
deleted file mode 100644
index 543991f..0000000
--- a/releng/org.eclipse.ptp.releng/build.xml
+++ /dev/null
@@ -1,521 +0,0 @@
-<project name="PTP" default="nightly">
-	<target name="hi">
-		<echo message="${eclipse.home}"/>
-	</target>
-	
-	<target name="build" depends="zips,test"/>
-	<target name="nightly" depends="tag,zips,sign,test,copy"/>
-	<target name="testbuild" depends="zips,test,copy"/>
-	<target name="buildcopy" depends="zips,copy"/>
-	
-	<target name="init">
-		<touch file="${user.home}/.cvspass" />
-		<tstamp/>
-		<property name="eclipseDist" value="/home/data/httpd/download.eclipse.org/eclipse/downloads/drops/R-3.5-200906111540/eclipse-SDK-3.5-linux-gtk-ppc.tar.gz"/>
-		<property name="cdtDist" value="/home/data/httpd/download.eclipse.org/tools/cdt/builds/6.1.0/I.I200907240805/cdt-master-6.1.0-I200907240805.zip"/>
-		<property name="mylynDist" value="/home/data/httpd/download.eclipse.org/tools/mylyn/update/galileo/mylyn-3.2.0.v20090617-0100-e3.4.zip"/>
-		<property name="rseDist" value="/home/data/httpd/download.eclipse.org/dsdp/tm/downloads/drops/R-3.1-200906171400/RSE-SDK-3.1.zip"/>
-		<property name="tauJars" value="${user.home}/tau_jars.zip"/>
-		<property name="eclipseRelease" value="galileo"/>
-		<property name="ptpBranchVersion" value="3.0.0"/>
-		<property name="photranBranchVersion" value="5.0.0"/>
-		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
-		<property name="forceContextQualifier" value="${timestamp}"/>
-		<property name="buildingOSGi" value="true"/>
-		<property name="buildDirectory" value="${basedir}/results"/>
-		<property name="copyToDir" value="/home/www/tools/ptp/builds/${eclipseRelease}"/>
-		<property name="testDirectory" value="${buildDirectory}/test"/>
-		<property name="baseLocation" value="${buildDirectory}/eclipse"/>
-		<property name="pde.build.scripts" value="${eclipse.pdebuild.scripts}"/>
-		<property name="collectingFolder" value="eclipse"/>
-		<property name="archivePrefix" value="eclipse"/>
-		<property name="buildType" value="I" />
-		<property name="buildId" value="${buildType}${timestamp}"/>
-		<property name="zipsdir" value="${buildDirectory}/${buildType}.${buildId}"/>
-		<property name="ptpMasterFile" value="ptp-master-${ptpBranchVersion}-${buildId}.zip"/>
-		<property name="photranMasterFile" value="photran-master-${photranBranchVersion}-${buildId}.zip"/>
-		<property name="eclipseTest" value="org.eclipse.test_3.2.0"/>
-		<property name="mailto" value="g.watson@computer.org"/>
-		<property name="eclipseRoot" value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse"/>
-		<property name="baseos" value="${osgi.os}"/>
-		<property name="basews" value="${osgi.ws}"/>
-		<property name="basearch" value="${osgi.arch}"/>
-		<property name="tagbranch" value=""/>
-		<property name="tagname" value="v${timestamp}"/>
-		<property name="testReports" value="${zipsdir}/testReports"/>
-		<property name="junit-report-output" value="${testReports}"/>
-		<condition property="onWindows">
-			<os family="windows"/>
-		</condition>
-		<mkdir dir="${buildDirectory}"/>
-		<mkdir dir="${testReports}"/>
-	</target>
-	
-	<target name="fetch" depends="init">
-		<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
-			<property name="builder" value="${basedir}/master"/>
-		</ant>
-		<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
-			<property name="builder" value="${basedir}/master"/>
-		</ant>
-	</target>
-	
-	<target name="unzip" depends="init" unless="dontUnzip">
-		<untar src="${eclipseDist}" dest="${buildDirectory}" compression="gzip"/>
-		<unzip src="${rseDist}" dest="${buildDirectory}"/>
-		<unzip src="${cdtDist}" dest="${buildDirectory}/eclipse"/>
-		<unzip src="${mylynDist}" dest="${buildDirectory}/eclipse"/>
-	</target>
-	
-	<target name="zips" depends="init,unzip">
-		<ant antfile="build.xml" dir="${pde.build.scripts}">
-			<property name="builder" value="${basedir}/master" />
-		</ant>
-		<concat destfile="${zipsdir}/compilelog.txt">
-			<fileset dir="${buildDirectory}/plugins" includes="**/*.bin.log"/>
-			<fileset dir="${buildDirectory}/plugins" includes="**/*@dot.log"/>
-		</concat>
-		<loadfile property="compileLog" srcFile="${zipsdir}/compilelog.txt"/>
-		<condition property="hasErrors">
-			<contains string="${compileLog}" substring=" ERROR"/>
-		</condition>
-		<move file="${zipsdir}/${ptpMasterFile}" todir="${buildDirectory}"/>
-		<move file="${zipsdir}/${photranMasterFile}" todir="${buildDirectory}"/>
-		
-		<unzip src="${buildDirectory}/${ptpMasterFile}" dest="${buildDirectory}/site"/>
-		<!--unzip src="${buildDirectory}/${photranMasterFile}" dest="${buildDirectory}/site"/-->
-		<copy file="${buildDirectory}/eclipse/epl-v10.html" todir="${buildDirectory}/site/eclipse"/>
-		<copy file="${buildDirectory}/eclipse/notice.html" todir="${buildDirectory}/site/eclipse"/>
-		<copy file="buildsite.xml" tofile="${buildDirectory}/site/eclipse/site.xml"/>
-		<replace file="${buildDirectory}/site/eclipse/site.xml">
-			<replacefilter token="@timeStamp@" value="${timestamp}"/>
-		</replace>
-		<copy file="pack.properties" todir="${buildDirectory}/site/eclipse"/>
-
-		<zip destfile="${zipsdir}/${ptpMasterFile}"
-			basedir="${buildDirectory}/site/eclipse"/>
-		
-		<!--
-		<unzip src="${buildDirectory}/${photranMasterFile}" dest="${buildDirectory}/photran_site"/>
-		<copy file="${buildDirectory}/eclipse/epl-v10.html" todir="${buildDirectory}/photran_site/eclipse"/>
-		<copy file="${buildDirectory}/eclipse/notice.html" todir="${buildDirectory}/photran_site/eclipse"/>
-		<copy file="photran_buildsite.xml" tofile="${buildDirectory}/photran_site/eclipse/site.xml"/>
-		<replace file="${buildDirectory}/photran_site/eclipse/site.xml">
-			<replacefilter token="@timeStamp@" value="${timestamp}"/>
-		</replace>
-		<copy file="pack.properties" todir="${buildDirectory}/photran_site/eclipse"/>
-
-		<zip destfile="${zipsdir}/${photranMasterFile}"
-			basedir="${buildDirectory}/photran_site/eclipse"/>
-		-->
-
-	</target>
-
-	<target name="sign" depends="init" unless="hasErrors">
-		<exec executable="sign">
-			<arg value="${buildDirectory}/${buildType}.${buildId}/${ptpMasterFile}"/>
-			<arg value="nomail"/>
-			<arg value="${buildDirectory}/signed"/>
-		</exec>
-		<waitfor maxwait="30" maxwaitunit="minute">
-			<available file="${buildDirectory}/signed/${ptpMasterFile}"/>
-		</waitfor>
-		<move file="${buildDirectory}/signed/${ptpMasterFile}" todir="${zipsdir}"/>
-		<!--
-		<exec executable="sign">
-			<arg value="${buildDirectory}/${buildType}.${buildId}/${photranMasterFile}"/>
-			<arg value="nomail"/>
-			<arg value="${buildDirectory}/signed"/>
-		</exec>
-		<waitfor maxwait="30" maxwaitunit="minute">
-			<available file="${buildDirectory}/signed/${photranMasterFile}"/>
-		</waitfor>
-		<move file="${buildDirectory}/signed/${photranMasterFile}" todir="${zipsdir}"/>
-		-->
-	</target>
-	<target name="test" depends="init" unless="hasErrors"/>
-	<target name="copy" depends="init" unless="hasErrors">
-		<mkdir dir="${copyToDir}/${buildType}.${buildId}"/>
-		<copy todir="${copyToDir}/${buildType}.${buildId}">
-			<fileset dir="${buildDirectory}/${buildType}.${buildId}"/>
-		</copy>
-		<!-- Create symlink to latest build -->
-		<symlink action="delete" link="${copyToDir}/latest" failonerror="false"/>
-		<symlink link="${copyToDir}/latest" resource="${copyToDir}/${buildType}.${buildId}" overwrite="true"/>
-		<symlink action="delete" link="${copyToDir}/ptp-master-${ptpBranchVersion}-latest.zip" failonerror="false"/>
-		<symlink link="${copyToDir}/ptp-master-${ptpBranchVersion}-latest.zip" resource="${copyToDir}/${buildType}.${buildId}/${ptpMasterFile}" overwrite="true"/>
-		<symlink action="delete" link="${copyToDir}/rdt-server-unix-1.0-latest.tar" failonerror="false"/>
-		<symlink link="${copyToDir}/rdt-server-unix-1.0-latest.tar" resource="${copyToDir}/${buildType}.${buildId}/rdt-server-unix-1.0.tar" overwrite="true"/>
-	</target>
-	
-	<target name="tagone">
-		<cvs cvsroot="/cvsroot/tools" command="rtag ${tagbranch} ${tagname} ${tagmodule}"/>
-	</target>
-	
-	<target name="tag" depends="init">
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.master"/>
-		</antcall>
-		
-		<!--Features-->
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.utils-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.core-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote.remotetools-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote.rse-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remotetools-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.ll-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.pe-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.mpich2-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.openmpi-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.external-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.sdm-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.pldt-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.pldt.lapi-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.perf-feature"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau.fortran-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rdt-feature"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.services-feature"/>
-		</antcall>		
-		
-		<!--Plugins-->
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.proxy.protocol"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.proxy"/>
-		</antcall>			
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.proxy"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpich2.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpich2.proxy"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpich2.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.rm.remote"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.proxy"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.generichost"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.launcher"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.preferences"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.utils"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.launch"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/doc/org.eclipse.ptp.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.common"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.help"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.lapi"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis"/>
-		</antcall>			
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis.cdt"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.analysis"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.ui.pv"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.wizards"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.jars"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papiselect"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.perfdmf"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinst"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinstfort"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.toolopts"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.remotejars"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.stubs"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.doc.user"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.aix.ppc"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.linux.ppc"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.linux.x86"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.linux.x86_64"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.macosx.ppc"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.macosx.x86"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.parallel"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papitest"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.tests"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services.test"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.services.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.services.test"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.services.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran-feature"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface"/>
-		</antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface.vpg"/>
-        </antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.core.intel"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.core.vpg"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.errorparsers.xlf"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.intel-feature"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.gnu.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.intel.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.xlf.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.ui"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.ui.vpg"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.xlf-feature"/>
-		</antcall>
-	</target>
-</project>
diff --git a/releng/org.eclipse.ptp.releng/buildsite.xml b/releng/org.eclipse.ptp.releng/buildsite.xml
deleted file mode 100644
index 8a67658..0000000
--- a/releng/org.eclipse.ptp.releng/buildsite.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-	<description url="http://download.eclipse.org/tools/ptp/releases/galileo">
-		Parallel Tools Platform update site - Release 3.0
-	</description>
-	<category-def name="Parallel Tools Platform 3.0" label="Parallel Tools Platform 3.0"/>
-	<feature id="org.eclipse.ptp" url="features/org.eclipse.ptp_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.core" url="features/org.eclipse.ptp.core_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.services" url="features/org.eclipse.ptp.services_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.utils" url="features/org.eclipse.ptp.utils_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.remotetools" url="features/org.eclipse.ptp.remotetools_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.rm.ibm.ll" url="features/org.eclipse.ptp.rm.ibm.ll_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.rm.ibm.pe" url="features/org.eclipse.ptp.rm.ibm.pe_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.remote.remotetools" url="features/org.eclipse.ptp.remote.remotetools_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.remote.rse" url="features/org.eclipse.ptp.remote.rse_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.debug.sdm" url="features/org.eclipse.ptp.debug.sdm_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.external" url="features/org.eclipse.ptp.external_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.remote" url="features/org.eclipse.ptp.remote_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.rm.mpich2" url="features/org.eclipse.ptp.rm.mpich2_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.rm.openmpi" url="features/org.eclipse.ptp.rm.openmpi_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.pldt" url="features/org.eclipse.ptp.pldt_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.pldt.lapi" url="features/org.eclipse.ptp.pldt.lapi_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.pldt.upc" url="features/org.eclipse.ptp.pldt.upc_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.perf" url="features/org.eclipse.ptp.perf_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.perf.tau" url="features/org.eclipse.ptp.perf.tau_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	
-	<category-def name="Remote Development Tools" label="Remote Development Tools"/>
-	<feature id="org.eclipse.ptp.rdt" url="features/org.eclipse.ptp.rdt_3.0.0.@timeStamp@.jar" version="3.0.0.@timeStamp@">
-		<category name="Remote Development Tools"/>
-	</feature>
-	
-	<category-def name="Fortran Development Tools (Photran)" label="Fortran Development Tools (Photran)"/>
-	<feature id="org.eclipse.photran" url="features/org.eclipse.photran_5.0.0.@timeStamp@.jar" version="5.0.0.@timeStamp@">
-		<category name="Fortran Development Tools (Photran)"/>
-	</feature>
-	<feature id="org.eclipse.photran.intel" url="features/org.eclipse.photran.intel_5.0.0.@timeStamp@.jar" version="5.0.0.@timeStamp@" os="linux">
-		<category name="Fortran Development Tools (Photran)"/>
-	</feature>
-	<feature id="org.eclipse.photran.xlf" url="features/org.eclipse.photran.xlf_5.0.0.@timeStamp@.jar" version="5.0.0.@timeStamp@">
-		<category name="Fortran Development Tools (Photran)"/>
-	</feature></site>
diff --git a/releng/org.eclipse.ptp.releng/buildsite_release.xml b/releng/org.eclipse.ptp.releng/buildsite_release.xml
deleted file mode 100644
index 300db32..0000000
--- a/releng/org.eclipse.ptp.releng/buildsite_release.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-	<description url="http://download.eclipse.org/tools/ptp/releases/galileo">
-		Parallel Tools Platform update site - Release 3.0
-	</description>
-	<category-def name="Parallel Tools Platform 3.0" label="Parallel Tools Platform 3.0"/>
-	<feature id="org.eclipse.ptp" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.core" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.core_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.services" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.services_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.utils" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.utils_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.remotetools" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.remotetools_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.rm.ibm.ll" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.rm.ibm.ll_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.rm.ibm.pe" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.rm.ibm.pe_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.remote.remotetools" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.remote.remotetools_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.remote.rse" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.remote.rse_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.debug.sdm" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.debug.sdm_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.external" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.external_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.remote" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.remote_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.rm.mpich2" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.rm.mpich2_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.rm.openmpi" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.rm.openmpi_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.pldt" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.pldt_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.pldt.lapi" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.pldt.lapi_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.pldt.upc" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.pldt.upc_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.perf" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.perf_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	<feature id="org.eclipse.ptp.perf.tau" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.perf.tau_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Parallel Tools Platform 3.0"/>
-	</feature>
-	
-	<category-def name="Remote Development Tools" label="Remote Development Tools"/>
-	<feature id="org.eclipse.ptp.rdt" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/releases/galileo/features/org.eclipse.ptp.rdt_3.0.0.@timeStamp@.jar&amp;r=1" version="3.0.0.@timeStamp@">
-		<category name="Remote Development Tools"/>
-	</feature>
-	
-	<category-def name="Fortran Development Tools (Photran)" label="Fortran Development Tools (Photran)"/>
-	<feature id="org.eclipse.photran" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/photran/releases/galileo/features/org.eclipse.photran_5.0.0.@timeStamp@.jar&amp;r=1" version="5.0.0.@timeStamp@">
-		<category name="Fortran Development Tools (Photran)"/>
-	</feature>
-	<feature id="org.eclipse.photran.intel" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/photran/releases/galileo/features/org.eclipse.photran.intel_5.0.0.@timeStamp@.jar&amp;r=1" version="5.0.0.@timeStamp@" os="linux">
-		<category name="Fortran Development Tools (Photran)"/>
-	</feature>
-	<feature id="org.eclipse.photran.xlf" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/photran/releases/galileo/features/org.eclipse.photran.xlf_5.0.0.@timeStamp@.jar&amp;r=1" version="5.0.0.@timeStamp@">
-		<category name="Fortran Development Tools (Photran)"/>
-	</feature></site>
diff --git a/releng/org.eclipse.ptp.releng/maps/photran.map b/releng/org.eclipse.ptp.releng/maps/photran.map
deleted file mode 100644
index 350e322..0000000
--- a/releng/org.eclipse.ptp.releng/maps/photran.map
+++ /dev/null
@@ -1,25 +0,0 @@
-! Master feature
-feature@org.eclipse.photran.master=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.master
-
-! Photran features
-feature@org.eclipse.photran=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran-feature
-feature@org.eclipse.photran.xlf=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.xlf-feature
-feature@org.eclipse.photran.intel=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.intel-feature
-
-! Plugins
-plugin@org.eclipse.photran.core=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.core
-plugin@org.eclipse.photran.managedbuilder.core=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.core
-plugin@org.eclipse.photran.managedbuilder.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.ui
-plugin@org.eclipse.photran.cdtinterface=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface
-plugin@org.eclipse.photran.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.ui
-plugin@org.eclipse.photran.managedbuilder.gnu.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.gnu.ui
-plugin@org.eclipse.photran.cdtinterface.vpg=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface.vpg
-plugin@org.eclipse.photran.core.vpg=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.core.vpg
-plugin@org.eclipse.photran.ui.vpg=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.ui.vpg
-plugin@org.eclipse.photran.managedbuilder.intel.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.intel.ui
-plugin@org.eclipse.photran.core.intel=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.core.intel
-plugin@org.eclipse.photran.errorparsers.xlf=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.errorparsers.xlf
-plugin@org.eclipse.photran.managedbuilder.xlf.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.xlf.ui
-         
-! Tests
-
diff --git a/releng/org.eclipse.ptp.releng/maps/ptp.map b/releng/org.eclipse.ptp.releng/maps/ptp.map
deleted file mode 100644
index b319bf8..0000000
--- a/releng/org.eclipse.ptp.releng/maps/ptp.map
+++ /dev/null
@@ -1,127 +0,0 @@
-! The master
-feature@org.eclipse.ptp.master=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.master
-
-! PTP features
-feature@org.eclipse.ptp=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp-feature
-feature@org.eclipse.ptp.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.utils-feature
-feature@org.eclipse.ptp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.core-feature
-feature@org.eclipse.ptp.remote=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote-feature
-feature@org.eclipse.ptp.remote.remotetools=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote.remotetools-feature
-feature@org.eclipse.ptp.remote.rse=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote.rse-feature
-feature@org.eclipse.ptp.remotetools=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remotetools-feature
-feature@org.eclipse.ptp.rm.ibm.ll=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.ll-feature
-feature@org.eclipse.ptp.rm.ibm.pe=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.pe-feature
-feature@org.eclipse.ptp.rm.mpich2=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.mpich2-feature
-feature@org.eclipse.ptp.rm.openmpi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.openmpi-feature
-feature@org.eclipse.ptp.external=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.external-feature
-feature@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.sdm-feature
-feature@org.eclipse.ptp.services=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.services-feature
-
-! PLDT features
-feature@org.eclipse.ptp.pldt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt-feature
-feature@org.eclipse.ptp.pldt.lapi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt.lapi-feature
-feature@org.eclipse.ptp.pldt.upc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt.upc-feature
-
-! PTF features
-feature@org.eclipse.ptp.perf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf-feature
-feature@org.eclipse.ptp.perf.tau=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau-feature
-feature@org.eclipse.ptp.perf.tau.fortran=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau.fortran-feature
-
-! RDT features
-feature@org.eclipse.ptp.rdt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt-feature
-
-! PTP Plugins
-plugin@org.eclipse.ptp=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp
-plugin@org.eclipse.ptp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.core
-plugin@org.eclipse.ptp.utils.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils.core
-plugin@org.eclipse.ptp.utils.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils.ui
-plugin@org.eclipse.ptp.proxy.protocol=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.proxy.protocol
-plugin@org.eclipse.ptp.remote.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.core
-plugin@org.eclipse.ptp.remote.remotetools.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.core
-plugin@org.eclipse.ptp.remote.remotetools.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.ui
-plugin@org.eclipse.ptp.remote.rse.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.core
-plugin@org.eclipse.ptp.remote.rse.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.ui
-plugin@org.eclipse.ptp.remote.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.ui
-plugin@org.eclipse.ptp.rm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.core
-plugin@org.eclipse.ptp.rm.ibm.ll.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.core
-plugin@org.eclipse.ptp.rm.ibm.ll.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.help
-plugin@org.eclipse.ptp.rm.ibm.ll.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.proxy
-plugin@org.eclipse.ptp.rm.ibm.ll.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.ui
-plugin@org.eclipse.ptp.rm.ibm.pe.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.core
-plugin@org.eclipse.ptp.rm.ibm.pe.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.help
-plugin@org.eclipse.ptp.rm.ibm.pe.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.proxy
-plugin@org.eclipse.ptp.rm.ibm.pe.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.ui
-plugin@org.eclipse.ptp.rm.mpi.mpich2.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.core
-plugin@org.eclipse.ptp.rm.mpi.mpich2.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.ui
-plugin@org.eclipse.ptp.rm.mpi.openmpi.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.core
-plugin@org.eclipse.ptp.rm.mpi.openmpi.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.ui
-plugin@org.eclipse.ptp.rm.remote=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.rm.remote
-plugin@org.eclipse.ptp.rm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ui
-plugin@org.eclipse.ptp.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.ui
-plugin@org.eclipse.ptp.debug.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.core
-plugin@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm
-plugin@org.eclipse.ptp.debug.sdm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.core
-plugin@org.eclipse.ptp.debug.sdm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.ui
-plugin@org.eclipse.ptp.debug.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.ui
-plugin@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm
-plugin@org.eclipse.ptp.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.proxy
-plugin@org.eclipse.ptp.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils
-plugin@org.eclipse.ptp.launch=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.launch
-plugin@org.eclipse.ptp.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/doc/org.eclipse.ptp.help
-
-! Services Plugins
-plugin@org.eclipse.ptp.services.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.services.core
-plugin@org.eclipse.ptp.services.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.services.ui
-
-! Remote Tools Plugins
-plugin@org.eclipse.ptp.remotetools.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.core
-plugin@org.eclipse.ptp.remotetools.environment.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.core
-plugin@org.eclipse.ptp.remotetools.environment.generichost=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.generichost
-plugin@org.eclipse.ptp.remotetools.environment.launcher=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.launcher
-plugin@org.eclipse.ptp.remotetools.environment.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.ui
-plugin@org.eclipse.ptp.remotetools.preferences=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.preferences
-plugin@org.eclipse.ptp.remotetools.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.utils
-
-! PLDT Plugins
-plugin@org.eclipse.ptp.pldt.common=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.common
-plugin@org.eclipse.ptp.pldt.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.help
-plugin@org.eclipse.ptp.pldt.lapi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.lapi
-plugin@org.eclipse.ptp.pldt.mpi.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis
-plugin@org.eclipse.ptp.pldt.mpi.analysis.cdt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis.cdt
-plugin@org.eclipse.ptp.pldt.mpi.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.core
-plugin@org.eclipse.ptp.pldt.openmp.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.analysis
-plugin@org.eclipse.ptp.pldt.openmp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.core
-plugin@org.eclipse.ptp.pldt.openmp.ui.pv=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.ui.pv
-plugin@org.eclipse.ptp.pldt.upc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.upc
-plugin@org.eclipse.ptp.pldt.wizards=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.wizards
-
-! ETF Plugins
-plugin@org.eclipse.ptp.perf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf
-plugin@org.eclipse.ptp.perf.tau=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau
-plugin@org.eclipse.ptp.perf.tau.jars=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.jars
-plugin@org.eclipse.ptp.perf.tau.papiselect=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papiselect
-plugin@org.eclipse.ptp.perf.tau.perfdmf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.perfdmf
-plugin@org.eclipse.ptp.perf.tau.selinst=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinst
-plugin@org.eclipse.ptp.perf.tau.selinstfort=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinstfort
-plugin@org.eclipse.ptp.perf.toolopts=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.toolopts
-
-! RDT Plugins
-plugin@org.eclipse.ptp.rdt.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core
-plugin@org.eclipse.ptp.rdt.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui
-plugin@org.eclipse.ptp.rdt.services=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services
-plugin@org.eclipse.ptp.rdt.doc.user=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.doc.user
-plugin@org.eclipse.ptp.rdt.managedbuilder.xlc.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui
-
-! Fragments
-fragment@org.eclipse.ptp.aix.ppc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.aix.ppc
-fragment@org.eclipse.ptp.linux.ppc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.linux.ppc
-fragment@org.eclipse.ptp.linux.x86=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.linux.x86
-fragment@org.eclipse.ptp.linux.x86_64=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.linux.x86_64
-fragment@org.eclipse.ptp.macosx.ppc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.macosx.ppc
-fragment@org.eclipse.ptp.macosx.x86=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.macosx.x86
-fragment@org.eclipse.ptp.perf.parallel=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.parallel
-
-! Tests
-plugin@org.eclipse.ptp.perf.tau.papitest=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papitest
-plugin@org.eclipse.ptp.rdt.core.tests=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.tests
-
diff --git a/releng/org.eclipse.ptp.releng/master/build.properties b/releng/org.eclipse.ptp.releng/master/build.properties
deleted file mode 100644
index 7bcd2e6..0000000
--- a/releng/org.eclipse.ptp.releng/master/build.properties
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#####################
-# Parameters describing how and where to execute the build.
-# Typical users need only update the following properties:
-#    baseLocation - where things you are building against are installed
-#    bootclasspath - The base jars to compile against (typicaly rt.jar)
-#    configs - the list of {os, ws, arch} configurations to build.  
-#
-# Of course any of the settings here can be overridden by spec'ing 
-# them on the command line (e.g., -DbaseLocation=d:/eclipse
-
-############# CVS CONTROL ################
-# The CVS tag to use when fetching the map files from the repository
-mapVersionTag=HEAD
-
-# The CVS tag to use when fetching elements to build.  By default the
-# builder will use whatever is in the maps.  Use this value to override
-# for example, when doing a nightly build out of HEAD
-# fetchTag=HEAD
-
-ptpTag=HEAD
-photranTag=HEAD
-
-############## BUILD / GENERATION CONTROL ################
-# The directory into which the build elements will be fetched and where
-# the build will take place.  buildDirectory and install should be the same
-# value.
-buildDirectory=build
-
-# Type of build.  Used in naming the build output.  Typically this value is
-# one of I, N, M, S, ...
-buildType=I
-
-# ID of the build.  Used in naming the build output.
-buildId=TestBuild
-
-# Label for the build.  Used in naming the build output
-buildLabel=${buildType}.${buildId}
-
-# Timestamp for the build.  Used in naming the build output
-timestamp=007
-
-# Base location for anything the build needs to compile against.  For example,
-# when building GEF, the baseLocation should be the location of a previously
-# installed Eclipse against which the GEF code will be compiled.
-baseLocation=
-
-#Os/Ws/Arch/nl of the eclipse specified by baseLocation
-#baseos
-#basews
-#basearch
-#basenl
-
-# The location underwhich all of the build output will be collected.  This will be
-# the root path in the resultant zip file.
-collPlace=eclipse
-
-# The directory  in which to execute zip of the ${collPlace} directory
-collBase=.
-
-# The list of {os, ws, arch} configurations to build.  This 
-# value is a '&' separated list of ',' separate triples.  For example, 
-#     configs=win32,win32,x86 & linux,motif,x86
-# By default the value is *,*,*
-configs= \
-	  aix,motif,ppc \
-    & linux,gtk,x86 \
-    & linux,gtk,x86_64 \
-    & linux,gtk,ppc \
-    & macosx,carbon,ppc \
-    & win32,win32,x86
-
-outputUpdateJars=true
-groupConfigurations=true
-
-#Arguments to send to the zip executable
-zipargs=
-
-############# JAVA COMPILER OPTIONS ##############
-# The location of the Java jars to compile against.  Typically the rt.jar for your JDK/JRE
-#bootclasspath=d:/ibm1.3.1/jre/lib/rt.jar
-
-javacDebugInfo=on
-javacVerbose=true
-javacFailOnError=false
-
-# The version of the source code
-javacSource=1.5
-
-# The version of the byte code targeted
-javacTarget=1.5
diff --git a/releng/org.eclipse.ptp.releng/master/customTargets.xml b/releng/org.eclipse.ptp.releng/master/customTargets.xml
deleted file mode 100644
index 0786880..0000000
--- a/releng/org.eclipse.ptp.releng/master/customTargets.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<project name="Build specific targets and properties" default="noDefault" >
-
-<!-- ===================================================================== -->
-<!-- Run a given ${target} on all elements being built -->
-<!-- Add on <ant> task for each top level element being built. -->
-<!-- ===================================================================== -->
-<target name="allElements">
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.ptp.master"/>
-	</ant>
-	<ant antfile="${genericTargets}" target="${target}">
-		<property name="type" value="feature"/>
-		<property name="id" value="org.eclipse.photran.master"/>
-	</ant>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Targets to assemble the built elements for particular configurations  -->
-<!-- These generally call the generated assemble scripts (named in -->
-<!-- ${assembleScriptName}) but may also add pre and post processing -->
-<!-- Add one target for each root element and each configuration -->
-<!-- ===================================================================== -->
-
-<target name="assemble.org.eclipse.ptp.master.group.group.group">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="ptp-master-${ptpBranchVersion}-${buildId}.zip"/>
-	</ant>
-</target>
-	
-<target name="assemble.org.eclipse.photran.master.group.group.group">
-	<ant antfile="${assembleScriptName}" dir="${buildDirectory}">
-		<property name="archiveName" value="photran-master-${photranBranchVersion}-${buildId}.zip"/>
-	</ant>
-</target>
-	
-<!-- ===================================================================== -->
-<!-- Check out map files from correct repository -->
-<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-<!-- ===================================================================== -->
-<target name="getMapFiles">
-	<copy file="${builder}/../maps/ptp.map" todir="${buildDirectory}/maps"/>
-	<replace file="${buildDirectory}/maps/ptp.map">
-		<replacefilter token="@ptpTag@" value="${ptpTag}"/>
-	</replace>
-	<copy file="${builder}/../maps/photran.map" todir="${buildDirectory}/maps"/>
-	<replace file="${buildDirectory}/maps/photran.map">
-		<replacefilter token="@photranTag@" value="${photranTag}"/>
-	</replace>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before setup -->
-<!-- ===================================================================== -->
-<target name="preSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after setup but before starting the build proper -->
-<!-- ===================================================================== -->
-<target name="postSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="preFetch">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="postFetch">
-	<condition property="patchesAvailable">
-		<available file="${builder}/patch.xml"/>
-	</condition>
-	<antcall target="applyPatches"/>
-</target>
-
-<target name="applyPatches" if="patchesAvailable">
-	<ant antfile="${builder}/patch.xml"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="preGenerate">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="postGenerate">
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="preProcess">
-	<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-		<include name="**/about.mappings" />
-	</replace>
-	<unzip src="${tauJars}" dest="${buildDirectory}/plugins/org.eclipse.ptp.perf.tau.jars"/>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.aix.ppc/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.ppc/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.x86/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.x86_64/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.macosx.ppc/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.macosx.x86/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="postProcess">
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running assemble. -->
-<!-- ===================================================================== -->
-<target name="preAssemble">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after  running assemble. -->
-<!-- ===================================================================== -->
-<target name="postAssemble">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after the build is done. -->
-<!-- ===================================================================== -->
-<target name="postBuild">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do to test the build results -->
-<!-- ===================================================================== -->
-<target name="test">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do to publish the build results -->
-<!-- ===================================================================== -->
-<target name="publish">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Default target                                                        -->
-<!-- ===================================================================== -->
-<target name="noDefault">
-	<echo message="You must specify a target when invoking this file" />
-</target>
-
-</project>
diff --git a/releng/org.eclipse.ptp.releng/pack.properties b/releng/org.eclipse.ptp.releng/pack.properties
deleted file mode 100644
index 1cb5a5e..0000000
--- a/releng/org.eclipse.ptp.releng/pack.properties
+++ /dev/null
@@ -1 +0,0 @@
-pack200.default.args=-E4
diff --git a/releng/org.eclipse.ptp.releng/photran_buildsite.xml b/releng/org.eclipse.ptp.releng/photran_buildsite.xml
deleted file mode 100644
index 313e902..0000000
--- a/releng/org.eclipse.ptp.releng/photran_buildsite.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-	<description>
-		Photran (Fortran Development Tools)
-	</description>
-   	<category-def name="Photran Base Distribution" label="Photran (Fortran Development Tools)"/>
-	<category-def name="Fortran Compiler Support" label="Fortran Compiler Support">
-		<description>
-			Optional features adding error parsers and managed build toolchains for various vendors&apos; Fortran compilers
-		</description>
-    </category-def>
-	<feature id="org.eclipse.photran" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/photran/releases/galileo/features/org.eclipse.photran_5.0.0.@timeStamp@.jar&amp;r=1" version="5.0.0.@timeStamp@">
-		<category name="Photran Base Distribution"/>
-	</feature>
-	<feature id="org.eclipse.photran.intel" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/photran/releases/galileo/features/org.eclipse.photran.intel_5.0.0.@timeStamp@.jar&amp;r=1" version="5.0.0.@timeStamp@" os="linux">
-		<category name="Fortran Compiler Support"/>
-	</feature>
-	<feature id="org.eclipse.photran.xlf" url="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/photran/releases/galileo/features/org.eclipse.photran.xlf_5.0.0.@timeStamp@.jar&amp;r=1" version="5.0.0.@timeStamp@">
-		<category name="Fortran Compiler Support"/>
-	</feature>
-</site>
diff --git a/releng/org.eclipse.ptp.releng/ptpbuild b/releng/org.eclipse.ptp.releng/ptpbuild
deleted file mode 100644
index ba346f7..0000000
--- a/releng/org.eclipse.ptp.releng/ptpbuild
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-#
-# ptpbuild wrapper script
-#
-# Usage: ptpbuild [-t tag] [-d build_dir] [build_args]
-#
-# where
-#
-# tag is the CVS tag used to check out the releng project (default HEAD)
-# build_dir is the location that the build will take place
-# build_args are any arguments you want to pass to the build script
-#
-# set up anything environment specific that needs to be done before
-# launching the build script in the releng project
-
-LANG=en_US
-TAG=HEAD
-CDT_TAG=HEAD
-
-# main staging directory
-BUILD_DIR=/opt/public/download-staging.priv/tools/ptp/releng
-
-args=`getopt d:t: $*`
-
-if [ $? != 0 ]; then
-	echo "usage: ptpbuild [-t tag] [-c cdt_tag] [-d build_dir] [build_args]"
-	exit 1
-fi
-
-set -- $args
-for i
-do
-	case "$i"
-	in
-	-c) CDT_TAG="$2"; shift; shift;;
-	-d) BUILD_DIR="$2"; shift; shift;;
-	-t) TAG="$2"; shift; shift;;
-	--) shift; break;;
-	esac
-done
-
-BUILD_LOG=$BUILD_DIR/ptpbuild_${TAG}_`date +%Y%m%d%H%M`.log
-
-{
-# create the releng staging directory and go there
-mkdir -p $BUILD_DIR && cd $BUILD_DIR
-
-# remove the old build
-rm -fr org.eclipse.ptp
-
-# Check out the releng project
-export CVSROOT=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools
-cvs co -r $TAG -d org.eclipse.ptp org.eclipse.ptp/releng/org.eclipse.ptp.releng
-
-# run the main script
-cd org.eclipse.ptp
-sh build.sh $*
-
-# Build RDT server packages
-cd results/plugins
-
-# Check out rdt.core.remotejars, rdt.core.stubs and cdt.core for source
-export CVSROOT=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools
-cvs co -r $TAG -d org.eclipse.ptp.rdt.core.remotejars org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.remotejars
-cvs co -r $TAG -d org.eclipse.ptp.rdt.core.stubs org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.stubs
-cvs co -r $CDT_TAG -d org.eclipse.cdt.core org.eclipse.cdt/all/org.eclipse.cdt.core
-
-cd org.eclipse.ptp.rdt.core.remotejars
-
-# run the script in remotejars
-export PATH=/opt/public/common/ibm-java2-ppc-50/bin:$PATH
-echo `java -version`
-java -jar ../../../tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar \
-	-ws gtk -arch ppc -os linux -application org.eclipse.ant.core.antRunner
-
-} >$BUILD_LOG 2>&1
-
-if grep -q 'BUILD FAILED' $BUILD_LOG; then
-	echo "BUILD FAILED. See $BUILD_LOG for details."
-fi
-
-exit 0
diff --git a/releng/org.eclipse.ptp.releng/update_versions b/releng/org.eclipse.ptp.releng/update_versions
deleted file mode 100644
index beaa328..0000000
--- a/releng/org.eclipse.ptp.releng/update_versions
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-#
-# script to update PTP versions
-#
-# Usage: update_versions version
-#
-# version - new version string (e.g. "3.0.1")
-#
-# Note: a "qualifier" suffix will automatically be added to the version where appropriate
-#
-
-TMP_DIR=/tmp
-
-if [ $# -lt 1 ]; then
-	echo "usage: update_versions version"
-	exit 1
-fi
-
-version=$1
-
-FEATURES="\
-	org.eclipse.ptp-feature \
-	org.eclipse.ptp.core-feature \
-	org.eclipse.ptp.external-feature \
-	org.eclipse.ptp.master \
-	org.eclipse.ptp.perf-feature \
-	org.eclipse.ptp.perf.tau-feature \
-	org.eclipse.ptp.perf.tau.fortran-feature \
-	org.eclipse.ptp.pldt-feature \
-	org.eclipse.ptp.pldt.lapi-feature \
-	org.eclipse.ptp.pldt.upc-feature \
-	org.eclipse.ptp.rdt-feature \
-	org.eclipse.ptp.remote-feature \
-	org.eclipse.ptp.remote.remotetools-feature \
-	org.eclipse.ptp.remote.rse-feature \
-	org.eclipse.ptp.remotetools-feature \
-	org.eclipse.ptp.rm.ibm.ll-feature \
-	org.eclipse.ptp.rm.ibm.pe-feature \
-	org.eclipse.ptp.rm.mpich2-feature \
-	org.eclipse.ptp.rm.openmpi-feature \
-	org.eclipse.ptp.sdm-feature \
-	org.eclipse.ptp.services-feature \
-	org.eclipse.ptp.utils-feature"
-	
-PLUGINS="\
-	org.eclipse.ptp.aix.ppc \
-	org.eclipse.ptp.linux.ppc \
-	org.eclipse.ptp.linux.x86 \
-	org.eclipse.ptp.linux.x86_64 \
-	org.eclipse.ptp.macosx.ppc \
-	org.eclipse.ptp.macosx.x86 \
-	org.eclipse.ptp"
-	
-C_PROJECTS="\
-	org.eclipse.ptp.debug.sdm \
-	org.eclipse.ptp.proxy \
-	org.eclipse.ptp.utils"
-	
-update_feature() {
-	sed -e "s/version=\"[0-9]\.[0-9]\.[0-9]\.qualifier\"/version=\"$2\.qualifier\"/" < $1/feature.xml > $TMP_DIR/${1}_feature.xml
-	mv $TMP_DIR/${1}_feature.xml $1/feature.xml
-}
-
-update_manifest() {
-	sed -e "s/Bundle-Version: *[0-9]\.[0-9]\.[0-9]\.qualifier/Bundle-Version: $2.qualifier/" < $1/META-INF/MANIFEST.MF > $TMP_DIR/${1}_MANIFEST.MF
-	mv $TMP_DIR/${1}_MANIFEST.MF $1/META-INF/MANIFEST.MF
-}
-
-update_configure() {
-	sed -e "s/AC_INIT(\([^,]*\), *[0-9]\.[0-9]\.[0-9])/AC_INIT(\1, $2)/" < $1/configure.in > $TMP_DIR/${1}_configure.in
-	mv $TMP_DIR/${1}_configure.in $1/configure.in
-	(cd $1; autoconf)
-}
-
-for feature in $FEATURES; do
-	echo "Updating $feature..."
-	update_feature $feature $version
-done
-
-for plugin in $PLUGINS; do
-	echo "Updating $plugin..."
-	update_manifest $plugin $version
-done
-
-for project in $C_PROJECTS; do
-	echo "Updating $project..."
-	update_manifest $project $version
-	update_configure $project $version
-done
-
-echo "Updating org.eclipse.ptp.releng..."
-sed -e "s/<property name=\"branchVersion\" value=\"[0-9]\.[0-9]\.[0-9]\"\/>/<property name=\"branchVersion\" value=\"$version\"\/>/" < org.eclipse.ptp.releng/build.xml > $TMP_DIR/org.eclipse.ptp.releng_build.xml
-mv $TMP_DIR/org.eclipse.ptp.releng_build.xml org.eclipse.ptp.releng/build.xml
-
-echo "Updating org.eclipse.ptp.rdt.core.remotejars..."
-sed -e "s/<property name=\"ptpVersion\" value=\"[0-9]\.[0-9]\.[0-9]\"\/>/<property name=\"ptpVersion\" value=\"$version\"\/>/" < org.eclipse.ptp.rdt.core.remotejars/build.xml > $TMP_DIR/org.eclipse.ptp.rdt.core.remotejars_build.xml
-mv $TMP_DIR/org.eclipse.ptp.rdt.core.remotejars_build.xml org.eclipse.ptp.rdt.core.remotejars/build.xml
-
-exit 0
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project
deleted file mode 100644
index 861eb7b..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.bluegene-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties
deleted file mode 100644
index 95b0993..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties
+++ /dev/null
@@ -1,148 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For Blue Gene
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the Blue Gene system
-
-# copyright
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-IBM Corporation - Initial API and implementation\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml
deleted file mode 100644
index 5806959..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.ibm.bluegene"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.remote"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/.project b/releng/org.eclipse.ptp.rm.ibm.ll-feature/.project
deleted file mode 100644
index 208bb46..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.ll-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/build.properties b/releng/org.eclipse.ptp.rm.ibm.ll-feature/build.properties
deleted file mode 100644
index 8995901..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.ibm.ll-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.properties b/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.properties
deleted file mode 100644
index d9817b4..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For IBM LoadLeveler
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the IBM LoadLeveler
-
-# copyright
-copyright=\
-Copyright (c) 2005, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.xml b/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.xml
deleted file mode 100644
index b56cfd3..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.ibm.ll"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.rm.ibm.ll.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/galileo"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.proxy"/>
-      <import plugin="org.eclipse.ptp.utils"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.ptp.remote.ui" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ptp.utils.ui"/>
-      <import plugin="org.eclipse.ptp.services.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.services.ui" version="1.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.ll.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.ll.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.ll.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.ll.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.ibm.ll-feature/license.html b/releng/org.eclipse.ptp.rm.ibm.ll-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/.project b/releng/org.eclipse.ptp.rm.ibm.pe-feature/.project
deleted file mode 100644
index 4898b39..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.pe-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/build.properties b/releng/org.eclipse.ptp.rm.ibm.pe-feature/build.properties
deleted file mode 100644
index 8995901..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.ibm.pe-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.properties b/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.properties
deleted file mode 100644
index ec09cd8..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.properties
+++ /dev/null
@@ -1,132 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#################################################################################
-
-# "featureName" property - name of the feature
-featureName=PTP Support For IBM Parallel Environment
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the IBM Parallel Environment
-
-# copyright
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.xml b/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.xml
deleted file mode 100644
index 2acb864..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.ibm.pe"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.rm.ibm.pe.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/galileo"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.proxy"/>
-      <import plugin="org.eclipse.ptp.utils"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.ptp.remote.ui" version="2.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ptp.services.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.services.ui" version="1.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.pe.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.pe.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.pe.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.pe.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.ibm.pe-feature/license.html b/releng/org.eclipse.ptp.rm.ibm.pe-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/.project b/releng/org.eclipse.ptp.rm.lsf-feature/.project
deleted file mode 100644
index 4e56dff..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.lsf-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/build.properties b/releng/org.eclipse.ptp.rm.lsf-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties b/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties
deleted file mode 100644
index 05b6267..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For LSF
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the LSF job scheduler
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml b/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml
deleted file mode 100644
index 8b8551f..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.lsf"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.remote"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/license.html b/releng/org.eclipse.ptp.rm.lsf-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/.project b/releng/org.eclipse.ptp.rm.mpich2-feature/.project
deleted file mode 100644
index 52f476f..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.mpich2-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/build.properties b/releng/org.eclipse.ptp.rm.mpich2-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties b/releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties
deleted file mode 100644
index 335cd5b..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For MPICH2
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for MPICH2
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml b/releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml
deleted file mode 100644
index 6bef364..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.mpich2"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.rm.mpich2.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/galileo"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpi.mpich2.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpi.mpich2.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.mpich2-feature/license.html b/releng/org.eclipse.ptp.rm.mpich2-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/.project b/releng/org.eclipse.ptp.rm.openmpi-feature/.project
deleted file mode 100644
index 14c7d0e..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.openmpi-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/build.properties b/releng/org.eclipse.ptp.rm.openmpi-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.openmpi-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/feature.properties b/releng/org.eclipse.ptp.rm.openmpi-feature/feature.properties
deleted file mode 100644
index 3e053e0..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/feature.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For Open MPI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for Open MPI
-
-# copyright
-copyright=\
-Copyright (c) 2008 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/feature.xml b/releng/org.eclipse.ptp.rm.openmpi-feature/feature.xml
deleted file mode 100644
index 282dfdf..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/feature.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.openmpi"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.rm.openmpi.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/galileo"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.rm.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.rm.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui"/>
-      <import plugin="org.eclipse.ptp.services.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.services.ui" version="1.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpi.openmpi.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.mpi.openmpi.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.openmpi-feature/license.html b/releng/org.eclipse.ptp.rm.openmpi-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/.project b/releng/org.eclipse.ptp.rm.orte-feature/.project
deleted file mode 100644
index 5884ded..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.orte-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/build.properties b/releng/org.eclipse.ptp.rm.orte-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/feature.properties b/releng/org.eclipse.ptp.rm.orte-feature/feature.properties
deleted file mode 100644
index 48c887f..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For Open MPI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for Open MPI
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/feature.xml b/releng/org.eclipse.ptp.rm.orte-feature/feature.xml
deleted file mode 100644
index 89b2532..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/feature.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.orte"
-      label="%featureName"
-      version="2.0.1.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.utils"/>
-      <import plugin="org.eclipse.ptp.proxy"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.remote.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/license.html b/releng/org.eclipse.ptp.rm.orte-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.slurm-feature/.project b/releng/org.eclipse.ptp.rm.slurm-feature/.project
deleted file mode 100644
index 48ad3f5..0000000
--- a/releng/org.eclipse.ptp.rm.slurm-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.slurm-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.slurm-feature/build.properties b/releng/org.eclipse.ptp.rm.slurm-feature/build.properties
deleted file mode 100644
index 8a0a77b..0000000
--- a/releng/org.eclipse.ptp.rm.slurm-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\

-               license.html,\

-               feature.properties,\

-               epl-v10.html

diff --git a/releng/org.eclipse.ptp.rm.slurm-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.slurm-feature/epl-v10.html
deleted file mode 100644
index 90f2d5e..0000000
--- a/releng/org.eclipse.ptp.rm.slurm-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"

-xmlns:w="urn:schemas-microsoft-com:office:word"

-xmlns="http://www.w3.org/TR/REC-html40">

-

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">

-<meta name=ProgId content=Word.Document>

-<meta name=Generator content="Microsoft Word 9">

-<meta name=Originator content="Microsoft Word 9">

-<link rel=File-List

-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">

-<title>Eclipse Public License - Version 1.0</title>

-<!--[if gte mso 9]><xml>

- <o:DocumentProperties>

-  <o:Revision>2</o:Revision>

-  <o:TotalTime>3</o:TotalTime>

-  <o:Created>2004-03-05T23:03:00Z</o:Created>

-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>

-  <o:Pages>4</o:Pages>

-  <o:Words>1626</o:Words>

-  <o:Characters>9270</o:Characters>

-   <o:Lines>77</o:Lines>

-  <o:Paragraphs>18</o:Paragraphs>

-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>

-  <o:Version>9.4402</o:Version>

- </o:DocumentProperties>

-</xml><![endif]--><!--[if gte mso 9]><xml>

- <w:WordDocument>

-  <w:TrackRevisions/>

- </w:WordDocument>

-</xml><![endif]-->

-<style>

-<!--

- /* Font Definitions */

-@font-face

-	{font-family:Tahoma;

-	panose-1:2 11 6 4 3 5 4 4 2 4;

-	mso-font-charset:0;

-	mso-generic-font-family:swiss;

-	mso-font-pitch:variable;

-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}

- /* Style Definitions */

-p.MsoNormal, li.MsoNormal, div.MsoNormal

-	{mso-style-parent:"";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p

-	{margin-right:0in;

-	mso-margin-top-alt:auto;

-	mso-margin-bottom-alt:auto;

-	margin-left:0in;

-	mso-pagination:widow-orphan;

-	font-size:12.0pt;

-	font-family:"Times New Roman";

-	mso-fareast-font-family:"Times New Roman";}

-p.BalloonText, li.BalloonText, div.BalloonText

-	{mso-style-name:"Balloon Text";

-	margin:0in;

-	margin-bottom:.0001pt;

-	mso-pagination:widow-orphan;

-	font-size:8.0pt;

-	font-family:Tahoma;

-	mso-fareast-font-family:"Times New Roman";}

-@page Section1

-	{size:8.5in 11.0in;

-	margin:1.0in 1.25in 1.0in 1.25in;

-	mso-header-margin:.5in;

-	mso-footer-margin:.5in;

-	mso-paper-source:0;}

-div.Section1

-	{page:Section1;}

--->

-</style>

-</head>

-

-<body lang=EN-US style='tab-interval:.5in'>

-

-<div class=Section1>

-

-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>

-</p>

-

-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER

-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,

-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE

-OF THIS AGREEMENT.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-in the case of the initial Contributor, the initial code and documentation

-distributed under this Agreement, and<br clear=left>

-b) in the case of each subsequent Contributor:</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)

-changes to the Program, and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)

-additions to the Program;</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where

-such changes and/or additions to the Program originate from and are distributed

-by that particular Contributor. A Contribution 'originates' from a Contributor

-if it was added to the Program by such Contributor itself or anyone acting on

-such Contributor's behalf. Contributions do not include additions to the

-Program which: (i) are separate modules of software distributed in conjunction

-with the Program under their own license agreement, and (ii) are not derivative

-works of the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or

-entity that distributes the Program.</span> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent

-claims licensable by a Contributor which are necessarily infringed by the use

-or sale of its Contribution alone or when combined with the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions

-distributed in accordance with this Agreement.</span> </p>

-

-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who

-receives the Program under this Agreement, including all Contributors.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-Subject to the terms of this Agreement, each Contributor hereby grants Recipient

-a non-exclusive, worldwide, royalty-free copyright license to<span

-style='color:red'> </span>reproduce, prepare derivative works of, publicly

-display, publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and object code

-form.</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)

-Subject to the terms of this Agreement, each Contributor hereby grants

-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free

-patent license under Licensed Patents to make, use, sell, offer to sell, import

-and otherwise transfer the Contribution of such Contributor, if any, in source

-code and object code form. This patent license shall apply to the combination

-of the Contribution and the Program if, at the time the Contribution is added

-by the Contributor, such addition of the Contribution causes such combination

-to be covered by the Licensed Patents. The patent license shall not apply to

-any other combinations which include the Contribution. No hardware per se is

-licensed hereunder. </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)

-Recipient understands that although each Contributor grants the licenses to its

-Contributions set forth herein, no assurances are provided by any Contributor

-that the Program does not infringe the patent or other intellectual property

-rights of any other entity. Each Contributor disclaims any liability to Recipient

-for claims brought by any other entity based on infringement of intellectual

-property rights or otherwise. As a condition to exercising the rights and

-licenses granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For example,

-if a third party patent license is required to allow Recipient to distribute

-the Program, it is Recipient's responsibility to acquire that license before

-distributing the Program.</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)

-Each Contributor represents that to its knowledge it has sufficient copyright

-rights in its Contribution, if any, to grant the copyright license set forth in

-this Agreement. </span></p>

-

-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>

-

-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the

-Program in object code form under its own license agreement, provided that:</span>

-</p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-it complies with the terms and conditions of this Agreement; and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)

-its license agreement:</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)

-effectively disclaims on behalf of all Contributors all warranties and

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)

-effectively excludes on behalf of all Contributors all liability for damages,

-including direct, indirect, special, incidental and consequential damages, such

-as lost profits; </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)

-states that any provisions which differ from this Agreement are offered by that

-Contributor alone and not by any other party; and</span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)

-states that source code for the Program is available from such Contributor, and

-informs licensees how to obtain it in a reasonable manner on or through a

-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>

-

-<p><span style='font-size:10.0pt'>When the Program is made available in source

-code form:</span> </p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)

-it must be made available under this Agreement; and </span></p>

-

-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a

-copy of this Agreement must be included with each copy of the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any

-copyright notices contained within the Program. </span></p>

-

-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the

-originator of its Contribution, if any, in a manner that reasonably allows

-subsequent Recipients to identify the originator of the Contribution. </span></p>

-

-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>

-

-<p><span style='font-size:10.0pt'>Commercial distributors of software may

-accept certain responsibilities with respect to end users, business partners

-and the like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a commercial

-product offering should do so in a manner which does not create potential

-liability for other Contributors. Therefore, if a Contributor includes the

-Program in a commercial product offering, such Contributor (&quot;Commercial

-Contributor&quot;) hereby agrees to defend and indemnify every other

-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and

-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other

-legal actions brought by a third party against the Indemnified Contributor to

-the extent caused by the acts or omissions of such Commercial Contributor in

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may participate

-in any such claim at its own expense.</span> </p>

-

-<p><span style='font-size:10.0pt'>For example, a Contributor might include the

-Program in a commercial product offering, Product X. That Contributor is then a

-Commercial Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance claims and

-warranties are such Commercial Contributor's responsibility alone. Under this

-section, the Commercial Contributor would have to defend claims against the

-other Contributors related to those performance claims and warranties, and if a

-court requires any other Contributor to pay any damages as a result, the

-Commercial Contributor must pay those damages.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>

-

-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT

-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,

-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,

-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and distributing the

-Program and assumes all risks associated with its exercise of rights under this

-Agreement , including but not limited to the risks and costs of program errors,

-compliance with applicable laws, damage to or loss of data, programs or

-equipment, and unavailability or interruption of operations. </span></p>

-

-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>

-

-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS

-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR

-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY

-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF

-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>

-

-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>

-

-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid

-or unenforceable under applicable law, it shall not affect the validity or

-enforceability of the remainder of the terms of this Agreement, and without

-further action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.</span> </p>

-

-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation

-against any entity (including a cross-claim or counterclaim in a lawsuit)

-alleging that the Program itself (excluding combinations of the Program with

-other software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of the date

-such litigation is filed. </span></p>

-

-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement

-shall terminate if it fails to comply with any of the material terms or

-conditions of this Agreement and does not cure such failure in a reasonable

-period of time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use and

-distribution of the Program as soon as reasonably practicable. However,

-Recipient's obligations under this Agreement and any licenses granted by

-Recipient relating to the Program shall continue and survive. </span></p>

-

-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute

-copies of this Agreement, but in order to avoid inconsistency the Agreement is

-copyrighted and may only be modified in the following manner. The Agreement

-Steward reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement Steward has

-the right to modify this Agreement. The Eclipse Foundation is the initial

-Agreement Steward. The Eclipse Foundation may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly stated

-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to

-the intellectual property of any Contributor under this Agreement, whether

-expressly, by implication, estoppel or otherwise. All rights in the Program not

-expressly granted under this Agreement are reserved.</span> </p>

-

-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the

-State of New York and the intellectual property laws of the United States of

-America. No party to this Agreement will bring a legal action under this

-Agreement more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.</span> </p>

-

-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>

-

-</div>

-

-</body>

-

-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.slurm-feature/feature.properties b/releng/org.eclipse.ptp.rm.slurm-feature/feature.properties
deleted file mode 100644
index 38ad984..0000000
--- a/releng/org.eclipse.ptp.rm.slurm-feature/feature.properties
+++ /dev/null
@@ -1,137 +0,0 @@
-#################################################################################

- # Copyright (c) 2008,2009 School of Computer Science,National University 

- # of Defense Technology,Changsha,China.All rights reserved. This program

- # and the accompanying materials are made available under the terms of 

- # the Eclipse Public License v1.0 which accompanies this distribution,

- # and is available at http://www.eclipse.org/legal/epl-v10.html

- # Contributors:

- # NUDT school of computer - 605 staff room

-#################################################################################

-

-

-# "featureName" property - name of the feature

-featureName=PTP Support For SLURM

-

-# "providerName" property - name of the company that provides the feature

-providerName=Eclipse.org

-

-# "updateSiteName" property - label for the update site

-updateSiteName=Eclipse PTP Update Site

-

-# "description" property - description of the feature

-description=Adds support for Slurm

-

-# copyright

-copyright=\

-   Copyright (c) 2008,2009 School of Computer,National University \n\

-  of Defense Technology,P.R.China. All rights reserved. This program\n\

-  and the accompanying materials are made available under the terms of \n\

-  the Eclipse Public License v1.0 which accompanies this distribution,\n\

-  and is available at http://www.eclipse.org/legal/epl-v10.html\n\

-  Contributors:\n\

-  School of Computer - 605 staff room

-

-# "licenseURL" property - URL of the "Feature License"

-# do not translate value - just change to point to a locale-specific HTML page

-licenseURL=license.html

-

-# "license" property - text of the "Feature Update License"

-# should be plain text version of license agreement pointed to be "licenseURL"

-license=\

-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\

-March 17, 2005\n\

-\n\

-Usage Of Content\n\

-\n\

-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\

-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\

-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\

-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\

-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\

-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\

-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\

-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\

-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\

-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\

-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\

-\n\

-Applicable Licenses\n\

-\n\

-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\

-is provided to you under the terms and conditions of the Eclipse Public\n\

-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\

-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\

-For purposes of the EPL, "Program" will mean the Content.\n\

-\n\

-Content includes, but is not limited to, source code, object code,\n\

-documentation and other files maintained in the Eclipse.org CVS\n\

-repository ("Repository") in CVS modules ("Modules") and made available\n\

-as downloadable archives ("Downloads").\n\

-\n\

-   - Content may be structured and packaged into modules to facilitate delivering,\n\

-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\

-     plug-in fragments ("Fragments"), and features ("Features").\n\

-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\

-     in a directory named "plugins".\n\

-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\

-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\

-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\

-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\

-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\

-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\

-\n\

-Features may also include other Features ("Included Features"). Files named\n\

-"feature.xml" may contain a list of the names and version numbers of\n\

-Included Features.\n\

-\n\

-The terms and conditions governing Plug-ins and Fragments should be\n\

-contained in files named "about.html" ("Abouts"). The terms and\n\

-conditions governing Features and Included Features should be contained\n\

-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\

-Licenses may be located in any directory of a Download or Module\n\

-including, but not limited to the following locations:\n\

-\n\

-   - The top-level (root) directory\n\

-   - Plug-in and Fragment directories\n\

-   - Inside Plug-ins and Fragments packaged as JARs\n\

-   - Sub-directories of the directory named "src" of certain Plug-ins\n\

-   - Feature directories\n\

-\n\

-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\

-Eclipse Update Manager, you must agree to a license ("Feature Update\n\

-License") during the installation process. If the Feature contains\n\

-Included Features, the Feature Update License should either provide you\n\

-with the terms and conditions governing the Included Features or inform\n\

-you where you can locate them. Feature Update Licenses may be found in\n\

-the "license" property of files named "feature.properties". Such Abouts,\n\

-Feature Licenses and Feature Update Licenses contain the terms and\n\

-conditions (or references to such terms and conditions) that govern your\n\

-use of the associated Content in that directory.\n\

-\n\

-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\

-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\

-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\

-\n\

-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\

-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\

-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\

-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\

-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\

-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\

-\n\

-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\

-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\

-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\

-govern that particular Content.\n\

-\n\

-Cryptography\n\

-\n\

-Content may contain encryption software. The country in which you are\n\

-currently may have restrictions on the import, possession, and use,\n\

-and/or re-export to another country, of encryption software. BEFORE\n\

-using any encryption software, please check the country's laws,\n\

-regulations and policies concerning the import, possession, or use,\n\

-and re-export of encryption software, to see if this is permitted.\n\

-\n\

-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n

-########### end of license property ##########################################

diff --git a/releng/org.eclipse.ptp.rm.slurm-feature/feature.xml b/releng/org.eclipse.ptp.rm.slurm-feature/feature.xml
deleted file mode 100644
index 422dc9a..0000000
--- a/releng/org.eclipse.ptp.rm.slurm-feature/feature.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.slurm"
-      label="%featureName"
-      version="2.1.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.rm.slurm.core"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.rm.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.rm.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.slurm.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.slurm.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.slurm-feature/license.html b/releng/org.eclipse.ptp.rm.slurm-feature/license.html
deleted file mode 100644
index 15a10cf..0000000
--- a/releng/org.eclipse.ptp.rm.slurm-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">

-<title>Eclipse.org Software User Agreement</title>

-</head>

-

-<body lang="EN-US" link=blue vlink=purple>

-<h2>Eclipse Foundation Software User Agreement</h2>

-<p>March 17, 2005</p>

-

-<h3>Usage Of Content</h3>

-

-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS

-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND

-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE

-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR

-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND

-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>

-   

-<h3>Applicable Licenses</h3>   

-   

-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0

-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS

-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>

-   

-<ul>

-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>

-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>

-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins

-      and/or Fragments associated with that Feature.</li>

-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>

-</ul>   

- 

-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and

-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module

-including, but not limited to the following locations:</p>

-

-<ul>

-	<li>The top-level (root) directory</li>

-	<li>Plug-in and Fragment directories</li>

-	<li>Inside Plug-ins and Fragments packaged as JARs</li>

-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>

-	<li>Feature directories</li>

-</ul>

-		

-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the

-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or

-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.

-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in

-that directory.</p>

-

-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE

-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>

-

-<ul>

-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>

-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>

-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	

-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>

-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>

-</ul>

-

-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please

-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>

-

-<h3>Cryptography</h3>

-

-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to

-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,

-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>

-   

-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   

-</body>

-</html>

diff --git a/releng/org.eclipse.ptp.services-feature/.project b/releng/org.eclipse.ptp.services-feature/.project
deleted file mode 100644
index 64abc27..0000000
--- a/releng/org.eclipse.ptp.services-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.services-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.services-feature/build.properties b/releng/org.eclipse.ptp.services-feature/build.properties
deleted file mode 100644
index b74af86..0000000
--- a/releng/org.eclipse.ptp.services-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties,\
-               epl-v10.html,\
-               license.html
diff --git a/releng/org.eclipse.ptp.services-feature/epl-v10.html b/releng/org.eclipse.ptp.services-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.services-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.services-feature/feature.properties b/releng/org.eclipse.ptp.services-feature/feature.properties
deleted file mode 100644
index 352307e..0000000
--- a/releng/org.eclipse.ptp.services-feature/feature.properties
+++ /dev/null
@@ -1,136 +0,0 @@
-#################################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - Initial Implementation
-#
-#################################################################################
-
-# "featureName" property - name of the feature
-featureName=PTP Services Framework
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=PTP components for managing services
-
-# copyright
-copyright=\
-Copyright (c) 2009 IBM Corporation.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.services-feature/feature.xml b/releng/org.eclipse.ptp.services-feature/feature.xml
deleted file mode 100644
index f1a59e5..0000000
--- a/releng/org.eclipse.ptp.services-feature/feature.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.services"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.services.core">
-
-   <description url="http://www.example.com/description">
-      %description
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      %copyright
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/galileo"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ptp.services.core" version="1.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.services.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.services.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.services-feature/license.html b/releng/org.eclipse.ptp.services-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.services-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.classpath b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.project b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.project
deleted file mode 100644
index 8b6ce0a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.mpi.mpich2.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 201e354..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,60 +0,0 @@
-#Mon Oct 06 14:36:44 GMT-03:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/META-INF/MANIFEST.MF
deleted file mode 100644
index bcd4964..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.mpi.mpich2.core;singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.ui,
- org.eclipse.search,
- org.eclipse.core.filesystem,
- org.eclipse.ptp.services.core;bundle-version="1.0.0",
- org.eclipse.ptp.core,
- org.eclipse.ptp.rm.core,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.remote.core
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.mpi.mpich2.core,
- org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem,
- org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem
-Bundle-Vendor: %pluginProvider
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.html b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation 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
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.ini b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.ini
deleted file mode 100644
index b26762a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.ini
+++ /dev/null
@@ -1,27 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.mappings b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.properties
deleted file mode 100644
index 23415e8..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/about.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-blurb=PTP MPICH2 (new) Support\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2008 IBM Corporation, and others.  All rights reserved.\n\
-Visit http://www.eclipse.org/ptp\n
-
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/build.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/build.properties
deleted file mode 100644
index f921f89..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               data/,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               eclipse32.png,\
-               plugin.properties
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/data/defaults.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/data/defaults.properties
deleted file mode 100644
index 3c8db9e..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/data/defaults.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-LAUNCH_CMD=mpiexec -l -a ${MPICH2_jobid} ${MPICH2_args} ${MPICH2_env} ${execPath}/${execName} ${progArgs}
-DEBUG_CMD=mpiexec  -l -a ${MPICH2_jobid} ${MPICH2_args} ${MPICH2_env} ${debugExecPath}/${debugExecName} ${debugArgs}
-DISCOVER_CMD=mpdtrace -l
-PERIODIC_CMD=mpdlistjobs
-PERIODIC_TIME=5000
-PATH=
-USE_DEFAULTS=true
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/eclipse32.png b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/eclipse32.png
deleted file mode 100644
index 568fac1..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.properties
deleted file mode 100644
index 56fb5bb..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP MPICH2 (new) Support
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.xml b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.xml
deleted file mode 100644
index 22e71c5..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.core.resourceManagers">
-      <resourceManager
-            class="org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManagerFactory"
-            id="org.eclipse.ptp.mpich2.core.resourcemanager"
-            name="MPICH2"/>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.core.resourceManagers">
-      <resourceManager
-            class="org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2RMServiceProviderFactory"
-            id="org.eclipse.ptp.rm.mpi.mpich2.resourcemanager"
-            name="MPICH2 (Service Model)">
-      </resourceManager>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.services.core.providers">
-      <provider
-            class="org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ServiceProvider"
-            id="org.eclipse.ptp.rm.mpi.mpich2.MPICH2ServiceProvider"
-            name="MPICH2"
-            serviceId="org.eclipse.ptp.core.LaunchService">
-      </provider>
-   </extension>
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java
deleted file mode 100644
index 27da4e6..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ApplicationAttributes {
-	private static final String EFFECTIVE_MPICH2_ENV_ATTR_ID = "MPICH2_env"; //$NON-NLS-1$
-	private static final String EFFECTIVE_MPICH2_PROG_ARGS_ATTR_ID = "MPICH2_progArgs"; //$NON-NLS-1$
-	private static final String EFFECTIVE_MPICH2_WORKING_DIR_ATTR_ID = "MPICH2_workingDir"; //$NON-NLS-1$
-
-	private final static ArrayAttributeDefinition<String> effectiveMPICH2EnvAttrDef =
-		new ArrayAttributeDefinition<String>(EFFECTIVE_MPICH2_ENV_ATTR_ID, Messages.MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_title,
-				Messages.MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_description, true, null);
-
-	private final static ArrayAttributeDefinition<String> effectiveMPICH2ProgArgsAttrDef =
-		new ArrayAttributeDefinition<String>(EFFECTIVE_MPICH2_PROG_ARGS_ATTR_ID, Messages.MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_title,
-				Messages.MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_description, true, null);
-
-	private final static StringAttributeDefinition effectiveMPICH2WorkingDirAttrDef =
-		new StringAttributeDefinition(EFFECTIVE_MPICH2_WORKING_DIR_ATTR_ID, Messages.MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_title,
-				Messages.MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_description, true, ""); //$NON-NLS-1$
-
-	/**
-	 * Environment variables that MPICH2 has passed to the processes.
-	 */
-	public static ArrayAttributeDefinition<String> getEffectiveMPICH2EnvAttributeDefinition() {
-		return effectiveMPICH2EnvAttrDef;
-	}
-
-	/**
-	 * Program arguments that MPICH2 has passed to the processes.
-	 */
-	public static ArrayAttributeDefinition<String> getEffectiveMPICH2ProgArgsAttributeDefinition() {
-		return effectiveMPICH2ProgArgsAttrDef;
-	}
-
-	/**
-	 * Working directory where MPICH2 has started the processes.
-	 */
-	public static StringAttributeDefinition getEffectiveMPICH2WorkingDirAttributeDefinition() {
-		return effectiveMPICH2WorkingDirAttrDef;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java
deleted file mode 100644
index bab4b2d..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.osgi.framework.Bundle;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2Defaults {
-
-	public static String LAUNCH_CMD = null;
-	public static String DEBUG_CMD = null;
-	public static String DISCOVER_CMD = null;
-	public static String PERIODIC_CMD = null;
-	public static int PERIODIC_TIME = 0;
-	public static String PATH = null;
-	public static boolean USE_DEFAULTS = false;
-
-	private static String defaultsResourcePath = "/data/defaults.properties"; //$NON-NLS-1$
-
-	public static void loadDefaults() throws CoreException {
-		Path defaultsPropertiesPath = new Path(defaultsResourcePath);
-		Bundle bundle = MPICH2Plugin.getDefault().getBundle();
-		Properties properties = read(defaultsPropertiesPath, bundle);
-
-		LAUNCH_CMD = getString(bundle, properties, "LAUNCH_CMD"); //$NON-NLS-1$
-		DEBUG_CMD = getString(bundle, properties, "DEBUG_CMD"); //$NON-NLS-1$
-		DISCOVER_CMD = getString(bundle, properties, "DISCOVER_CMD"); //$NON-NLS-1$
-		PERIODIC_CMD = getString(bundle, properties, "PERIODIC_CMD"); //$NON-NLS-1$
-		PERIODIC_TIME = getInteger(bundle, properties, "PERIODIC_TIME"); //$NON-NLS-1$
-		PATH = getString(bundle, properties, "PATH"); //$NON-NLS-1$
-		USE_DEFAULTS = getBoolean(bundle, properties, "USE_DEFAULTS"); //$NON-NLS-1$
-
-		assert LAUNCH_CMD != null;
-		assert DEBUG_CMD != null;
-		assert DISCOVER_CMD != null;
-		assert PERIODIC_CMD != null;
-		assert PATH != null;
-	}
-
-	public static Properties read(Path defaultsPropertiesPath, Bundle bundle)
-	throws CoreException {
-		InputStream inStream;
-		Properties properties = new Properties();
-		try {
-			inStream = FileLocator.openStream(bundle, defaultsPropertiesPath, false);
-			properties.load(inStream);
-
-
-		} catch (IOException e) {
-			throw MPICH2Plugin.coreErrorException(Messages.MPICH2Defaults_Exception_FailedReadFile, e);
-		}
-		return properties;
-	}
-
-	public static String getString(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = properties.getProperty(key);
-		if (value == null) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2Defaults_MissingValue, key)));
-		}
-		
-		return value;
-	}
-
-	public static int getInteger(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		try {
-			return Integer.parseInt(value);
-		} catch (NumberFormatException e) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2Defaults_FailedParseInteger, key)));
-		}
-	}
-
-	public static boolean getBoolean(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		return Boolean.parseBoolean(value);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java
deleted file mode 100644
index d5110df..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * Node attributes.
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2JobAttributes {
-
-	private static final String JOB_ID_ATTR_ID = "MPICH2_jobid"; //$NON-NLS-1$
-	private static final String HOSTNAME_ATTR_ID = "MPICH2_hostname"; //$NON-NLS-1$
-
-	private final static StringAttributeDefinition jobIdAttrDef =
-		new StringAttributeDefinition(JOB_ID_ATTR_ID, Messages.MPICH2JobAttributes_mpiJobIdAttrDef_title,
-				Messages.MPICH2JobAttributes_mpiJobIdAttrDef_description, true, ""); //$NON-NLS-1$
-
-	private final static StringAttributeDefinition hostnameAttrDef =
-		new StringAttributeDefinition(HOSTNAME_ATTR_ID, Messages.MPICH2JobAttributes_hostnameAttrDef_title, 
-				Messages.MPICH2JobAttributes_hostnameAttrDef_description, true, ""); //$NON-NLS-1$
-
-	/**
-	 */
-	public static StringAttributeDefinition getJobIdAttributeDefinition() {
-		return jobIdAttrDef;
-	}
-
-	/**
-	 */
-	public static StringAttributeDefinition getHostnameAttributeDefinition() {
-		return hostnameAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{jobIdAttrDef, hostnameAttrDef};
-	}
-
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java
deleted file mode 100644
index 3430da2..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * OMPI-specific attributes
- * 
- * @author Daniel Felix Ferber
- */
-public class MPICH2LaunchAttributes {
-	private static final String LAUNCH_ARGS_ATTR_ID = "MPICH2_args"; //$NON-NLS-1$
-	private static final String ENV_KEYS_ATTR_ID = "MPICH2_envKeys"; //$NON-NLS-1$
-	private static final String ENV_ARGS_ATTR_ID = "MPICH2_env"; //$NON-NLS-1$
-
-	private final static StringAttributeDefinition launchArgsAttrDef =
-		new StringAttributeDefinition(LAUNCH_ARGS_ATTR_ID, Messages.MPICH2LaunchAttributes_launchArgsAttrDef_title,
-				Messages.MPICH2LaunchAttributes_launchArgsAttrDef_description, false, ""); //$NON-NLS-1$
-
-	private final static ArrayAttributeDefinition<String> environmentKeyAttrDef = new ArrayAttributeDefinition<String>(
-			ENV_KEYS_ATTR_ID, Messages.MPICH2LaunchAttributes_environmentKeyAttrDef_title,
-			Messages.MPICH2LaunchAttributes_environmentKeyAttrDef_description, false,
-			new String[0]);
-
-	private final static StringAttributeDefinition environmentArgsAttrDef = new StringAttributeDefinition(
-			ENV_ARGS_ATTR_ID, Messages.MPICH2LaunchAttributes_environmentArgsAttrDef_title, Messages.MPICH2LaunchAttributes_environmentArgsAttrDef_description, false,
-	"${MPICH2_envKeys:: -x ::-x :}"); //$NON-NLS-1$
-
-	/**
-	 * List of names of environment variables for the application.
-	 */
-	public static ArrayAttributeDefinition<String> getEnvironmentKeysAttributeDefinition() {
-		return environmentKeyAttrDef;
-	}
-
-	/**
-	 * Environment variables for the application, as expected by openmpi command line.
-	 */
-	public static StringAttributeDefinition getEnvironmentArgsAttributeDefinition() {
-		return environmentArgsAttrDef;
-	}
-
-	/**
-	 * Arguments for the application, as expected by openmpi command line.
-	 */
-	public static StringAttributeDefinition getLaunchArgumentsAttributeDefinition() {
-		return launchArgsAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{
-				launchArgsAttrDef,environmentArgsAttrDef,environmentKeyAttrDef
-		};
-	}
-
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java
deleted file mode 100644
index 248b51b..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * Node attributes
- * @author Daniel Felix Ferber
- */
-public class MPICH2MachineAttributes {
-
-	private static final String STATUS_MESSAGE = "MPICH2_statusMessage"; //$NON-NLS-1$
-
-	private final static StringAttributeDefinition statusMessageAttrDef =
-		new StringAttributeDefinition(STATUS_MESSAGE, Messages.MPICH2MachineAttributes_statusMessageAttrDef_title,
-				Messages.MPICH2MachineAttributes_statusMessageAttrDef_description, true, ""); //$NON-NLS-1$
-
-	/**
-	 * Status message if it was not possible to discover the machine.
-	 */
-	public static StringAttributeDefinition getStatusMessageAttributeDefinition() {
-		return statusMessageAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{statusMessageAttrDef};
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java
deleted file mode 100644
index 8a21b96..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.BooleanAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * Node attributes
- * @author Daniel Felix Ferber
- */
-public class MPICH2NodeAttributes {
-
-	private static final String NUM_NODES_ID = "MPICH2_numNodes"; //$NON-NLS-1$
-	private static final String MAX_NUM_NODES_ID = "MPICH2_maxNumNodes"; //$NON-NLS-1$
-	private static final String STATUS_MESSAGE = "MPICH2_statusMessage"; //$NON-NLS-1$
-	private static final String OVERSUBSCRIBED = "MPICH2_oversubscribed"; //$NON-NLS-1$
-
-	private final static IntegerAttributeDefinition numNodesAttrDef =
-		new IntegerAttributeDefinition(NUM_NODES_ID, Messages.MPICH2NodeAttributes_numNodesAttrDef_title,
-				Messages.MPICH2NodeAttributes_numNodesAttrDef_description, true, new Integer(0));
-
-	private final static IntegerAttributeDefinition maxNumNodesAttrDef =
-		new IntegerAttributeDefinition(MAX_NUM_NODES_ID, Messages.MPICH2NodeAttributes_maxNumNodesAttrDef_title,
-				Messages.MPICH2NodeAttributes_maxNumNodesAttrDef_description, true, new Integer(0));
-
-	private final static StringAttributeDefinition statusMessageAttrDef =
-		new StringAttributeDefinition(STATUS_MESSAGE, Messages.MPICH2NodeAttributes_statusMessageAttrDef_title,
-				Messages.MPICH2NodeAttributes_statusMessageAttrDef_description, true, ""); //$NON-NLS-1$
-
-	private final static BooleanAttributeDefinition oversubscribedAttrDef =
-		new BooleanAttributeDefinition(OVERSUBSCRIBED, Messages.MPICH2NodeAttributes_oversubscribedAttrDef_title,
-				Messages.MPICH2NodeAttributes_oversubscribedAttrDef_description, true, new Boolean(false));
-
-	/**
-	 * Number of slots suggested on the node.
-	 */
-	public static IntegerAttributeDefinition getNumberOfNodesAttributeDefinition() {
-		return numNodesAttrDef;
-	}
-
-	/**
-	 * Maximal number of slots on the node. Zero if not set.
-	 */
-	public static IntegerAttributeDefinition getMaximalNumberOfNodesAttributeDefinition() {
-		return maxNumNodesAttrDef;
-	}
-
-	/**
-	 * Status message if it was not possible to discover the node.
-	 */
-	public static StringAttributeDefinition getStatusMessageAttributeDefinition() {
-		return statusMessageAttrDef;
-	}
-
-	/**
-	 * If node is oversubscribed.
-	 */
-	public static BooleanAttributeDefinition getOversubscribedAttributeDefinition() {
-		return oversubscribedAttrDef;
-	}
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{numNodesAttrDef,maxNumNodesAttrDef,statusMessageAttrDef};
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java
deleted file mode 100644
index 64d74b1..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * @author Daniel Felix Ferber
- */
-public class MPICH2Plugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.mpi.mpich2.core"; //$NON-NLS-1$
-
-	// The shared instance
-	private static MPICH2Plugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public MPICH2Plugin() {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		MPICH2Defaults.loadDefaults();
-		MPICH2PreferenceManager.initializePreferences();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static MPICH2Plugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message));
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @param t
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message, Throwable t) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message, t));
-	}
-
-	/**
-	 * Create log entry from an IStatus
-	 * 
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Create log entry from a string
-	 * 
-	 * @param msg
-	 */
-	public static void log(String msg) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-
-	/**
-	 * Create log entry from a Throwable
-	 * 
-	 * @param e
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, Messages.MPICH2Plugin_Exception_InternalError, e));
-	}
-
-	/**
-	 * Generate a unique identifier
-	 * 
-	 * @return unique identifier string
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		return getDefault().getBundle().getSymbolicName();
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java
deleted file mode 100644
index 018ddb3..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.AbstractToolsPreferenceManager;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2PreferenceManager extends AbstractToolsPreferenceManager {
-	public static final String PREFIX = "mpich2-"; //$NON-NLS-1$
-
-	public static Preferences getPreferences() {
-		return MPICH2Plugin.getDefault().getPluginPreferences();
-	}
-
-	public static void savePreferences() {
-		MPICH2Plugin.getDefault().savePluginPreferences();
-	}
-
-	public static void initializePreferences() {
-		Preferences preferences = MPICH2Plugin.getDefault().getPluginPreferences();
-		preferences.setDefault(PREFIX + PREFS_LAUNCH_CMD, MPICH2Defaults.LAUNCH_CMD);
-		preferences.setDefault(PREFIX + PREFS_DEBUG_CMD, MPICH2Defaults.DEBUG_CMD);
-		preferences.setDefault(PREFIX + PREFS_DISCOVER_CMD, MPICH2Defaults.DISCOVER_CMD);
-		preferences.setDefault(PREFIX + PREFS_PERIODIC_MONITOR_CMD, MPICH2Defaults.PERIODIC_CMD);
-		preferences.setDefault(PREFIX + PREFS_PERIODIC_MONITOR_TIME, MPICH2Defaults.PERIODIC_TIME);
-		preferences.setDefault(PREFIX + PREFS_REMOTE_INSTALL_PATH, MPICH2Defaults.PATH);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java
deleted file mode 100644
index 2263b7a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.mpi.mpich2.core.messages.messages"; //$NON-NLS-1$
-	public static String MPICH2Defaults_Exception_FailedReadFile;
-	public static String MPICH2Defaults_FailedParseInteger;
-	public static String MPICH2Defaults_MissingValue;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_description;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_title;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_description;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_title;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_description;
-	public static String MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_title;
-	public static String MPICH2JobAttributes_hostnameAttrDef_description;
-	public static String MPICH2JobAttributes_hostnameAttrDef_title;
-	public static String MPICH2JobAttributes_mappingModeAttrDef_description;
-	public static String MPICH2JobAttributes_mappingModeAttrDef_title;
-	public static String MPICH2JobAttributes_mpiJobIdAttrDef_description;
-	public static String MPICH2JobAttributes_mpiJobIdAttrDef_title;
-	public static String MPICH2JobAttributes_vpidRangeAttrDef_description;
-	public static String MPICH2JobAttributes_vpidRangeAttrDef_title;
-	public static String MPICH2JobAttributes_vpidStartAttrDef_description;
-	public static String MPICH2JobAttributes_vpidStartAttrDef_title;
-	public static String MPICH2LaunchAttributes_environmentArgsAttrDef_description;
-	public static String MPICH2LaunchAttributes_environmentArgsAttrDef_title;
-	public static String MPICH2LaunchAttributes_environmentKeyAttrDef_description;
-	public static String MPICH2LaunchAttributes_environmentKeyAttrDef_title;
-	public static String MPICH2LaunchAttributes_launchArgsAttrDef_description;
-	public static String MPICH2LaunchAttributes_launchArgsAttrDef_title;
-	public static String MPICH2MachineAttributes_statusMessageAttrDef_description;
-	public static String MPICH2MachineAttributes_statusMessageAttrDef_title;
-	public static String MPICH2NodeAttributes_maxNumNodesAttrDef_description;
-	public static String MPICH2NodeAttributes_maxNumNodesAttrDef_title;
-	public static String MPICH2NodeAttributes_numNodesAttrDef_description;
-	public static String MPICH2NodeAttributes_numNodesAttrDef_title;
-	public static String MPICH2NodeAttributes_oversubscribedAttrDef_description;
-	public static String MPICH2NodeAttributes_oversubscribedAttrDef_title;
-	public static String MPICH2NodeAttributes_statusMessageAttrDef_description;
-	public static String MPICH2NodeAttributes_statusMessageAttrDef_title;
-	public static String MPICH2Plugin_Exception_InternalError;
-
-	public static String MPICH2ResourceManagerConfiguration_defaultDescription;
-	public static String MPICH2ResourceManagerConfiguration_defaultName;
-
-	public static String MPICH2DiscoverJob_defaultQueueName;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandFailed;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandFailedParseHostFile;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandFailedReadHostFile;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandHostFileEmpty;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandHostFileNotFound;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandHostFilePathNotAbsolute;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandInternalError;
-	public static String MPICH2DiscoverJob_Exception_DiscoverCommandMissingHostFilePath;
-	public static String MPICH2DiscoverJob_Exception_HostFileErrors;
-	public static String MPICH2DiscoverJob_Exception_HostFileParseError;
-	public static String MPICH2DiscoverJob_Exception_HostnameCommandFailed;
-	public static String MPICH2DiscoverJob_Exception_HostnameCommandFailedParse;
-	public static String MPICH2DiscoverJob_Exception_HostnameCommandFailedParseOutput;
-	public static String MPICH2DiscoverJob_Exception_HostnameCommandFailedWithCode;
-	public static String MPICH2DiscoverJob_Exception_IgnoredInvalidParameter;
-	public static String MPICH2DiscoverJob_Exception_InvalidMaxSlotsParameter;
-	public static String MPICH2DiscoverJob_Exception_InvalidSlotsParameter;
-	public static String MPICH2DiscoverJob_interruptedErrorMessage;
-	public static String MPICH2DiscoverJob_name;
-	public static String MPICH2DiscoverJob_parsingErrorMessage;
-	public static String MPICH2DiscoverJob_processErrorMessage;
-	
-	public static String MPICH2MonitorJob_interruptedErrorMessage;
-	public static String MPICH2MonitorJob_name;
-	public static String MPICH2MonitorJob_parsingErrorMessage;
-	public static String MPICH2MonitorJob_processErrorMessage;
-	public static String MPICH2MonitorJob_Exception_CommandFailed;
-	public static String MPICH2MonitorJob_Exception_InternalError;
-	
-	public static String MPICH2ProcessMapText12Parser_Exception_InvalidLine;
-	public static String MPICH2ProcessMapText12Parser_Exception_MissingDisplayMapInformation;
-	public static String MPICH2ProcessMapText12Parser_Exception_BrokenDisplayMapInformation;
-	
-	public static String MPICH2ProcessMapXml13Parser_Exception_AttributeNotInteger;
-	public static String MPICH2ProcessMapXml13Parser_Exception_MissingAttribute;
-	public static String MPICH2ProcessMapXml13Parser_Exception_UnknownAttribute;
-	public static String MPICH2ProcessMapXml13Parser_Exception_UnknownElement;
-	
-	public static String MPICH2RuntimeSystem_JobName;
-	public static String MPICH2RuntimeSystemJob_Exception_FailedParse;
-	public static String MPICH2RuntimeSystemJob_Exception_HostnamesDoNotMatch;
-	public static String MPICH2RuntimeSystemJob_ProcessName;
-	public static String MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithExitValue;
-	public static String MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithSignal;
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-		// Prevent instances.
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties
deleted file mode 100644
index 563d942..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-MPICH2Defaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-MPICH2Defaults_FailedParseInteger=Failed to parse integer default value for {0}
-MPICH2Defaults_MissingValue=Missing default value for {0}
-MPICH213Defaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-MPICH213Defaults_FailedParseInteger=Failed to parse integer default value for {0}
-MPICH213Defaults_MissingValue=Missing default value for {0}
-MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_description=Effective environment supplied by MPICH2 to executable on launch
-MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_title=Environment for MPICH2 processes
-MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_description=Effective command-line arguments by MPICH2 supplied to executable
-MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_title=Program Arguments for MPICH2 processes
-MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_description=Effective working directory where MPICH2 launched the processes
-MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_title=Working Directory for MPICH2 processes
-MPICH2JobAttributes_hostnameAttrDef_description=MPICH2 job hostname
-MPICH2JobAttributes_hostnameAttrDef_title=MPICH2 hostname
-MPICH2JobAttributes_mappingModeAttrDef_description=MPICH2 mapping mode
-MPICH2JobAttributes_mappingModeAttrDef_title=MPICH2 mapping mode
-MPICH2JobAttributes_mpiJobIdAttrDef_description=MPICH2 job id
-MPICH2JobAttributes_mpiJobIdAttrDef_title=MPICH2 job id
-MPICH2JobAttributes_vpidRangeAttrDef_description=MPICH2 vpid range
-MPICH2JobAttributes_vpidRangeAttrDef_title=MPICH2 vpid range
-MPICH2JobAttributes_vpidStartAttrDef_description=MPICH2 vpid start
-MPICH2JobAttributes_vpidStartAttrDef_title=MPICH2 vpid start
-MPICH2LaunchAttributes_environmentArgsAttrDef_description=Command line arguments to set environment variables for each MPICH2 processes
-MPICH2LaunchAttributes_environmentArgsAttrDef_title=MPICH2 Environment arguments
-MPICH2LaunchAttributes_environmentKeyAttrDef_description=Name of environment variables supplied to the each MPICH2 processes
-MPICH2LaunchAttributes_environmentKeyAttrDef_title=MPICH2 environment variables
-MPICH2LaunchAttributes_launchArgsAttrDef_description=Command line arguments for MPICH2
-MPICH2LaunchAttributes_launchArgsAttrDef_title=MPICH2 arguments
-MPICH2MachineAttributes_statusMessageAttrDef_description=MPICH2 status message
-MPICH2MachineAttributes_statusMessageAttrDef_title=MPICH2 status message
-MPICH2NodeAttributes_maxNumNodesAttrDef_description=MPICH2 maximal number of nodes on the host
-MPICH2NodeAttributes_maxNumNodesAttrDef_title=MPICH2 maximal number of nodes
-MPICH2NodeAttributes_numNodesAttrDef_description=MPICH2 number of nodes on the host
-MPICH2NodeAttributes_numNodesAttrDef_title=MPICH2 number of nodes
-MPICH2NodeAttributes_oversubscribedAttrDef_description=MPICH2 oversubscribed node (more processes than available)
-MPICH2NodeAttributes_oversubscribedAttrDef_title=MPICH2 oversubscribed
-MPICH2NodeAttributes_statusMessageAttrDef_description=MPICH2 status message
-MPICH2NodeAttributes_statusMessageAttrDef_title=MPICH2 status message
-MPICH2Plugin_Exception_InternalError=Internal error
-
-MPICH2ResourceManagerConfiguration_defaultDescription=MPICH2 Resource Manager
-MPICH2ResourceManagerConfiguration_defaultName=MPICH2
-
-MPICH2DiscoverJob_defaultQueueName=default
-MPICH2DiscoverJob_Exception_DiscoverCommandFailed=Error while running discover command: {0}.
-MPICH2DiscoverJob_Exception_DiscoverCommandFailedParseHostFile=Failed to parse hostfile ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandFailedReadHostFile=Failed read hostfile ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandHostFileEmpty=Empty hostfile is not allowed ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandHostFileNotFound=Failed find hostfile ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandHostFilePathNotAbsolute=Discover command informed a path to hostfile that is not an absolute path ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandInternalError=Internal error while running discover command: {0}
-MPICH2DiscoverJob_Exception_DiscoverCommandMissingHostFilePath=Discover command did not inform path to default hostfile. If necessary, set MCA parameters to define default hostfile path.
-MPICH2DiscoverJob_Exception_HostFileErrors=There are errors in the hostfile.
-MPICH2DiscoverJob_Exception_HostFileParseError=Parse error(s) in hostfile.
-MPICH2DiscoverJob_Exception_HostnameCommandFailed=Failed to run command to get hostname.
-MPICH2DiscoverJob_Exception_HostnameCommandFailedParse=Failed to parse command for hostname.
-MPICH2DiscoverJob_Exception_HostnameCommandFailedParseOutput=Failed to parse output of discover command.
-MPICH2DiscoverJob_Exception_HostnameCommandFailedWithCode=Command to get hostname failed with exit code {0}
-MPICH2DiscoverJob_Exception_IgnoredInvalidParameter=Invalid parameter was ignored for this host.
-MPICH2DiscoverJob_Exception_InvalidMaxSlotsParameter=Invalid 'max-slots' parameter was ignored for this host.
-MPICH2DiscoverJob_Exception_InvalidSlotsParameter=Invalid 'slots/cpus/count' parameter was ignored for this host.
-MPICH2DiscoverJob_interruptedErrorMessage=Interrupted while running MPICH2 discover command.
-MPICH2DiscoverJob_name=Discover MPICH2 on {0}
-MPICH2DiscoverJob_parsingErrorMessage=Failed to parse output of MPICH2 discover command.
-MPICH2DiscoverJob_processErrorMessage=Failed to create remote process for MPICH2 discover command.
-
-MPICH2ProcessMapText12Parser_Exception_InvalidLine=Invalid output from MPICH2: {0}
-MPICH2ProcessMapText12Parser_Exception_MissingDisplayMapInformation=Output from MPICH2 has no information about processes and nodes.
-MPICH2ProcessMapText12Parser_Exception_BrokenDisplayMapInformation=Incomplete output from MPICH2.
-
-MPICH2ProcessMapXml13Parser_Exception_AttributeNotInteger=Attribute {0} is not an valid integer ({1})
-MPICH2ProcessMapXml13Parser_Exception_MissingAttribute=Missing XML attribute: {0}
-MPICH2ProcessMapXml13Parser_Exception_UnknownAttribute=Unknown XML attribute: {0}
-MPICH2ProcessMapXml13Parser_Exception_UnknownElement=Unknown XML element: {0}
-
-MPICH2RuntimeSystem_JobName=MPICH2 Job
-MPICH2RuntimeSystemJob_Exception_FailedParse=Failed to parse MPICH2 run command output.
-MPICH2RuntimeSystemJob_Exception_HostnamesDoNotMatch=Hostnames from MPICH2 output do not match expected hostname.
-MPICH2RuntimeSystemJob_ProcessName=MPICH2 run
-
-MPICH2MonitorJob_interruptedErrorMessage=Interrupted while running MPICH2 monitor command.
-MPICH2MonitorJob_name=Monitor MPICH2 on {0}
-MPICH2MonitorJob_parsingErrorMessage=Failed to parse output of MPICH2 monitor command.
-MPICH2MonitorJob_processErrorMessage=Failed to create remote process for MPICH2 monitor command.
-MPICH2MonitorJob_Exception_CommandFailed=Error while running command: {0}.
-MPICH2MonitorJob_Exception_InternalError=Internal error while running command: {0}
-MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithExitValue=Job terminated abnormally with exit value {0}. This can be caused by one or more processes exiting with a non-zero exit code, or exiting before calling MPI_Finalize.
-MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithSignal=Job terminated abnormally due to signal {0}. This can be caused by one ore more processes exiting due to this signal.
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/EffectiveMPICH2ResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/EffectiveMPICH2ResourceManagerConfiguration.java
deleted file mode 100644
index 108eb62..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/EffectiveMPICH2ResourceManagerConfiguration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractEffectiveToolRMConfiguration;
-import org.eclipse.ptp.rm.core.rmsystem.IToolRMConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2PreferenceManager;
-
-public class EffectiveMPICH2ResourceManagerConfiguration extends
-AbstractEffectiveToolRMConfiguration {
-
-	public EffectiveMPICH2ResourceManagerConfiguration(
-			IToolRMConfiguration configuration) {
-		super(configuration);
-		IMPICH2ResourceManagerConfiguration MPICH2configuration = (IMPICH2ResourceManagerConfiguration)configuration;
-		String launchCmd = null;
-		String debugCmd = null;
-		String discoverCmd = null;
-		String periodicCmd = null;
-		int periodicTime = 0;
-		String remoteInstallPath = null;
-		if (MPICH2configuration.getUseToolDefaults()) {
-			Preferences preferences = MPICH2PreferenceManager.getPreferences();
-			launchCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_LAUNCH_CMD);
-			debugCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DEBUG_CMD);
-			discoverCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DISCOVER_CMD);
-			periodicCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_CMD);
-			periodicTime = preferences.getInt(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_TIME);
-		} else {
-			launchCmd = MPICH2configuration.getLaunchCmd();
-			debugCmd = MPICH2configuration.getDebugCmd();
-			discoverCmd = MPICH2configuration.getDiscoverCmd();
-			periodicCmd = MPICH2configuration.getPeriodicMonitorCmd();
-			periodicTime = MPICH2configuration.getPeriodicMonitorTime();
-		}
-		remoteInstallPath = MPICH2configuration.getRemoteInstallPath();
-		applyValues(launchCmd, debugCmd, discoverCmd, periodicCmd, periodicTime, null, remoteInstallPath);
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/IMPICH2ResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/IMPICH2ResourceManagerConfiguration.java
deleted file mode 100644
index 34a48e6..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/IMPICH2ResourceManagerConfiguration.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-import org.eclipse.ptp.rm.core.rmsystem.IToolRMConfiguration;
-
-public interface IMPICH2ResourceManagerConfiguration extends IToolRMConfiguration {
-	public static int MPICH2_CAPABILITIES = CAP_LAUNCH | CAP_DISCOVER | CAP_PERIODIC_MONITOR | CAP_REMOTE_INSTALL_PATH;
-
-	/**
-	 * Get the version selected when configuring the RM
-	 * 
-	 * @return string representing the MPICH2 version
-	 */
-	public String getVersionId();
-
-	/**
-	 * Set the version that is selected when configuring the RM
-	 * 
-	 * @param versionId string representing the MPICH2 version
-	 */
-	public void setVersionId(String versionId);
-
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2RMServiceProviderFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2RMServiceProviderFactory.java
deleted file mode 100644
index dc7857a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2RMServiceProviderFactory.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerServiceProvider;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.IServiceProviderDescriptor;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ui.IMemento;
-
-/**
- * This class is only used to bridge between the old RM factory model and the new RMs backed
- * by service configurations.
- * 
- * @author greg
- *
- */
-public class MPICH2RMServiceProviderFactory extends AbstractResourceManagerFactory {
-
-	public static final String RM_FACTORY_ID = "org.eclipse.ptp.rm.mpi.mpich2.resourcemanager"; //$NON-NLS-1$
-	
-	private static final String LAUNCH_SERVICE = "org.eclipse.ptp.core.LaunchService"; //$NON-NLS-1$
-	private static final String MPICH2_SERVICE_PROVIDER = "org.eclipse.ptp.rm.mpi.mpich2.MPICH2ServiceProvider"; //$NON-NLS-1$
-	private static final String TAG_UNIQUE_NAME = "uniqName"; //$NON-NLS-1$
-	
-	private static final IServiceModelManager fServiceManager = ServiceModelManager.getInstance();
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#copyConfiguration(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)
-	 */
-	public IResourceManagerConfiguration copyConfiguration(
-			IResourceManagerConfiguration configuration) {
-		return (IResourceManagerConfiguration)configuration.clone();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#create(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)
-	 */
-	public IResourceManagerControl create(IResourceManagerConfiguration config) {
-		PTPCorePlugin plugin = PTPCorePlugin.getDefault();
-		IPUniverseControl universe = (IPUniverseControl) plugin.getUniverse();
-		return new MPICH2ResourceManager(Integer.valueOf(universe.getNextResourceManagerId()), universe, config);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#createConfiguration()
-	 */
-	public IResourceManagerConfiguration createConfiguration() {
-		IServiceConfiguration config = fServiceManager.newServiceConfiguration(Messages.MPICH2ResourceManagerConfiguration_defaultName);
-		IService service = fServiceManager.getService(LAUNCH_SERVICE);
-		if (service != null) {
-			IServiceProviderDescriptor desc = service.getProviderDescriptor(MPICH2_SERVICE_PROVIDER);
-			if (desc != null) {
-				IServiceProvider provider = fServiceManager.getServiceProvider(desc);
-				if (provider instanceof AbstractResourceManagerServiceProvider) {
-					((AbstractResourceManagerServiceProvider)provider).setUniqueName(config.getId());
-					config.setServiceProvider(service, provider);
-					return (AbstractResourceManagerServiceProvider)provider;
-				}
-			}
-		}
-		fServiceManager.remove(config);
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#loadConfiguration(org.eclipse.ui.IMemento)
-	 */
-	public IResourceManagerConfiguration loadConfiguration(IMemento memento) {
-		String serviceConfigId = memento.getString(TAG_UNIQUE_NAME);
-		if (serviceConfigId != null) {
-			IServiceConfiguration config = fServiceManager.getConfiguration(serviceConfigId);
-			if (config != null) {
-				IService service = fServiceManager.getService(LAUNCH_SERVICE);
-				IServiceProvider provider = config.getServiceProvider(service);
-				if (provider instanceof AbstractResourceManagerServiceProvider) {
-					return (AbstractResourceManagerServiceProvider)provider;
-				}
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#saveConfiguration(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration, org.eclipse.ptp.core.elementcontrols.IResourceManagerControl)
-	 */
-	public void saveConfiguration(IResourceManagerConfiguration configuration, IResourceManagerControl resourceManager) {
-		IServiceConfiguration config = fServiceManager.getConfiguration(configuration.getUniqueName());
-		if (config != null) {
-			IService service = fServiceManager.getService(LAUNCH_SERVICE);
-			if (configuration instanceof AbstractResourceManagerServiceProvider) {
-				config.setServiceProvider(service, (IServiceProvider)configuration);
-			}
-		}
-		resourceManager.setConfiguration(configuration);		
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManager.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManager.java
deleted file mode 100755
index 8ecaecb..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManager.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.rm.core.AbstractToolsAttributes;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolResourceManager;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem.MPICH2RuntimeSystem;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ResourceManager extends AbstractToolResourceManager {
-
-	private Integer MPICH2_RMID;
-	private MPICH2RuntimeSystem rts = null;
-
-	public MPICH2ResourceManager(Integer id, IPUniverseControl universe, IResourceManagerConfiguration config) {
-		super(id.toString(), universe, config);
-		MPICH2_RMID = id;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateRuntimeSystem()
-	 */
-	@Override
-	protected IRuntimeSystem doCreateRuntimeSystem() {
-		IMPICH2ResourceManagerConfiguration config = (IMPICH2ResourceManagerConfiguration) getConfiguration();
-		AttributeDefinitionManager attrDefMgr = getAttributeDefinitionManager();
-		attrDefMgr.setAttributeDefinitions(AbstractToolsAttributes.getDefaultAttributeDefinitions());
-		rts = new MPICH2RuntimeSystem(MPICH2_RMID, config, attrDefMgr);
-		return rts;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java
deleted file mode 100755
index 319f52d..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-/**
- *
- */
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolRMConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2PreferenceManager;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ui.IMemento;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ResourceManagerConfiguration extends
-AbstractToolRMConfiguration implements Cloneable, IMPICH2ResourceManagerConfiguration {
-
-	private static final String TAG_VERSION_ID = "versionId"; //$NON-NLS-1$
-
-	/**
-	 * Static class to hold openmpi configuration information
-	 *
-	 * @author dfferber
-	 */
-	static public class MPICH2Config {
-
-		private ToolsConfig toolsConfig;
-		private String versionId;
-
-		public MPICH2Config() {
-			this(new ToolsConfig(), null);
-		}
-
-		public MPICH2Config(ToolsConfig toolsConfig, String versionId) {
-			super();
-			this.toolsConfig = toolsConfig;
-			this.versionId = versionId;
-		}
-
-		public ToolsConfig getToolsConfig() {
-			return toolsConfig;
-		}
-
-		public void setToolsConfig(ToolsConfig toolsConfig) {
-			this.toolsConfig = toolsConfig;
-		}
-
-		public String getVersionId() {
-			return versionId;
-		}
-
-		public void setVersionId(String versionId) {
-			this.versionId = versionId;
-		}
-	}
-
-	private String versionId;
-
-	public static MPICH2Config loadOpenMpiConfig(IResourceManagerFactory factory,
-			IMemento memento) {
-		ToolsConfig toolsConfig = loadTool(factory, memento);
-
-		String versionId = memento.getString(TAG_VERSION_ID);
-
-		MPICH2Config config = new MPICH2Config(toolsConfig, versionId);
-		return config;
-	}
-
-	public static IMPICH2ResourceManagerConfiguration load(
-			MPICH2ResourceManagerFactory factory, IMemento memento) {
-		MPICH2Config mpich2Config = loadOpenMpiConfig(factory, memento);
-		IMPICH2ResourceManagerConfiguration config = new MPICH2ResourceManagerConfiguration(factory, mpich2Config);
-		return config;
-	}
-
-	public MPICH2ResourceManagerConfiguration(MPICH2ResourceManagerFactory factory) {
-		super(MPICH2_CAPABILITIES, new ToolsConfig(), factory);
-
-		Preferences prefs = MPICH2PreferenceManager.getPreferences();
-		setLaunchCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_LAUNCH_CMD));
-		setDebugCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DEBUG_CMD));
-		setDiscoverCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DISCOVER_CMD));
-		setPeriodicMonitorCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_CMD));
-		setPeriodicMonitorTime(prefs.getInt(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_TIME));
-		setRemoteInstallPath(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_REMOTE_INSTALL_PATH));
-		//		setUseToolDefaults(prefs.getBoolean(MPICH213PreferenceManager.PREFIX + MPICH213PreferenceManager.PREFS_USE_DEFAULTS));
-	}
-
-	public MPICH2ResourceManagerConfiguration(MPICH2ResourceManagerFactory factory,
-			MPICH2Config config) {
-		super(MPICH2_CAPABILITIES, config.getToolsConfig(), factory);
-	}
-
-	@Override
-	public Object clone() {
-		CommonConfig commonConf = new CommonConfig(getName(),
-				getDescription(), getUniqueName(),
-				getRemoteServicesId(), getConnectionName());
-		RemoteConfig remoteConf = new RemoteConfig(commonConf,
-				getProxyServerPath(), getLocalAddress(),
-				getInvocationOptionsStr(), getOptions());
-		ToolsConfig toolsConfig = new ToolsConfig(
-				remoteConf,
-				getLaunchCmd(),
-				getDebugCmd(),
-				getDiscoverCmd(),
-				getPeriodicMonitorCmd(),
-				getPeriodicMonitorTime(),
-				getContinuousMonitorCmd(),
-				getRemoteInstallPath(),
-				getUseToolDefaults(),
-				getUseInstallDefaults(),
-				getCommandsEnabled());
-		MPICH2Config openMpiConfig = new MPICH2Config(toolsConfig, getVersionId());
-
-		return new MPICH2ResourceManagerConfiguration(
-				(MPICH2ResourceManagerFactory) getFactory(), openMpiConfig);
-	}
-
-	@Override
-	public void save(IMemento memento) {
-		super.save(memento);
-		memento.putString(TAG_VERSION_ID, versionId);
-	}
-
-	@Override
-	public void setDefaultNameAndDesc() {
-		String name = Messages.MPICH2ResourceManagerConfiguration_defaultName;
-		String conn = getConnectionName();
-		if (conn != null && !conn.equals(EMPTY_STRING)) {
-			name += "@" + conn; //$NON-NLS-1$
-		}
-		setName(name);
-		setDescription(Messages.MPICH2ResourceManagerConfiguration_defaultDescription);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.IMPICH2ResourceManagerConfiguration#getVersionId()
-	 */
-	public String getVersionId() {
-		return versionId;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.IMPICH2ResourceManagerConfiguration#setVersionId(java.lang.String)
-	 */
-	public void setVersionId(String versionId) {
-		this.versionId = versionId;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java
deleted file mode 100755
index 590a6a3..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ResourceManagerFactory extends AbstractResourceManagerFactory {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#create(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)
-	 */
-	public IResourceManagerControl create(IResourceManagerConfiguration confIn) {
-		IMPICH2ResourceManagerConfiguration configuration = (IMPICH2ResourceManagerConfiguration) confIn;
-		PTPCorePlugin plugin = PTPCorePlugin.getDefault();
-		IPUniverseControl universe = (IPUniverseControl) plugin.getUniverse();
-		return new MPICH2ResourceManager(universe.getNextResourceManagerId(), universe, configuration);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#createConfiguration()
-	 */
-	public IResourceManagerConfiguration createConfiguration() {
-		return new MPICH2ResourceManagerConfiguration(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#loadConfiguration(org.eclipse.ui.IMemento)
-	 */
-	public IResourceManagerConfiguration loadConfiguration(IMemento memento) {
-		return MPICH2ResourceManagerConfiguration.load(this, memento);
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ServiceProvider.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ServiceProvider.java
deleted file mode 100644
index aef4c6a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ServiceProvider.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolRMServiceProvider;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2PreferenceManager;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-public class MPICH2ServiceProvider extends AbstractToolRMServiceProvider implements IMPICH2ResourceManagerConfiguration {
-	private static final String TAG_VERSION_ID = "versionId"; //$NON-NLS-1$
-
-	/*
-	 * Actual version that is used to select correct commands. This version
-	 * only persists while the RM is running.
-	 */
-	private int majorVersion = 0;
-	private int minorVersion = 0;
-	private int serviceVersion = 0;
-	
-	public MPICH2ServiceProvider() {
-		super(MPICH2_CAPABILITIES);
-
-		Preferences prefs = MPICH2PreferenceManager.getPreferences();
-		setLaunchCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_LAUNCH_CMD));
-		setDebugCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DEBUG_CMD));
-		setDiscoverCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DISCOVER_CMD));
-		setPeriodicMonitorCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_CMD));
-		setPeriodicMonitorTime(prefs.getInt(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_TIME));
-		setRemoteInstallPath(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_REMOTE_INSTALL_PATH));
-	}
-
-	public MPICH2ServiceProvider(MPICH2ServiceProvider provider) {
-		super(provider);
-		provider.setLaunchCmd(getLaunchCmd());
-		provider.setDebugCmd(getDebugCmd());
-		provider.setDiscoverCmd(getDiscoverCmd());
-		provider.setPeriodicMonitorCmd(getPeriodicMonitorCmd());
-		provider.setPeriodicMonitorTime(getPeriodicMonitorTime());
-		provider.setRemoteInstallPath(getRemoteInstallPath());
-		provider.setVersionId(getVersionId());
-		provider.setDescription(getDescription());
-	}
-
-	@Override
-	public Object clone() {
-		return new MPICH2ServiceProvider(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerServiceProvider#getResourceManagerId()
-	 */
-	@Override
-	public String getResourceManagerId() {
-		return MPICH2RMServiceProviderFactory.RM_FACTORY_ID;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.IMPICH2ResourceManagerConfiguration#getVersionId()
-	 */
-	public String getVersionId() {
-		return getString(TAG_VERSION_ID, ""); //$NON-NLS-1$
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerServiceProvider#setDefaultNameAndDesc()
-	 */
-	public void setDefaultNameAndDesc() {
-		String name = Messages.MPICH2ResourceManagerConfiguration_defaultName;
-		String conn = getConnectionName();
-		if (conn != null && !conn.equals(EMPTY_STRING)) {
-			name += "@" + conn; //$NON-NLS-1$
-		}
-		setName(name);
-		setDescription(Messages.MPICH2ResourceManagerConfiguration_defaultDescription);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.IMPICH2ResourceManagerConfiguration#setVersionId(java.lang.String)
-	 */
-	public void setVersionId(String versionId) {
-		putString(TAG_VERSION_ID, versionId);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java
deleted file mode 100644
index 6e7c409..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractRemoteCommandJob;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2MachineAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2NodeAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class MPICH2DiscoverJob extends AbstractRemoteCommandJob {
-	MPICH2RuntimeSystem rts;
-
-	public MPICH2DiscoverJob(MPICH2RuntimeSystem rts) {
-		super(rts,
-				NLS.bind(Messages.MPICH2DiscoverJob_name, rts.getRmConfiguration().getName()),
-				rts.retrieveEffectiveToolRmConfiguration().getDiscoverCmd(),
-				Messages.MPICH2DiscoverJob_interruptedErrorMessage,
-				Messages.MPICH2DiscoverJob_processErrorMessage,
-				Messages.MPICH2DiscoverJob_parsingErrorMessage);
-		this.rts = rts;
-	}
-
-	@Override
-	protected void parse(BufferedReader output) throws CoreException {
-		/*
-		 * MPI resource manager have only one machine and one queue.
-		 * There they are implicitly "discovered".
-		 */
-		IResourceManager rm = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rts.getRmID());
-		String machineID = rts.createMachine(rm.getName());
-		rts.setMachineID(machineID);
-		String queueID = rts.createQueue(Messages.MPICH2DiscoverJob_defaultQueueName);
-		rts.setQueueID(queueID);
-
-		IPMachine machine = rm.getMachineById(machineID);
-		assert machine != null;
-
-		/*
-		 * Any exception from now on is caught in order to add the error message as an attribute to the machine.
-		 * Then, the exception is re-thrown.
-		 */
-		try {
-			/*
-			 * Parse output of trace command that describes the system configuration.
-			 */
-			MPICH2TraceParser parser = new MPICH2TraceParser();
-			MPICH2HostMap hostMap = parser.parse(output);
-			if (hostMap == null) {
-				machine.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-				machine.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(Messages.MPICH2DiscoverJob_Exception_HostFileParseError));
-				throw new CoreException(new Status(IStatus.ERROR, MPICH2Plugin.getDefault().getBundle().getSymbolicName(), parser.getErrorMessage()));
-			}
-
-			/*
-			 * Create model according to data from discover.
-			 */
-			int nodeCounter = 0;
-
-			for (MPICH2HostMap.Host host : hostMap.getHosts()) {
-
-				// Add node to model
-				String nodeId = rts.createNode(machineID, host.getName(), nodeCounter++);
-
-				// Add processor information to node.
-				AttributeManager attrManager = new AttributeManager();
-				if (host.getNumProcessors() != 0) {
-					try {
-						attrManager.addAttribute(MPICH2NodeAttributes.getNumberOfNodesAttributeDefinition().create(host.getNumProcessors()));
-					} catch (IllegalValueException e) {
-						// This situation is not possible since host.getNumProcessors() is always valid.
-						assert false;
-					}
-				}
-				rts.changeNode(nodeId, attrManager);
-				rts.setNodeIDForName(host.getName(), nodeId);
-			}
-		} catch (CoreException e) {
-			/*
-			 * Show message of core exception and change machine status to error.
-			 */
-			if (e.getStatus().getSeverity() == IStatus.ERROR) {
-				AttributeManager attrManager = new AttributeManager();
-				attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-				attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2DiscoverJob_Exception_DiscoverCommandFailed, e.getMessage())));
-				rts.changeMachine(machineID, attrManager);
-			}
-			throw e;
-		} catch (Exception e) {
-			/*
-			 * Show message of all other exceptions and change machine status to error.
-			 */
-			AttributeManager attrManager = new AttributeManager();
-			attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-			attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2DiscoverJob_Exception_DiscoverCommandInternalError, e.getMessage())));
-			rts.changeMachine(machineID, attrManager);
-		}
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java
deleted file mode 100644
index 554d64c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2HostMap {
-	public static class Host {
-		public final static int NO_ERRORS = 0;
-		public final static int ERR_NUM_SLOTS = 1 << 1;
-		public final static int ERR_MAX_NUM_SLOTS = 1 << 2;
-		public final static int ERR_UNKNOWN_ATTR = 1 << 3;
-
-		private String name = null;
-		private String addr = null;
-		private String port = null;
-		private int numProcessors = 0;
-		private int maxNumProcessors = 0;
-		private int errors = NO_ERRORS;
-
-		public Host(String hostname, String address, String port) {
-			this.name = hostname;
-			this.addr = address;
-			this.port = port;
-		}
-
-		public int getNumProcessors() {
-			return numProcessors;
-		}
-
-		public int getMaxNumProcessors() {
-			return maxNumProcessors;
-		}
-
-		public String getName() {
-			return name;
-		}
-		
-		public String getAddress() {
-			return addr;
-		}
-
-		public String getPort() {
-			return port;
-		}
-
-		public int getErrors() {
-			return errors;
-		}
-
-		public void setNumProcessors(int numProcessors) {
-			this.numProcessors = numProcessors;
-		}
-
-		public void setMaxNumProcessors(int maxNumProcessors) {
-			this.maxNumProcessors = maxNumProcessors;
-		}
-
-		public void addErrors(int errors) {
-			this.errors |= errors;
-		}
-	}
-
-	List<Host> hosts = new ArrayList<Host>();
-	Map<String, Host> hostNameToHost = new HashMap<String, Host>();
-	public boolean hasErrors = false;
-
-	protected void addHost(Host host) {
-		hosts.add(host);
-		hostNameToHost.put(host.getName(), host);
-	}
-
-	public Host[] getHosts() {
-		return hosts.toArray(new Host[hosts.size()]);
-	}
-
-	public Iterator<Host> getHostIterator() {
-		return hosts.listIterator();
-	}
-
-	public Host getHostByName(String name) {
-		return hostNameToHost.get(name);
-	}
-
-	public void addHost(String name, String address, String port) {
-		MPICH2HostMap.Host host = new MPICH2HostMap.Host(name, address, port);
-		addHost(host);
-	}
-
-	public int count() {
-		return hosts.size();
-	}
-
-	public boolean hasParseErrors() {
-		return hasErrors;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java
deleted file mode 100644
index 642fd76..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class MPICH2JobMap {
-
-	/**
-	 * An MPICH2 job.
-	 */
-	public class Job {
-		private static final int JOBID = 1 << 0;
-		private static final int JOBALIAS = 1 << 1;
-		private static final int USERNAME = 1 << 2;
-		private static final int HOST = 1 << 3;
-		private static final int PID = 1 << 4;
-		private static final int SID = 1 << 5;
-		private static final int RANK = 1 << 6;
-		private static final int PGM = 1 << 7;
-		
-		private String jobID = null;
-		private String jobAlias = null;
-		private String username = null;
-		private String host = null;
-		private int pid = 0;
-		private int sid = 0;
-		private int rank = 0;
-		private String pgm = null;
-		private int complete;
-
-		public Job() {
-			this.complete = 0;
-		}
-		
-		/**
-		 * @return the host
-		 */
-		public String getHost() {
-			return host;
-		}
-		
-		/**
-		 * @return the jobID
-		 */
-		public String getJobID() {
-			return jobID;
-		}
-		
-		/**
-		 * @return the jobAlias
-		 */
-		public String getJobAlias() {
-			return jobAlias;
-		}
-		
-		/**
-		 * @return the pgm
-		 */
-		public String getPgm() {
-			return pgm;
-		}
-		
-		/**
-		 * @return the pid
-		 */
-		public int getPid() {
-			return pid;
-		}
-		
-		/**
-		 * @return the rank
-		 */
-		public int getRank() {
-			return rank;
-		}
-		
-		/**
-		 * @return the sid
-		 */
-		public int getSid() {
-			return sid;
-		}
-
-		/**
-		 * @return the username
-		 */
-		public String getUsername() {
-			return username;
-		}
-		
-		/**
-		 * @return the complete
-		 */
-		public boolean isComplete() {
-			return complete == (JOBID | JOBALIAS | USERNAME | HOST | PID | SID | RANK | PGM);
-		}
-		
-		/**
-		 * @param host the host to set
-		 */
-		public void setHost(String host) {
-			this.host = host;
-			this.complete |= HOST;
-		}
-		
-		/**
-		 * @param jobID the jobID to set
-		 */
-		public void setJobID(String jobID) {
-			this.jobID = jobID;
-			this.complete |= JOBID;
-		}
-		
-		/**
-		 * @param jobAlias the jobAlias to set
-		 */
-		public void setJobAlias(String jobAlias) {
-			this.jobAlias = jobAlias;
-			this.complete |= JOBALIAS;
-		}
-
-		/**
-		 * @param pgm the pgm to set
-		 */
-		public void setPgm(String pgm) {
-			this.pgm = pgm;
-			this.complete |= PGM;
-		}
-		
-		/**
-		 * @param pid the pid to set
-		 */
-		public void setPid(int pid) {
-			this.pid = pid;
-			this.complete |= PID;
-		}
-		
-		/**
-		 * @param rank the rank to set
-		 */
-		public void setRank(int rank) {
-			this.rank = rank;
-			this.complete |= RANK;
-		}
-		
-		/**
-		 * @param sid the sid to set
-		 */
-		public void setSid(int sid) {
-			this.sid = sid;
-			this.complete |= SID;
-		}
-		/**
-		 * @param username the username to set
-		 */
-		public void setUsername(String username) {
-			this.username = username;
-			this.complete |= USERNAME;
-		}
-
-		/* (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
-		@Override
-		public String toString() {
-			String str = "Job "; //$NON-NLS-1$
-			if (!isComplete()) {
-				str += "(incomplete) ["; //$NON-NLS-1$
-			} else {
-				str += "]"; //$NON-NLS-1$
-			}
-			if ((complete & JOBID) == JOBID) {
-				str += " id: " + jobID; //$NON-NLS-1$
-			}
-			if ((complete & JOBALIAS) == JOBALIAS) {
-				str += " alias: " + jobAlias; //$NON-NLS-1$
-			}
-			if ((complete & USERNAME) == USERNAME) {
-				str += " username:" + username; //$NON-NLS-1$
-			}
-			if ((complete & HOST) == HOST) {
-				str += " host:" + host; //$NON-NLS-1$
-			}
-			if ((complete & PID) == PID) {
-				str += " pid:" + pid; //$NON-NLS-1$
-			}
-			if ((complete & SID) == SID) {
-				str += " sid:" + sid; //$NON-NLS-1$
-			}
-			if ((complete & RANK) == RANK) {
-				str += " rank:" + rank; //$NON-NLS-1$
-			}
-			if ((complete & PGM) == PGM) {
-				str += " pgm:" + pgm; //$NON-NLS-1$
-			}
-			return str + "]"; //$NON-NLS-1$
-		}
-
-	}
-
-	private final Map<String, List<Job>> jobsByID = new HashMap<String, List<Job>>();
-	public boolean hasErrors = false;
-
-	public MPICH2JobMap() {
-		// Nothing.
-	}
-
-	public void addJob(Job job) {
-		List<Job> jobs = jobsByID.get(job.getJobID());
-		if (jobs == null) {
-			jobs = new ArrayList<Job>();
-			jobsByID.put(job.getJobID(), jobs);			
-		}
-		jobs.add(job);
-	}
-	
-	public List<Job> getJob(String jobID) {
-		return jobsByID.get(jobID);
-	}
-
-	public Collection<List<Job>> getJobs() {
-		return jobsByID.values();
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java
deleted file mode 100644
index db25f92..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class MPICH2ListJobsParser {
-	public enum JobListState {JOBLIST_INIT, JOBLIST_START, JOBLIST_END, JOBLIST_COMPLETE, JOBLIST_ERROR}
-	
-	private JobListState state;
-	private MPICH2JobMap map = new MPICH2JobMap();
-	private String errorMsg;
-	
-	/**
-	 * @param parser
-	 * @param line
-	 * @param job
-	 */
-	private void processJobInfo(String line, MPICH2JobMap.Job job) {
-		String[] parts = line.split("="); //$NON-NLS-1$
-		String key;
-		String value;
-
-		if (parts.length == 1) {
-			key = parts[0].trim();
-			value = ""; //$NON-NLS-1$
-		} else if (parts.length == 2) {
-			key = parts[0].trim();
-			value = parts[1].trim();
-		} else {
-			state = JobListState.JOBLIST_ERROR;
-			errorMsg = line;
-			return;
-		}
-		
-		if ("jobid".equals(key)) { //$NON-NLS-1$
-			job.setJobID(value);
-		} else if ("jobalias".equals(key)) { //$NON-NLS-1$
-			job.setJobAlias(value);
-		} else if ("username".equals(key)) { //$NON-NLS-1$
-			job.setUsername(value);
-		} else if ("host".equals(key)) { //$NON-NLS-1$
-			job.setHost(value);
-		} else if ("pid".equals(key)) { //$NON-NLS-1$
-			job.setPid(Integer.parseInt(value));
-		} else if ("sid".equals(key)) { //$NON-NLS-1$
-			job.setSid(Integer.parseInt(value));
-		} else if ("rank".equals(key)) { //$NON-NLS-1$
-			job.setRank(Integer.parseInt(value));
-		} else if ("pgm".equals(key)) { //$NON-NLS-1$
-			job.setPgm(value);
-		} else {
-			state = JobListState.JOBLIST_ERROR;
-			errorMsg = line;
-			return;
-		}
-		
-		if (job.isComplete()) {
-			state = JobListState.JOBLIST_END;
-		}
-	}
-	
-	/**
-	 * @param reader
-	 * @return
-	 * @throws IOException
-	 */
-	public MPICH2JobMap parse(BufferedReader reader) throws IOException {
-		String line = null;
-		MPICH2JobMap.Job job = null;
-
-		state = JobListState.JOBLIST_INIT;
-		
-		while (state != JobListState.JOBLIST_COMPLETE) {
-			switch (state) {
-			case JOBLIST_INIT:
-				if ((line = reader.readLine()) == null) {
-					state = JobListState.JOBLIST_COMPLETE;
-					break;
-				}
-				
-				line = line.trim();
-
-				if (line.length() == 0) {
-					// Ignore empty line
-					break;
-				}
-
-				state = JobListState.JOBLIST_START;
-
-				job = map.new Job();
-				processJobInfo(line, job);
-				break;
-			
-			case JOBLIST_START:
-				if ((line = reader.readLine()) == null) {
-					state = JobListState.JOBLIST_END;
-					break;
-				}
-				
-				line = line.trim();
-
-				if (line.length() == 0) {
-					state = JobListState.JOBLIST_END;
-					break;
-				}
-				
-				processJobInfo(line, job);
-				break;
-				
-			case JOBLIST_END:
-				if (job != null) {
-					if (job.isComplete()) {
-						map.addJob(job);
-					} else {
-						DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "job is incomplete, skipping" + job.toString()); //$NON-NLS-1$
-					}
-				}
-				
-				if (line == null) {
-					state = JobListState.JOBLIST_COMPLETE;
-				} else {
-					state = JobListState.JOBLIST_INIT;
-				}
-				DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "found job " + job.toString()); //$NON-NLS-1$
-				break;
-				
-			case JOBLIST_COMPLETE:
-				break;
-				
-			case JOBLIST_ERROR:
-				while ((line = reader.readLine()) != null) {
-					errorMsg += "\n" + line; //$NON-NLS-1$
-				}
-				return null;
-			}
-		}
-		
-		return map;
-	}
-	
-	/**
-	 * @return
-	 */
-	public String getErrorMessage() {
-		return errorMsg;
-	}
-}
-
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java
deleted file mode 100644
index 0b38881..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractRemoteCommandJob;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2MachineAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class MPICH2PeriodicJob extends AbstractRemoteCommandJob {
-	MPICH2RuntimeSystem rts;
-
-	public MPICH2PeriodicJob(MPICH2RuntimeSystem rts) {
-		super(rts,
-				NLS.bind(Messages.MPICH2MonitorJob_name, rts.getRmConfiguration().getName()),
-				rts.retrieveEffectiveToolRmConfiguration().getPeriodicMonitorCmd(),
-				Messages.MPICH2MonitorJob_interruptedErrorMessage,
-				Messages.MPICH2MonitorJob_processErrorMessage,
-				Messages.MPICH2MonitorJob_parsingErrorMessage,
-				rts.retrieveEffectiveToolRmConfiguration().getPeriodicMonitorTime());
-		this.rts = rts;
-	}
-
-	@Override
-	protected void parse(BufferedReader output) throws CoreException {
-		/*
-		 * MPI resource manager have only one machine and one queue.
-		 * There they are implicitly "discovered".
-		 */
-		IResourceManager rm = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rts.getRmID());
-		IPMachine machine = rm.getMachineById(rts.getMachineID());
-		IPQueue queue = rm.getQueueById(rts.getQueueID());
-		
-		/*
-		 * We may be called before the model has been set up properly. Do nothing
-		 * if this is the case.
-		 */
-		if (machine == null || queue == null) {
-			return;
-		}
-
-		/*
-		 * Any exception from now on is caught in order to add the error message as an attribute to the machine.
-		 * Then, the exception is re-thrown.
-		 */
-		try {
-			/*
-			 * Parse output of mpdlistjobs command.
-			 */
-			MPICH2ListJobsParser parser = new MPICH2ListJobsParser();
-			MPICH2JobMap jobMap = parser.parse(output);
-			if (jobMap == null) {
-				throw new CoreException(new Status(IStatus.ERROR, MPICH2Plugin.getDefault().getBundle().getSymbolicName(), parser.getErrorMessage()));
-			}
-			
-			/*
-			 * Update model according to data. First create any new jobs.
-			 */
-			for (List<MPICH2JobMap.Job> jobs : jobMap.getJobs()) {
-				for (MPICH2JobMap.Job job : jobs) {
-					IPJob pJob = queue.getJobById(job.getJobAlias());
-					if (pJob == null) {
-						// Not one of our jobs
-						continue;
-					}
-					IPProcessControl process = (IPProcessControl)pJob.getProcessByIndex(job.getRank());
-					if (process != null) {
-						// process already exists, don't need to do anything
-						continue;
-					}
-					String nodeID = rts.getNodeIDforName(job.getHost());
-					if (nodeID == null) {
-						throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.MPICH2RuntimeSystemJob_Exception_HostnamesDoNotMatch, null));
-					}
-	
-					String processID = rts.createProcess(job.getJobAlias(), job.getRank(), nodeID);
-					
-					process = (IPProcessControl)pJob.getProcessById(processID);
-					process.setState(ProcessAttributes.State.RUNNING);
-				}
-			}
-		} catch (CoreException e) {
-			/*
-			 * Show message of core exception and change machine status to error.
-			 */
-			if (e.getStatus().getSeverity() == IStatus.ERROR) {
-				AttributeManager attrManager = new AttributeManager();
-				attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-				attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2MonitorJob_Exception_CommandFailed, e.getMessage())));
-				rts.changeMachine(machine.getID(), attrManager);
-			}
-			throw e;
-		} catch (Exception e) {
-			/*
-			 * Show message of all other exceptions and change machine status to error.
-			 */
-			AttributeManager attrManager = new AttributeManager();
-			attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
-			attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2MonitorJob_Exception_InternalError, e.getMessage())));
-			rts.changeMachine(machine.getID(), attrManager);
-		}
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java
deleted file mode 100644
index 877572e..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractEffectiveToolRMConfiguration;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.EffectiveMPICH2ResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.IMPICH2ResourceManagerConfiguration;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2RuntimeSystem extends AbstractToolRuntimeSystem {
-
-	/** The machine where open mpi is running on. */
-	private String machineID;
-	/** The queue that dispatches jobs to mpi. */
-	private String queueID;
-	/** Mapping of discovered hosts and their ID for IPNode elements. */
-	private Map<String,String> nodeNameToIDMap = new HashMap<String, String>();
-
-	public MPICH2RuntimeSystem(Integer rmid,
-			IMPICH2ResourceManagerConfiguration config,
-			AttributeDefinitionManager attrDefMgr) {
-		super(rmid, config, attrDefMgr);
-	}
-
-	protected void setMachineID(String machineID) {
-		this.machineID = machineID;
-	}
-
-	protected void setQueueID(String queueID) {
-		this.queueID = queueID;
-	}
-
-	public String getMachineID() {
-		return machineID;
-	}
-
-	public String getQueueID() {
-		return queueID;
-	}
-
-	public String getNodeIDforName(String hostname) {
-		return nodeNameToIDMap.get(hostname);
-	}
-
-	public void setNodeIDForName(String hostname, String nodeID) {
-		nodeNameToIDMap.put(hostname, nodeID);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doShutdown()
-	 */
-	@Override
-	protected void doShutdown() throws CoreException {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStartEvents()
-	 */
-	@Override
-	protected void doStartEvents() throws CoreException {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStartup(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	protected void doStartup(IProgressMonitor monitor) throws CoreException {
-		// Nothing to do
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStopEvents()
-	 */
-	@Override
-	protected void doStopEvents() throws CoreException {
-		// Nothing to do
-	}
-
-	@Override
-	protected Job createDiscoverJob() {
-		if (!rmConfiguration.hasDiscoverCmd()) {
-			return null;
-		}
-		Job job = new MPICH2DiscoverJob(this);
-		job.setPriority(Job.INTERACTIVE);
-		job.setSystem(false);
-		job.setUser(false);
-		return job;
-	}
-
-	@Override
-	protected Job createPeriodicMonitorJob() {
-		if (!rmConfiguration.hasPeriodicMonitorCmd()) {
-			return null;
-		}
-		Job job = new MPICH2PeriodicJob(this);
-		job.setPriority(Job.INTERACTIVE);
-		job.setSystem(false);
-		job.setUser(false);
-		return job;
-	}
-
-	@Override
-	protected Job createContinuousMonitorJob() {
-		return null;
-	}
-
-	@Override
-	public Job createRuntimeSystemJob(String jobID, String queueID, AttributeManager attrMgr) {
-		return new MPICH2RuntimeSystemJob(jobID, queueID, Messages.MPICH2RuntimeSystem_JobName, this, attrMgr);
-	}
-
-
-	@Override
-	public AbstractEffectiveToolRMConfiguration retrieveEffectiveToolRmConfiguration() {
-		return new EffectiveMPICH2ResourceManagerConfiguration(getRmConfiguration());
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java
deleted file mode 100644
index b8a7c2b..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes.State;
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.IProcessChangeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-import org.eclipse.ptp.core.elements.listeners.IJobChildListener;
-import org.eclipse.ptp.core.elements.listeners.IProcessListener;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystemJob;
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-import org.eclipse.ptp.rm.core.utils.InputStreamListenerToOutputStream;
-import org.eclipse.ptp.rm.core.utils.InputStreamObserver;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2JobAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2LaunchAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- * 
- * @author Daniel Felix Ferber
- * @author Greg Watson
- *
- */
-public class MPICH2RuntimeSystemJob extends AbstractToolRuntimeSystemJob {
-	
-	public Object lock1 = new Object();
-	private InputStreamObserver stderrObserver;
-	private InputStreamObserver stdoutObserver;
-
-	protected final ReentrantLock procsLock = new ReentrantLock();
-	protected final Condition procsCondition = procsLock.newCondition();
-	protected int numRunningProcs = 0;
-
-	protected IProcessListener processListener = new IProcessListener() {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IProcessListener#handleEvent(org.eclipse.ptp.core.elements.events.IProcessChangeEvent)
-		 */
-		public void handleEvent(IProcessChangeEvent e) {
-			if (e.getAttributes().getAttribute(ProcessAttributes.getStateAttributeDefinition()) != null
-					&& e.getSource().getState() == ProcessAttributes.State.RUNNING) {
-				procsLock.lock();
-				try {
-					numRunningProcs++;
-					procsCondition.signalAll();
-				} finally {
-					procsLock.unlock();
-				}
-			}
-		}
-	};
-	
-	protected IJobChildListener jobChildListener = new IJobChildListener() {
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedProcessEvent)
-		 */
-		public void handleEvent(IChangedProcessEvent e) {
-			// ignore
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewProcessEvent)
-		 */
-		public void handleEvent(INewProcessEvent e) {
-			for (IPProcess process : e.getProcesses()) {
-				process.addElementListener(processListener);
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveProcessEvent)
-		 */
-		public void handleEvent(IRemoveProcessEvent e) {
-			for (IPProcess process : e.getProcesses()) {
-				process.removeElementListener(processListener);
-			}
-		}
-	};
-	
-	public MPICH2RuntimeSystemJob(String jobID, String queueID, String name, AbstractToolRuntimeSystem rtSystem, AttributeManager attrMgr) {
-		super(jobID, queueID, name, rtSystem, attrMgr);
-	}
-
-	private void changeAllProcessesStatus(State newState) {
-		final MPICH2RuntimeSystem rtSystem = (MPICH2RuntimeSystem) getRtSystem();
-		final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
-
-		/*
-		 * Mark all running and starting processes as finished.
-		 */
-		List<String> ids = new ArrayList<String>();
-		for (IPProcess ipProcess : ipJob.getProcesses()) {
-			switch (ipProcess.getState()) {
-			case EXITED:
-			case ERROR:
-			case EXITED_SIGNALLED:
-				break;
-			case RUNNING:
-			case STARTING:
-			case SUSPENDED:
-			case UNKNOWN:
-				ids.add(ipProcess.getID());
-				break;
-			}
-		}
-
-		AttributeManager attrMrg = new AttributeManager();
-		attrMrg.addAttribute(ProcessAttributes.getStateAttributeDefinition().create(newState));
-		for (String processId : ids) {
-			rtSystem.changeProcess(processId, attrMrg);
-		}
-	}
-
-	@Override
-	protected void doBeforeExecution(IProgressMonitor monitor, IRemoteProcessBuilder builder) throws CoreException {
-		final MPICH2RuntimeSystem rtSystem = (MPICH2RuntimeSystem) getRtSystem();
-		final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
-		ipJob.addChildListener(jobChildListener);
-	}
-
-	@Override
-	protected void doExecutionCleanUp(IProgressMonitor monitor) {
-		if (getProcess() != null) {
-			getProcess().destroy();
-		}
-		if (stderrObserver != null) {
-			stderrObserver.kill();
-			stderrObserver = null;
-		}
-		if (stdoutObserver != null) {
-			stdoutObserver.kill();
-			stdoutObserver = null;
-		}
-		// TODO: more cleanup?
-		changeAllProcessesStatus(ProcessAttributes.State.EXITED);
-	}
-
-	@Override
-	protected JobAttributes.State doExecutionFinished(IProgressMonitor monitor) throws CoreException {
-		changeAllProcessesStatus(ProcessAttributes.State.EXITED);
-		if (getProcess().exitValue() != 0) {
-			if (!terminateJobFlag) {
-				changeJobStatusMessage(NLS.bind(Messages.MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithExitValue, new Integer(getProcess().exitValue())));
-				return JobAttributes.State.ERROR;
-			}
-			
-			DebugUtil.trace(DebugUtil.RTS_JOB_TRACING, "RTS job #{0}: ignoring exit value {1} because job was forced to terminate by user", getJobID(), new Integer(getProcess().exitValue())); //$NON-NLS-1$
-		}
-		return JobAttributes.State.TERMINATED;
-	}
-
-	@Override
-	protected void doExecutionStarted(IProgressMonitor monitor) throws CoreException {
-		final MPICH2RuntimeSystem rtSystem = (MPICH2RuntimeSystem) getRtSystem();
-		final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
-
-		/*
-		 * Listener that saves stdout.
-		 */
-		final PipedOutputStream stdoutOutputStream = new PipedOutputStream();
-		final PipedInputStream stdoutInputStream = new PipedInputStream();
-		try {
-			stdoutInputStream.connect(stdoutOutputStream);
-		} catch (IOException e) {
-			assert false; // This exception is not possible
-		}
-		final InputStreamListenerToOutputStream stdoutPipedStreamListener = new InputStreamListenerToOutputStream(stdoutOutputStream);
-
-		Thread stdoutThread = new Thread() {
-			@Override
-			public void run() {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: started", getJobID()); //$NON-NLS-1$
-				BufferedReader stdoutBufferedReader = new BufferedReader(new InputStreamReader(stdoutInputStream));
-				try {
-					String line = stdoutBufferedReader.readLine();
-					while (line != null) {
-						int index = 0;
-						int pos = line.indexOf(": "); //$NON-NLS-1$
-						if (pos > 0) {
-							try {
-								index = Integer.parseInt(line.substring(0, pos));
-								line = line.substring(pos+1);
-							} catch (NumberFormatException e) {
-								// ignore
-							}
-						}
-						synchronized (lock1) {
-							IPProcess ipProc = ipJob.getProcessByIndex(index);
-							if (ipProc != null) {
-								ipProc.addAttribute(ProcessAttributes.getStdoutAttributeDefinition().create(line));
-							}
-							DebugUtil.trace(DebugUtil.RTS_JOB_OUTPUT_TRACING, "RTS job #{0}:> {1}", getJobID(), line); //$NON-NLS-1$
-						}
-						line = stdoutBufferedReader.readLine();
-					}
-				} catch (IOException e) {
-					DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: {0}", e); //$NON-NLS-1$
-					MPICH2Plugin.log(e);
-				} finally {
-					stdoutPipedStreamListener.disable();
-				}
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: finished", getJobID()); //$NON-NLS-1$
-			}
-		};
-
-		/*
-		 * Listener that saves stderr.
-		 */
-		final PipedOutputStream stderrOutputStream = new PipedOutputStream();
-		final PipedInputStream stderrInputStream = new PipedInputStream();
-		try {
-			stderrInputStream.connect(stderrOutputStream);
-		} catch (IOException e) {
-			assert false; // This exception is not possible
-		}
-		final InputStreamListenerToOutputStream stderrPipedStreamListener = new InputStreamListenerToOutputStream(stderrOutputStream);
-		Thread stderrThread = new Thread() {
-			@Override
-			public void run() {
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: started", getJobID()); //$NON-NLS-1$
-				final BufferedReader stderrBufferedReader = new BufferedReader(new InputStreamReader(stderrInputStream));
-				try {
-					String line = stderrBufferedReader.readLine();
-					while (line != null) {
-						int index = 0;
-						int pos = line.indexOf(": "); //$NON-NLS-1$
-						if (pos > 0) {
-							try {
-								index = Integer.parseInt(line.substring(0, pos));
-								line = line.substring(pos+1);
-							} catch (NumberFormatException e) {
-								// ignore
-							}
-						}
-						synchronized (lock1) {
-							IPProcess ipProc = ipJob.getProcessByIndex(index);
-							if (ipProc != null) {
-								ipProc.addAttribute(ProcessAttributes.getStderrAttributeDefinition().create(line));
-							}
-							DebugUtil.error(DebugUtil.RTS_JOB_OUTPUT_TRACING, "RTS job #{0}:> {1}", getJobID(), line); //$NON-NLS-1$
-						}
-						line = stderrBufferedReader.readLine();
-					}
-				} catch (IOException e) {
-					DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: {1}", getJobID(), e); //$NON-NLS-1$
-					MPICH2Plugin.log(e);
-				} finally {
-					stderrPipedStreamListener.disable();
-				}
-				DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: finished", getJobID()); //$NON-NLS-1$
-			}
-		};
-
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: starting all threads", getJobID()); //$NON-NLS-1$
-		/*
-		 * Create and start listeners.
-		 */
-		stdoutThread.start();
-		stderrThread.start();
-
-		stderrObserver = new InputStreamObserver(getProcess().getErrorStream());
-		stdoutObserver = new InputStreamObserver(getProcess().getInputStream());
-
-		stdoutObserver.addListener(stdoutPipedStreamListener);
-		stderrObserver.addListener(stderrPipedStreamListener);
-
-		stderrObserver.start();
-		stdoutObserver.start();
-		
-		/*
-		 * At this point we need to pause until all processes have started. This is because
-		 * the model semantics are such that the job state must not be set to RUNNING until
-		 * all the job's processes (if there are any) have been created and also set to RUNNING.
-		 */
-		
-		/*
-		 * We know that a MPICH2 job has a number of processes attribute
-		 */
-		int numProcs = 1;
-		IntegerAttribute numProcsAttr = getAttrMgr().getAttribute(JobAttributes.getNumberOfProcessesAttributeDefinition());
-		if (numProcsAttr != null) {
-			numProcs = numProcsAttr.getValue().intValue();
-		}
-		
-		procsLock.lock();
-		try {
-			while (!monitor.isCanceled() && numRunningProcs < numProcs) {
-				try {
-					procsCondition.await(500, TimeUnit.MILLISECONDS);
-				} catch (InterruptedException e) {
-					// ignore
-				}
-			}
-		} finally {
-			procsLock.unlock();
-		}
-	}
-
-	@Override
-	protected void doPrepareExecution(IProgressMonitor monitor) throws CoreException {
-		// Nothing to do
-	}
-
-	@Override
-	protected IAttribute<?, ?, ?>[] doRetrieveToolBaseSubstitutionAttributes() throws CoreException {
-		// TODO make macros available for environment variables and work directory.
-		return null;
-	}
-
-	@Override
-	protected IAttribute<?, ?, ?>[] doRetrieveToolCommandSubstitutionAttributes(
-			AttributeManager baseSubstitutionAttributeManager,
-			String directory, Map<String, String> environment) {
-
-		List<IAttribute<?, ?, ?>> newAttributes = new ArrayList<IAttribute<?,?,?>>();
-
-		/*
-		 * An MPICH2 specific attribute.
-		 * Attribute that contains a list of names of environment variables.
-		 */
-		int p = 0;
-		String keys[] = new String[environment.size()];
-		for (String key : environment.keySet()) {
-			keys[p++] = key;
-		}
-		newAttributes.add(MPICH2LaunchAttributes.getEnvironmentKeysAttributeDefinition().create(keys));
-
-		/*
-		 * An MPICH2 specific attribute.
-		 * A shortcut that generates arguments for the MPICH2 run command.
-		 */
-		newAttributes.add(MPICH2LaunchAttributes.getEnvironmentArgsAttributeDefinition().create());
-		
-		/*
-		 * The jobid is used to alias the MPICH2 job so that it can be matched later.
-		 */
-		newAttributes.add(MPICH2JobAttributes.getJobIdAttributeDefinition().create(getJobID()));
-		
-		return newAttributes.toArray(new IAttribute<?, ?, ?>[newAttributes.size()]);
-	}
-
-	@Override
-	protected HashMap<String, String> doRetrieveToolEnvironment()
-	throws CoreException {
-		// No extra environment variables needs to be set for MPICH2.
-		return null;
-	}
-
-	@Override
-	protected void doTerminateJob() {
-		// Empty implementation.
-	}
-
-	@Override
-	protected void doWaitExecution(IProgressMonitor monitor) throws CoreException {
-		/*
-		 * Wait until both stdout and stderr stop because stream are closed.
-		 * This means that the process has finished.
-		 */
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting stderr thread to finish", getJobID()); //$NON-NLS-1$
-		try {
-			stderrObserver.join();
-		} catch (InterruptedException e1) {
-			// Ignore
-		}
-
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting stdout thread to finish", getJobID()); //$NON-NLS-1$
-		try {
-			stdoutObserver.join();
-		} catch (InterruptedException e1) {
-			// Ignore
-		}
-
-		/*
-		 * Still experience has shown that remote process might not have yet terminated, although stdout and stderr is closed.
-		 */
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting mpi process to finish completely", getJobID()); //$NON-NLS-1$
-		try {
-			getProcess().waitFor();
-		} catch (InterruptedException e) {
-			// Ignore
-		}
-
-		DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: completely finished", getJobID()); //$NON-NLS-1$
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java
deleted file mode 100644
index f0433c0..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-
-/**
- * 
- * @author Greg Watson
- *
- */
-public class MPICH2TraceParser {
-	private String errorMessage = null;
-	private MPICH2HostMap map = new MPICH2HostMap();
-	private static Pattern pattern = Pattern.compile("([^_]+)_([0-9])+ \\(([0-9.]+)\\)"); //$NON-NLS-1$
-
-	/**
-	 * Parse the output of the mpdtrace command.
-	 * 
-	 * @param reader
-	 * @return an MPICH2HostMap containing the known hosts, or null if there was an error
-	 * @throws IOException
-	 */
-	public MPICH2HostMap parse(BufferedReader reader) throws IOException {
-		MPICH2TraceParser parser = new MPICH2TraceParser();
-		String line;
-		while ((line = reader.readLine()) != null) {
-			line = line.trim();
-
-			if (line.length()==0) {
-				// Ignore empty line
-				continue;
-			}
-
-			Matcher matcher = pattern.matcher(line);
-			if (!matcher.matches()) {
-				/*
-				 * Probably an error from mpdtrace. Collect lines and mark error.
-				 */
-				errorMessage = ""; //$NON-NLS-1$
-				
-				while ((line = reader.readLine()) != null) {
-					errorMessage += line + "\n"; //$NON-NLS-1$
-				}
-				
-				return null;
-			}
-
-			if (matcher.matches() && matcher.groupCount() == 3) {
-				String host = matcher.group(1);
-				String port = matcher.group(2);
-				String addr = matcher.group(3);
-				parser.map.addHost(host, addr, port);
-				DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "found host " + host + " addr " + addr + " port " + port); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-		}
-		
-		return parser.map;
-	}
-	
-	/**
-	 * @return error message
-	 */
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-}
-
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath
deleted file mode 100644
index 1fa3e68..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project
deleted file mode 100644
index bbf2126..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.mpi.mpich2.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 201e354..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,60 +0,0 @@
-#Mon Oct 06 14:36:44 GMT-03:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 209bce8..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.mpi.mpich2.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.debug.ui,
- org.eclipse.ptp.services.core;bundle-version="1.0.0",
- org.eclipse.ptp.services.ui;bundle-version="1.0.0",
- org.eclipse.ptp.core,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.launch,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.rm.ui,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.utils.ui,
- org.eclipse.ptp.rm.core,
- org.eclipse.ptp.rm.mpi.mpich2.core
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.mpi.mpich2.ui,
- org.eclipse.ptp.rm.mpi.mpich2.ui.launch,
- org.eclipse.ptp.rm.mpi.mpich2.ui.wizards
-Bundle-Vendor: %pluginProvider
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation 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
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/build.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/build.properties
deleted file mode 100644
index dfa3b91..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               data/,\
-               plugin.properties
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/data/launch-defaults.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/data/launch-defaults.properties
deleted file mode 100644
index e15a32c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/data/launch-defaults.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-NUMPROCS=1
-NOLOCAL=false
-PREFIX=
-USEPREFIX=false
-HOSTFILE=
-USEHOSTFILE=false
-HOSTLIST=
-USEHOSTLIST=false
-ARGUMENTS=
-USEDEFAULTARGUMENTS=true
-USEDEFAULTPARAMETERS=true
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.properties
deleted file mode 100644
index f66bf1f..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP MPICH2 (new) UI
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.xml b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.xml
deleted file mode 100644
index 024149f..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.ui.rmConfigurationWizards">
-      <configurationWizard
-            class="org.eclipse.ptp.rm.mpi.mpich2.ui.wizards.MPICH2RMConfigurationWizardPageFactory"
-            id="org.eclipse.ptp.rm.mpich2.ui.configurationWizard"/>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.launch.rmLaunchConfigurations">
-      <launchConfiguration
-            class="org.eclipse.ptp.rm.mpi.mpich2.ui.launch.MPICH2RMLaunchConfigurationFactory"
-            id="org.eclipse.ptp.rm.mpich2.ui.launchConfiguration"/>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.services.ui.providerContributors">
-      <providerContributor
-            class="org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2ProviderContributor"
-            id="org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ServiceProvider">
-      </providerContributor>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.ui.rmConfigurationWizards">
-      <configurationWizard
-            class="org.eclipse.ptp.rm.mpi.mpich2.ui.wizards.MPICH2RMServiceProviderConfigurationWizardPageFactory"
-            id="org.eclipse.ptp.rm.mpi.mpich2.ui.configurationWizard">
-      </configurationWizard>
-   </extension>
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2ProviderContributor.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2ProviderContributor.java
deleted file mode 100644
index 8e6d9aa..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2ProviderContributor.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 IBM Corporation.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- ******************************************************************************/

-package org.eclipse.ptp.rm.mpi.mpich2.ui;

-

-import org.eclipse.jface.wizard.IWizard;

-import org.eclipse.jface.wizard.IWizardPage;

-import org.eclipse.jface.wizard.WizardPage;

-import org.eclipse.ptp.rm.mpi.mpich2.ui.wizards.MPICH2RMConfigurationWizardPage;

-import org.eclipse.ptp.services.core.IServiceProvider;

-import org.eclipse.ptp.services.ui.IServiceProviderContributor;

-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;

-import org.eclipse.ptp.ui.wizards.RMServiceProviderConfigurationWizard;

-import org.eclipse.swt.widgets.Shell;

-

-public class MPICH2ProviderContributor implements IServiceProviderContributor 

-{

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.services.ui.IServiceProviderContributor#configureServiceProvider(org.eclipse.ptp.services.core.IServiceProvider, org.eclipse.swt.widgets.Shell)

-	 */

-	public void configureServiceProvider(IServiceProvider provider, Shell parentShell) 

-	{

-		// Not implemented

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.services.ui.IServiceProviderContributor#getWizard(org.eclipse.ptp.services.core.IServiceProvider, org.eclipse.jface.wizard.IWizardPage)

-	 */

-	public IWizard getWizard(IServiceProvider provider, IWizardPage page) {

-		return new RMServiceProviderConfigurationWizard(provider, page);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.services.ui.IServiceProviderContributor#getWizardPages(org.eclipse.jface.wizard.IWizard, org.eclipse.ptp.services.core.IServiceProvider)

-	 */

-	public WizardPage[] getWizardPages(IWizard wizard, IServiceProvider provider) 

-	{

-		WizardPage wizardPages[];

-		

-		wizardPages = new WizardPage[1];

-		wizardPages[0] = new MPICH2RMConfigurationWizardPage((IRMConfigurationWizard)wizard);

-		return wizardPages;

-	}

-

-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java
deleted file mode 100644
index 6baa3e1..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.launch.MPICH2LaunchConfigurationDefaults;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * @author Daniel Felix Ferber
- */
-public class MPICH2UIPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.mpi.mpich2.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static MPICH2UIPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public MPICH2UIPlugin() {
-		// Empty implementation.
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-		MPICH2LaunchConfigurationDefaults.loadDefaults();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static MPICH2UIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message));
-	}
-
-	/**
-	 * Raise core exception.
-	 * @param message
-	 * @param t
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message, Throwable t) {
-		return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message, t));
-	}
-
-	/**
-	 * Create log entry from an IStatus
-	 *
-	 * @param status
-	 */
-	public static void log(IStatus status) {
-		getDefault().getLog().log(status);
-	}
-
-	/**
-	 * Create log entry from a string
-	 *
-	 * @param msg
-	 */
-	public static void log(String msg) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
-	}
-
-	/**
-	 * Create log entry from a Throwable
-	 *
-	 * @param e
-	 */
-	public static void log(Throwable e) {
-		log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, Messages.MPICH2UIPlugin_Exception_InternalError, e));
-	}
-
-	/**
-	 * Generate a unique identifier
-	 *
-	 * @return unique identifier string
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			// If the default instance is not yet initialized,
-			// return a static identifier. This identifier must
-			// match the plugin id defined in plugin.xml
-			return PLUGIN_ID;
-		return getDefault().getBundle().getSymbolicName();
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 180d5d7..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.launch.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabDataSource;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabWidgetListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class AdvancedMPICH2RMLaunchConfigurationDynamicTab extends
-AbstractRMLaunchConfigurationDynamicTab {
-
-	Composite control;
-	Button useArgsDefaultsButton;
-	Text argsText;
-
-	class WidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener
-	implements ICheckStateListener {
-		public WidgetListener(AbstractRMLaunchConfigurationDynamicTab dynamicTab) {
-			super(dynamicTab);
-		}
-
-		@Override
-		protected void doWidgetSelected(SelectionEvent e) {
-			super.doWidgetSelected(e);
-		}
-
-		public void checkStateChanged(CheckStateChangedEvent event) {
-			// do nothing
-		}
-	}
-
-	class DataSource extends RMLaunchConfigurationDynamicTabDataSource {
-		private boolean useDefArgs;
-		private String args;
-
-		protected DataSource(AbstractRMLaunchConfigurationDynamicTab page) {
-			super(page);
-		}
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			useDefArgs = useArgsDefaultsButton.getSelection();
-			args = extractText(argsText);
-		}
-
-		@Override
-		protected void copyToFields() {
-			applyText(argsText, args);
-			useArgsDefaultsButton.setSelection(useDefArgs);
-		}
-
-		@Override
-		protected void copyToStorage() {
-			getConfigurationWorkingCopy().setAttribute(
-					MPICH2LaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
-					useDefArgs);
-			getConfigurationWorkingCopy().setAttribute(
-					MPICH2LaunchConfiguration.ATTR_ARGUMENTS, args);
-		}
-
-		@Override
-		protected void loadDefault() {
-			args = MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS;
-			useDefArgs = MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS;
-
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			try {
-				args = getConfiguration().getAttribute(
-						MPICH2LaunchConfiguration.ATTR_ARGUMENTS,
-						MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS);
-				useDefArgs = getConfiguration()
-				.getAttribute(
-						MPICH2LaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
-						MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS);
-			} catch (CoreException e) {
-				// TODO handle exception?
-				MPICH2UIPlugin.log(e);
-			}
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			if (!useDefArgs && args == null) {
-				throw new ValidationException(
-						Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyArguments);
-			}
-		}
-
-		/**
-		 * Convert a comma separated list into one host per line
-		 * 
-		 * @param list
-		 * @return
-		 */
-		private String hostListToText(String list) {
-			if (list == null)
-				return ""; //$NON-NLS-1$
-			String result = ""; //$NON-NLS-1$
-			String[] values = list.split(","); //$NON-NLS-1$
-			for (int i = 0; i < values.length; i++) {
-				if (!values[i].equals("")) { //$NON-NLS-1$
-					if (i > 0) {
-						result += "\r"; //$NON-NLS-1$
-					}
-					result += values[i];
-				}
-			}
-			return result;
-		}
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabWidgetListener createListener() {
-		return new WidgetListener(this);
-	}
-
-	@Override
-	public Image getImage() {
-		return null;
-	}
-
-	@Override
-	public String getText() {
-		return Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Title;
-	}
-
-	public void createControl(Composite parent, IResourceManager rm,
-			IPQueue queue) throws CoreException {
-		control = new Composite(parent, SWT.NONE);
-		control.setLayout(new GridLayout());
-
-		final Group argumentsGroup = new Group(control, SWT.NONE);
-		argumentsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true,
-				false));
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		argumentsGroup.setLayout(layout);
-		argumentsGroup
-		.setText(Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_LaunchArguments);
-
-		useArgsDefaultsButton = new Button(argumentsGroup, SWT.CHECK);
-		useArgsDefaultsButton
-		.setText(Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultArguments);
-		// useArgsDefaultsButton.setSelection(true);
-		GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
-		useArgsDefaultsButton.setLayoutData(gd);
-		useArgsDefaultsButton.addSelectionListener(getListener());
-
-		Label label = new Label(argumentsGroup, SWT.NONE);
-		label.setLayoutData(new GridData());
-		label
-		.setText(Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_Arguments);
-
-		argsText = new Text(argumentsGroup, SWT.BORDER);
-		argsText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-	}
-
-	public IAttribute<?, ?, ?>[] getAttributes(IResourceManager rm,
-			IPQueue queue, ILaunchConfiguration configuration, String mode)
-			throws CoreException {
-		return null;
-	}
-
-	public Control getControl() {
-		return control;
-	}
-
-	public RMLaunchValidation setDefaults(
-			ILaunchConfigurationWorkingCopy configuration, IResourceManager rm,
-			IPQueue queue) {
-		configuration.setAttribute(
-				MPICH2LaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
-				MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_ARGUMENTS,
-				MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS);
-		return new RMLaunchValidation(true, null);
-	}
-
-	@Override
-	public void updateControls() {
-		argsText.setEnabled(!useArgsDefaultsButton.getSelection());
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index ea739cb..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2LaunchAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.launch.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabDataSource;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabWidgetListener;
-import org.eclipse.ptp.utils.ui.PixelConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class BasicMPICH2RMLaunchConfigurationDynamicTab extends AbstractRMLaunchConfigurationDynamicTab {
-
-	Composite control;
-	Spinner numProcsSpinner;
-	Button noLocalButton;
-	Button usePrefixButton;
-	Text prefixText;
-	Text hostFileText;
-	Button hostFileButton;
-	Text hostListText;
-	Button hostListButton;
-	Button browseButton;
-
-	class WidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener {
-		public WidgetListener(AbstractRMLaunchConfigurationDynamicTab dynamicTab) {
-			super(dynamicTab);
-		}
-
-		@Override
-		protected void doModifyText(ModifyEvent e) {
-			if (e.getSource() == numProcsSpinner || e.getSource() == prefixText || e.getSource() == hostFileText || e.getSource() == hostListText) {
-				//				getDataSource().justValidate();
-			} else{
-				super.doModifyText(e);
-			}
-		}
-
-		@Override
-		protected void doWidgetSelected(SelectionEvent e) {
-			if (e.getSource() == noLocalButton || e.getSource() == usePrefixButton) {
-				//				getDataSource().justValidate();
-			} else if (e.getSource() == usePrefixButton || e.getSource() == hostFileButton || e.getSource() == hostListButton) {
-				//				getDataSource().justValidate();
-				updateControls();
-			} else {
-				super.doWidgetSelected(e);
-			}
-		}
-	}
-
-	class DataSource extends RMLaunchConfigurationDynamicTabDataSource {
-
-		private int numProcs;
-		private boolean noLocal;
-		private boolean usePrefix;
-		private String prefix;
-		private boolean useHostFile;
-		private String hostFile;
-		private boolean useHostList;
-		private String hostList;
-
-		protected DataSource(AbstractRMLaunchConfigurationDynamicTab page) {
-			super(page);
-		}
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			numProcs = numProcsSpinner.getSelection();
-			noLocal = noLocalButton.getSelection();
-			usePrefix = usePrefixButton.getSelection();
-			prefix = extractText(prefixText);
-			useHostFile = hostFileButton.getSelection();
-			hostFile = extractText(hostFileText);
-			useHostList = hostListButton.getSelection();
-			hostList = extractText(hostListText);
-		}
-
-		@Override
-		protected void copyToFields() {
-			numProcsSpinner.setSelection(numProcs);
-			noLocalButton.setSelection(noLocal);
-			usePrefixButton.setSelection(usePrefix);
-			applyText(prefixText, prefix);
-			applyText(hostFileText, hostFile);
-			hostFileButton.setSelection(useHostFile);
-			applyText(hostListText, hostListToText(hostList));
-			hostListButton.setSelection(useHostList);
-		}
-
-		@Override
-		protected void copyToStorage() {
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, numProcs);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_NOLOCAL, noLocal);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_USEPREFIX, usePrefix);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_PREFIX, prefix);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTFILE, useHostFile);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTFILE, hostFile);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTLIST, useHostList);
-			getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTLIST, hostList);
-		}
-
-		@Override
-		protected void loadDefault() {
-			numProcs = MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS;
-			noLocal = MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL;
-			usePrefix = MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX;
-			prefix = MPICH2LaunchConfigurationDefaults.ATTR_PREFIX;
-			hostFile = MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE;
-			useHostFile = MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE;
-			hostList = MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST;
-			useHostList = MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST;
-
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			try {
-				numProcs = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS);
-				noLocal = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_NOLOCAL, MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL);
-				usePrefix = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_USEPREFIX, MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX);
-				prefix = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_PREFIX, MPICH2LaunchConfigurationDefaults.ATTR_PREFIX);
-				hostFile = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_HOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE);
-				useHostFile = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE);
-				hostList = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_HOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST);
-				useHostList = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST);
-			} catch (CoreException e) {
-				// TODO handle exception?
-				MPICH2UIPlugin.log(e);
-			}
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			if (numProcs < 1) {
-				throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_NoProcess);
-			}
-			if (usePrefix && prefix == null) {
-				throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyPrefix);
-			}
-			if (useHostFile && hostFile == null) {
-				throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostfile);
-			}
-			if (useHostList && hostList == null) {
-				throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostList);
-			}
-		}
-
-		/**
-		 * Convert a comma separated list into one host per line
-		 *
-		 * @param list
-		 * @return
-		 */
-		private String hostListToText(String list) {
-			if (list == null) {
-				return ""; //$NON-NLS-1$
-			}
-			String result = ""; //$NON-NLS-1$
-			String[] values = list.split(","); //$NON-NLS-1$
-			for (int i = 0; i < values.length; i++) {
-				if (!values[i].equals("")) { //$NON-NLS-1$
-					if (i > 0) {
-						result += "\r"; //$NON-NLS-1$
-					}
-					result += values[i];
-				}
-			}
-			return result;
-		}
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-	@Override
-	protected RMLaunchConfigurationDynamicTabWidgetListener createListener() {
-		return new WidgetListener(this);
-	}
-
-	@Override
-	public Image getImage() {
-		return null;
-	}
-
-	@Override
-	public String getText() {
-		return Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title;
-	}
-
-	public void createControl(Composite parent, IResourceManager rm, IPQueue queue) throws CoreException {
-		control = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		control.setLayout(layout);
-
-		Label label  = new Label(control, SWT.NONE);
-		label.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NumberProcesses);
-
-		numProcsSpinner = new Spinner(control, SWT.BORDER);
-		numProcsSpinner.addModifyListener(getListener());
-		numProcsSpinner.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
-
-		final Group optionsGroup = new Group(control, SWT.NONE);
-		optionsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
-		optionsGroup.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title_OptionsGroup);
-		layout = new GridLayout();
-		layout.numColumns = 3;
-		optionsGroup.setLayout(layout);
-
-		noLocalButton = new Button(optionsGroup, SWT.CHECK);
-		noLocalButton.addSelectionListener(getListener());
-		noLocalButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoLocal);
-
-		usePrefixButton = new Button(optionsGroup, SWT.CHECK);
-		usePrefixButton.addSelectionListener(getListener());
-		usePrefixButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Prefix);
-
-		prefixText = new Text(optionsGroup, SWT.BORDER);
-		prefixText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
-		prefixText.addModifyListener(getListener());
-
-		final Group hostGroup = new Group(control, SWT.NONE);
-		hostGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-		hostGroup.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostGroup);
-		layout = new GridLayout();
-		layout.numColumns = 3;
-		hostGroup.setLayout(layout);
-
-		hostFileButton = new Button(hostGroup, SWT.CHECK);
-		hostFileButton.addSelectionListener(getListener());
-		hostFileButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_HostFile);
-
-		hostFileText = new Text(hostGroup, SWT.BORDER);
-		hostFileText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-		hostFileText.addModifyListener(getListener());
-
-		browseButton = new Button(hostGroup, SWT.NONE);
-		browseButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
-		browseButton.addSelectionListener(getListener());
-		PixelConverter pixelconverter = new PixelConverter(control);
-		GridData gd = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
-		gd.widthHint = pixelconverter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-		browseButton.setLayoutData(gd);
-		browseButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Browse);
-
-		hostListButton = new Button(hostGroup, SWT.CHECK);
-		hostListButton.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
-		hostListButton.addSelectionListener(getListener());
-		hostListButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostList);
-
-		hostListText = new Text(hostGroup, SWT.V_SCROLL | SWT.BORDER);
-		gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
-		gd.heightHint = 20;
-		hostListText.setLayoutData(gd);
-		hostListText.addModifyListener(getListener());
-	}
-
-	public IAttribute<?, ?, ?>[] getAttributes(IResourceManager rm,
-			IPQueue queue, ILaunchConfiguration configuration, String mode)
-			throws CoreException {
-
-		List<IAttribute<?,?,?>> attrs = new ArrayList<IAttribute<?,?,?>>();
-
-		int numProcs = configuration.getAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS);
-		try {
-			attrs.add(JobAttributes.getNumberOfProcessesAttributeDefinition().create(numProcs));
-		} catch (IllegalValueException e) {
-			throw new CoreException(new Status(IStatus.ERROR, MPICH2UIPlugin.getDefault().getBundle().getSymbolicName(), Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration, e));
-		}
-
-		attrs.add(MPICH2LaunchAttributes.getLaunchArgumentsAttributeDefinition().create(MPICH2LaunchConfiguration.calculateArguments(configuration)));
-
-		return attrs.toArray(new IAttribute<?,?,?>[attrs.size()]);
-	}
-
-	public Control getControl() {
-		return control;
-	}
-
-	public RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy configuration,
-			IResourceManager rm, IPQueue queue) {
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_NOLOCAL, MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_USEPREFIX, MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_PREFIX, MPICH2LaunchConfigurationDefaults.ATTR_PREFIX);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST);
-		configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST);
-		return new RMLaunchValidation(true, null);
-	}
-
-	@Override
-	public void updateControls() {
-		prefixText.setEnabled(usePrefixButton.getSelection());
-		browseButton.setEnabled(hostFileButton.getSelection());
-		hostFileText.setEnabled(hostFileButton.getSelection());
-		hostListText.setEnabled(hostListButton.getSelection());
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java
deleted file mode 100644
index f0b325d..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2LaunchConfiguration {
-	public static final String ATTR_BASE = MPICH2UIPlugin.PLUGIN_ID + ".launchAttributes"; //$NON-NLS-1$
-	public static final String ATTR_NUMPROCS = ATTR_BASE + ".numProcs"; //$NON-NLS-1$
-	public static final String ATTR_NOLOCAL = ATTR_BASE + ".noLocal"; //$NON-NLS-1$
-	public static final String ATTR_PREFIX = ATTR_BASE + ".prefix"; //$NON-NLS-1$
-	public static final String ATTR_USEPREFIX = ATTR_BASE + ".usePrefix"; //$NON-NLS-1$
-	public static final String ATTR_HOSTFILE = ATTR_BASE + ".hostFile"; //$NON-NLS-1$
-	public static final String ATTR_USEHOSTFILE = ATTR_BASE + ".useHostFile"; //$NON-NLS-1$
-	public static final String ATTR_HOSTLIST = ATTR_BASE + ".hostList"; //$NON-NLS-1$
-	public static final String ATTR_USEHOSTLIST = ATTR_BASE + ".useHostList"; //$NON-NLS-1$
-	public static final String ATTR_ARGUMENTS = ATTR_BASE + ".arguments"; //$NON-NLS-1$
-	public static final String ATTR_USEDEFAULTARGUMENTS = ATTR_BASE + ".useDefaultArguments"; //$NON-NLS-1$
-	public static final String ATTR_PARAMETERS = ATTR_BASE + ".parameters"; //$NON-NLS-1$
-	public static final String ATTR_USEDEFAULTPARAMETERS = ATTR_BASE + ".useDefaultParameters"; //$NON-NLS-1$
-
-	static String calculateArguments(ILaunchConfiguration configuration) throws CoreException {
-		if (configuration.getAttribute(ATTR_USEDEFAULTARGUMENTS, MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS)) {
-			String launchArgs = "-np " + Integer.toString(configuration.getAttribute(ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS)); //$NON-NLS-1$
-			if (configuration.getAttribute(ATTR_NOLOCAL, MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL)) {
-				launchArgs += " -nolocal"; //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_USEPREFIX, MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX)) {
-				launchArgs += " --prefix " + fixString(configuration.getAttribute(ATTR_PREFIX, MPICH2LaunchConfigurationDefaults.ATTR_PREFIX)); //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_USEHOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE)) {
-				launchArgs += " -hostfile " + fixString(configuration.getAttribute(ATTR_HOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE)); //$NON-NLS-1$
-			}
-			if (configuration.getAttribute(ATTR_USEHOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST)) {
-				launchArgs += " -host " + fixString(configuration.getAttribute(ATTR_HOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST)); //$NON-NLS-1$
-			}
-
-			if (! configuration.getAttribute(ATTR_USEDEFAULTPARAMETERS, MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTPARAMETERS)) {
-				Map<String, String> params = configuration.getAttribute(ATTR_PARAMETERS, MPICH2LaunchConfigurationDefaults.ATTR_PARAMETERS);
-				for (Entry<String, String> param : params.entrySet()) {
-					launchArgs += " -mca " + param.getKey() + " " + fixString(param.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-			}
-			return launchArgs;
-		} else {
-			String launchArgs = configuration.getAttribute(ATTR_ARGUMENTS, MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS);
-			return launchArgs;
-		}
-	}
-
-	/**
-	 * Make string suitable for passing as an argument
-	 *
-	 * @param s
-	 * @return
-	 */
-	static private String fixString(String s) {
-		// TODO is that right and escaped correctly?
-		if (s == null) {
-			return "\"\""; //$NON-NLS-1$
-		}
-		return "\"" + s + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java
deleted file mode 100644
index 71c12be..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.osgi.framework.Bundle;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2LaunchConfigurationDefaults {
-	public static int ATTR_NUMPROCS;
-	public static boolean ATTR_NOLOCAL;
-	public static String ATTR_PREFIX;
-	public static boolean ATTR_USEPREFIX;
-	public static String ATTR_HOSTFILE;
-	public static boolean ATTR_USEHOSTFILE;
-	public static String ATTR_HOSTLIST;
-	public static boolean ATTR_USEHOSTLIST;
-	public static String ATTR_ARGUMENTS;
-	public static boolean ATTR_USEDEFAULTARGUMENTS;
-	public static HashMap<String, String> ATTR_PARAMETERS = new HashMap<String, String>();
-	public static boolean ATTR_USEDEFAULTPARAMETERS;
-
-	private static String defaultsResourcePath = "/data/launch-defaults.properties"; //$NON-NLS-1$
-
-	public static void loadDefaults() throws CoreException {
-		Path defaultsPropertiesPath = new Path(defaultsResourcePath);
-		Bundle bundle = MPICH2UIPlugin.getDefault().getBundle();
-		Properties properties = read(defaultsPropertiesPath, bundle);
-
-		ATTR_NUMPROCS = getInteger(bundle, properties, "NUMPROCS"); //$NON-NLS-1$
-		ATTR_NOLOCAL = getBoolean(bundle, properties, "NOLOCAL"); //$NON-NLS-1$
-		ATTR_PREFIX = getString(bundle, properties, "PREFIX"); //$NON-NLS-1$
-		ATTR_USEPREFIX = getBoolean(bundle, properties, "USEPREFIX"); //$NON-NLS-1$
-		ATTR_HOSTFILE = getString(bundle, properties, "HOSTFILE"); //$NON-NLS-1$
-		ATTR_USEHOSTFILE = getBoolean(bundle, properties, "USEHOSTFILE"); //$NON-NLS-1$
-		ATTR_ARGUMENTS = getString(bundle, properties, "ARGUMENTS"); //$NON-NLS-1$
-		ATTR_USEDEFAULTARGUMENTS = getBoolean(bundle, properties, "USEDEFAULTARGUMENTS"); //$NON-NLS-1$
-		ATTR_USEDEFAULTPARAMETERS = getBoolean(bundle, properties, "USEDEFAULTPARAMETERS"); //$NON-NLS-1$
-
-		assert ATTR_PREFIX != null;
-		assert ATTR_HOSTFILE != null;
-		assert ATTR_ARGUMENTS != null;
-		// TODO: read ATTR_PARAMETERS
-	}
-
-	public static Properties read(Path defaultsPropertiesPath, Bundle bundle)
-	throws CoreException {
-		InputStream inStream;
-		Properties properties = new Properties();
-		try {
-			inStream = FileLocator.openStream(bundle, defaultsPropertiesPath, false);
-			properties.load(inStream);
-		} catch (IOException e) {
-			throw MPICH2UIPlugin.coreErrorException(Messages.MPICH2LaunchConfigurationDefaults_Exception_FailedReadFile, e);
-		}
-		return properties;
-	}
-
-	public static String getString(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = properties.getProperty(key);
-		if (value == null) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2LaunchConfigurationDefaults_MissingValue, key)));
-		}
-		return value;
-	}
-
-	public static int getInteger(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		try {
-			return Integer.parseInt(value);
-		} catch (NumberFormatException e) {
-			throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2LaunchConfigurationDefaults_FailedParseInteger, key)));
-		}
-	}
-
-	public static boolean getBoolean(Bundle bundle, Properties properties, String key) throws CoreException {
-		String value = getString(bundle, properties, key);
-		return Boolean.parseBoolean(value);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java
deleted file mode 100644
index 13bab6a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManager;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2RMLaunchConfigurationFactory extends AbstractRMLaunchConfigurationFactory {
-
-	@Override
-	protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm) throws CoreException {
-		return new NewMPICH2RMLaunchConfigurationDynamicTab(rm);
-	}
-
-	@Override
-	public Class<? extends IResourceManager> getResourceManagerClass() {
-		return MPICH2ResourceManager.class;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 0aa4bde..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.rm.ui.launch.ExtendableRMLaunchConfigurationDynamicTab;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class NewMPICH2RMLaunchConfigurationDynamicTab extends ExtendableRMLaunchConfigurationDynamicTab {
-
-	public NewMPICH2RMLaunchConfigurationDynamicTab(IResourceManager rm) {
-		super();
-		addDynamicTab(new BasicMPICH2RMLaunchConfigurationDynamicTab());
-		addDynamicTab(new AdvancedMPICH2RMLaunchConfigurationDynamicTab());
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java
deleted file mode 100644
index 35c8a55..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.mpi.mpich2.ui.messages.messages"; //$NON-NLS-1$
-	public static String MPICH2UIPlugin_Exception_InternalError;
-	
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_Arguments;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultArguments;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultMCAParameters;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_LaunchArguments;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_MCAParameters;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_PArameterTable_Column_Name;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_ParameterTable_Column_Value;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Title;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyArguments;
-	public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyParameter;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Browse;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_BySlot;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_HostFile;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoLocal;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoOversubscribe;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NumberProcesses;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Prefix;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostGroup;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostList;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title_OptionsGroup;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostfile;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostList;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyPrefix;
-	public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_NoProcess;
-	public static String MPICH2LaunchConfigurationDefaults_Exception_FailedReadFile;
-	public static String MPICH2LaunchConfigurationDefaults_FailedParseInteger;
-	public static String MPICH2LaunchConfigurationDefaults_MissingValue;
-	
-	public static String MPICH2PreferencePage_Title;
-
-	public static String MPICH2ConfigurationWizardPage_Description;
-	public static String MPICH2ConfigurationWizardPage_Label_Version;
-	public static String MPICH2ConfigurationWizardPage_Name;
-	public static String MPICH2ConfigurationWizardPage_Title;
-	public static String MPICH2ConfigurationWizardPage_Validation_NoVersionSelected;
-	public static String MPICH2ConfigurationWizardPage_VersionCombo_Version12;
-	public static String MPICH2ConfigurationWizardPage_VersionCombo_Version13;
-	public static String MPICH2RMConfigurationWizardPage_Description;
-	public static String MPICH2RMConfigurationWizardPage_Title;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-		// Prevent instances.
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties
deleted file mode 100644
index 7867ffa..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-MPICH2UIPlugin_Exception_InternalError=Internal error
-
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_Arguments=Arguments:
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultArguments=Use default arguments
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultMCAParameters=Use default parameters
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_LaunchArguments=Launch arguments
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_MCAParameters=MCA Parameters
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_PArameterTable_Column_Name=Name
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_ParameterTable_Column_Value=Value
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Title=Advanced MPICH2
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyArguments=Arguments cannot be empty
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyParameter=Parameter value cannot be empty
-BasicMPICH2RMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration=Invalid configuration
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Browse=Browse
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_BySlot=By slot
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_HostFile=Host file:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoLocal=No local
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoOversubscribe=No oversubscribe
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NumberProcesses=Number of processes:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Prefix=Prefix:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title=Basic MPICH2
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostGroup=Hosts
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostList=Host list:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title_OptionsGroup=Options
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostfile=Must provide a host file
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostList=Must provide at least one host name
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyPrefix=Prefix cannot be empty
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_NoProcess=Must specify at least one process
-MPICH2LaunchConfigurationDefaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-MPICH2LaunchConfigurationDefaults_FailedParseInteger=Failed to parse integer default value for {0}
-MPICH2LaunchConfigurationDefaults_MissingValue=Missing default value for {0}
-
-MPICH2PreferencePage_Title=MPICH2 preferences
-
-MPICH2ConfigurationWizardPage_Description=Enter information to configure the MPICH2 tool
-MPICH2ConfigurationWizardPage_Label_Version=MPICH2 version:
-MPICH2ConfigurationWizardPage_Name=MPICH2
-MPICH2ConfigurationWizardPage_Title=MPICH2 tool configuration
-MPICH2ConfigurationWizardPage_Validation_NoVersionSelected=No MPICH2 version selected
-MPICH2ConfigurationWizardPage_VersionCombo_Version12=MPICH2
-MPICH2ConfigurationWizardPage_VersionCombo_Version13=MPICH2
-MPICH2RMConfigurationWizardPage_Description=Enter MPICH2 connection information
-MPICH2RMConfigurationWizardPage_Title=MPICH2 connection configuration
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java
deleted file mode 100644
index 75bf9a2..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.wizards;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2PreferenceManager;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.IMPICH2ResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.wizards.AbstractConfigurationWizardPage;
-import org.eclipse.ptp.rm.ui.wizards.AbstractToolRMConfigurationWizardPage;
-import org.eclipse.ptp.rm.ui.wizards.WizardPageDataSource;
-import org.eclipse.ptp.rm.ui.wizards.WizardPageWidgetListener;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ConfigurationWizardPage extends AbstractToolRMConfigurationWizardPage {
-
-	String versionIds[] = new String[] { };
-	String versionsNames[] = new String[] { Messages.MPICH2ConfigurationWizardPage_VersionCombo_Version12, Messages.MPICH2ConfigurationWizardPage_VersionCombo_Version13};
-
-	protected Combo versionCombo;
-
-	protected class WidgetListener extends AbstractToolRMConfigurationWizardPage.WidgetListener {
-		@Override
-		protected void doModifyText(ModifyEvent evt) {
-			super.doModifyText(evt);
-		}
-
-		@Override
-		public void doWidgetSelected(SelectionEvent e) {
-			Object source = e.getSource();
-			if (source == versionCombo) {
-				handleVersionSelected();
-				updateControls();
-				getDataSource().storeAndValidate();
-			} else {
-				super.doWidgetSelected(e);
-			}
-		}
-	}
-
-	protected class DataSource extends AbstractToolRMConfigurationWizardPage.DataSource {
-		protected DataSource(AbstractConfigurationWizardPage page) {
-			super(page);
-		}
-
-		private IMPICH2ResourceManagerConfiguration config;
-
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			super.copyFromFields();
-		}
-
-		@Override
-		protected void copyToFields() {
-			super.copyToFields();
-		}
-
-		@Override
-		protected void loadFromStorage() {
-			super.loadFromStorage();
-		}
-
-		@Override
-		protected void copyToStorage() {
-			super.copyToStorage();
-		}
-
-		@Override
-		protected void validateLocal() throws ValidationException {
-			super.validateLocal();
-		}
-
-
-		@Override
-		public void setConfig(IResourceManagerConfiguration configuration) {
-			this.config = (IMPICH2ResourceManagerConfiguration) configuration;
-			super.setConfig(configuration);
-		}
-	}
-
-	@Override
-	protected WizardPageWidgetListener createListener() {
-		return new WidgetListener();
-	}
-
-	@Override
-	protected WizardPageDataSource createDataSource() {
-		return new DataSource(this);
-	}
-
-	public MPICH2ConfigurationWizardPage(IRMConfigurationWizard wizard) {
-		super(wizard, IMPICH2ResourceManagerConfiguration.MPICH2_CAPABILITIES, 
-				Messages.MPICH2ConfigurationWizardPage_Name, 
-				Messages.MPICH2ConfigurationWizardPage_Title, 
-				Messages.MPICH2ConfigurationWizardPage_Description);
-	}
-
-	@Override
-	protected Composite doCreateContents(Composite parent) {
-		Composite contents = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginBottom = 0;
-		layout.marginTop = 0;
-		layout.marginRight = 0;
-		layout.marginLeft = 0;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		contents.setLayout(layout);
-
-		createContents(contents);
-
-		return contents;
-	}
-
-	protected void createVersionContents(Composite parent) {
-		Composite contents = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		contents.setLayout(layout);
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		contents.setLayoutData(gd);
-
-		/*
-		 * Selection for openmpi version.
-		 */
-
-		Label label = new Label(contents, SWT.NONE);
-		label.setText(Messages.MPICH2ConfigurationWizardPage_Label_Version);
-
-		versionCombo = new Combo(contents, SWT.DROP_DOWN | SWT.READ_ONLY);
-		for (int i = 0; i < versionsNames.length; i++) {
-			versionCombo.add(versionsNames[i]);
-		}
-		versionCombo.addSelectionListener(getWidgetListener());
-	}
-
-	public void handleVersionSelected() {
-		getWidgetListener().disable();
-		DataSource dataSource = (DataSource) this.getDataSource();
-		dataSource.justValidate();
-		String launchCmd = null;
-		String debugCmd = null;
-		String discoverCmd = null;
-		String remoteInstallPath = null;
-		Preferences preferences = MPICH2PreferenceManager.getPreferences();
-		launchCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_LAUNCH_CMD);
-		debugCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DEBUG_CMD);
-		discoverCmd = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DISCOVER_CMD);
-		remoteInstallPath = preferences.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_REMOTE_INSTALL_PATH);
-		resetErrorMessages();
-		dataSource.setCommandFields(launchCmd, debugCmd, discoverCmd, null, 0, null, dataSource.getRemoteInstallPath());
-		dataSource.setUseDefaults(true);
-		dataSource.copyToFields();
-		getWidgetListener().enable();
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPage.java
deleted file mode 100644
index 36f87a3..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPage.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.wizards;
-
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.remote.ui.wizards.AbstractRemoteResourceManagerConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;
-
-/**
- * 
- * @author Daniel Felix Ferber
- * 
- */
-public final class MPICH2RMConfigurationWizardPage extends AbstractRemoteResourceManagerConfigurationWizardPage {
-
-	public MPICH2RMConfigurationWizardPage(IRMConfigurationWizard wizard) {
-		super(wizard, Messages.MPICH2RMConfigurationWizardPage_Title);
-		setTitle(Messages.MPICH2RMConfigurationWizardPage_Title);
-		setDescription(Messages.MPICH2RMConfigurationWizardPage_Description);
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java
deleted file mode 100644
index 092595f..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-
-
-/**
- * 
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2RMConfigurationWizardPageFactory extends RMConfigurationWizardPageFactory {
-
-	public MPICH2RMConfigurationWizardPageFactory() {
-		// no-op
-	}
-
-	protected RMConfigurationWizardPage[] getMPICH2ConfigurationWizardPages(IRMConfigurationWizard wizard) {
-		return new RMConfigurationWizardPage[] {
-				new MPICH2ConfigurationWizardPage(wizard)
-		};
-	}
-
-	//	@Override
-	@Override
-	public RMConfigurationWizardPage[] getPages(IRMConfigurationWizard wizard) {
-		List<RMConfigurationWizardPage> list = new ArrayList<RMConfigurationWizardPage>();
-		list.add(new MPICH2RMConfigurationWizardPage(wizard));
-		list.addAll(Arrays.asList(getMPICH2ConfigurationWizardPages(wizard)));
-		return list.toArray(new RMConfigurationWizardPage[list.size()]);
-	}
-
-	//	@Override
-	@Override
-	public Class<? extends IResourceManagerFactory> getRMFactoryClass() {
-		return MPICH2ResourceManagerFactory.class;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMServiceProviderConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMServiceProviderConfigurationWizardPageFactory.java
deleted file mode 100644
index e104fe5..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMServiceProviderConfigurationWizardPageFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2RMServiceProviderFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-
-
-/**
- * This class is only used to bridge between the old RM factory wizard and the new RMs backed
- * by service configurations. It will be removed prior to the 3.0 release.
- * 
- * @author greg
- *
- */
-public class MPICH2RMServiceProviderConfigurationWizardPageFactory extends RMConfigurationWizardPageFactory {
-
-	public MPICH2RMServiceProviderConfigurationWizardPageFactory() {
-		// no-op
-	}
-
-	protected RMConfigurationWizardPage[] getMPICH2ConfigurationWizardPages(IRMConfigurationWizard wizard) {
-		return new RMConfigurationWizardPage[] {
-				new MPICH2ConfigurationWizardPage(wizard)
-		};
-	}
-
-	@Override
-	public RMConfigurationWizardPage[] getPages(IRMConfigurationWizard wizard) {
-		List<RMConfigurationWizardPage> list = new ArrayList<RMConfigurationWizardPage>();
-		list.add(new MPICH2RMConfigurationWizardPage(wizard));
-		list.addAll(Arrays.asList(getMPICH2ConfigurationWizardPages(wizard)));
-		return list.toArray(new RMConfigurationWizardPage[list.size()]);
-	}
-
-	@Override
-	public Class<? extends IResourceManagerFactory> getRMFactoryClass() {
-		return MPICH2RMServiceProviderFactory.class;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/.classpath b/rms/org.eclipse.ptp.rm.slurm.core/.classpath
deleted file mode 100644
index 0215967..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/.project b/rms/org.eclipse.ptp.rm.slurm.core/.project
deleted file mode 100644
index 9161cc5..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.ptp.rm.slurm.core</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.slurm.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 0ed2620..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.ptp.rm.slurm.core;singleton:=true

-Bundle-Version: 2.1.0.qualifier

-Bundle-Activator: org.eclipse.ptp.rm.slurm.core.Activator

-Bundle-Vendor: %pluginProvider

-Bundle-Localization: plugin

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.search,

- org.eclipse.ui,

- org.eclipse.debug.core,

- org.eclipse.ptp.proxy.protocol,

- org.eclipse.ptp.core,

- org.eclipse.ptp.rm.remote,

- org.eclipse.ptp.remote.core;bundle-version="2.1.0"

-Eclipse-LazyStart: true

-Export-Package: org.eclipse.ptp.rm.slurm.core,

- org.eclipse.ptp.rm.slurm.core.rmsystem

-Import-Package: org.eclipse.ptp.remote.core

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/about.html b/rms/org.eclipse.ptp.rm.slurm.core/about.html
deleted file mode 100644
index 3106f3a..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<title>About</title>

-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>Apri 14, 2009</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation 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

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>

-

-</body>

-</html>
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/build.properties b/rms/org.eclipse.ptp.rm.slurm.core/build.properties
deleted file mode 100644
index 6f20375..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/plugin.properties b/rms/org.eclipse.ptp.rm.slurm.core/plugin.properties
deleted file mode 100644
index 616d7d0..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP SLURM Core
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/plugin.xml b/rms/org.eclipse.ptp.rm.slurm.core/plugin.xml
deleted file mode 100644
index fdd79e3..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

-   <extension

-         point="org.eclipse.ptp.core.resourceManagers">

-      <resourceManager

-            class="org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManagerFactory"

-            id="org.eclipse.ptp.slurm.core.resourcemanager"

-            name="SLURM"/>

-   </extension>

-

-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/Activator.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/Activator.java
deleted file mode 100644
index 42fff23..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.ptp.rm.slurm.core;

-

-import org.eclipse.core.runtime.Plugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends Plugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.slurm.core";

-

-	// The shared instance

-	private static Activator plugin;

-	

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-}

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMAttributes.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMAttributes.java
deleted file mode 100644
index 371c902..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMAttributes.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse.ptp.rm.slurm.core;

-

-public class SLURMAttributes {

-

-}

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMJobAttributes.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMJobAttributes.java
deleted file mode 100644
index cb5306e..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMJobAttributes.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.core;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.rm.slurm.core.messages.Messages;
-
-
-/**
- * Job attributes
- */
-public class SLURMJobAttributes {
-	private static final String NUM_NODES_ATTR_ID = "numberOfNodes"; //$NON-NLS-1$
-	private static final String TIME_LIMIT_ATTR_ID = "timeLimit"; //$NON-NLS-1$
-
-	private final static IntegerAttributeDefinition numNodesAttrDef = 
-		new IntegerAttributeDefinition(NUM_NODES_ATTR_ID, "Nodes",  //$NON-NLS-1$
-				Messages.SLURMJobAttributes_0, true, 1);
-
-	private final static IntegerAttributeDefinition timeLimitAttrDef = 
-		new IntegerAttributeDefinition(TIME_LIMIT_ATTR_ID, "TimeLimit",  //$NON-NLS-1$
-				Messages.SLURMJobAttributes_1, true, 1);
-
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return new IAttributeDefinition[]{
-				numNodesAttrDef,
-				timeLimitAttrDef,
-			};
-	}
-
-	public static IntegerAttributeDefinition getNumberOfNodesAttributeDefinition() {
-		return numNodesAttrDef;
-	}
-
-	public static IntegerAttributeDefinition getTimeLimitAttributeDefinition() {
-		return timeLimitAttrDef;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMPreferenceManager.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMPreferenceManager.java
deleted file mode 100644
index 1ee1c40..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMPreferenceManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.core;

-

-import org.eclipse.core.runtime.Path;

-import org.eclipse.core.runtime.Preferences;

-import org.eclipse.ptp.core.PTPCorePlugin;

-import org.eclipse.ptp.remote.core.IRemoteProxyOptions;

-import org.eclipse.ptp.rm.remote.ui.preferences.PreferenceConstants;

-

-public class SLURMPreferenceManager {

-	//private static final String PROXY_EXECUTABLE_NAME = "ptp_slurm_proxy.py";

-	private static final String PROXY_EXECUTABLE_PATH = null; // use local fragment directory

-	private static final int OPTIONS = IRemoteProxyOptions.PORT_FORWARDING;

-	

-	public static int getDefaultOptions() {

-		return OPTIONS;

-	}

-

-	public static String getDefaultProxyExecutablePath() {

-		return PROXY_EXECUTABLE_PATH;

-	}

-

-	public static Preferences getPreferences() {

-		return Activator.getDefault().getPluginPreferences();

-	}

-	

-	public static void savePreferences() {

-		Activator.getDefault().savePluginPreferences();

-	}

-	

-	public static void initializePreferences() {

-		Preferences preferences = Activator.getDefault().getPluginPreferences();

-		

-		String server = "";

-			

-		if (PROXY_EXECUTABLE_PATH != null) {

-			//server = new Path(PROXY_EXECUTABLE_PATH).append(PROXY_EXECUTABLE_NAME).toOSString();

-		} else {

-			//server = PTPCorePlugin.getDefault().locateFragmentFile("org.eclipse.ptp", PROXY_EXECUTABLE_NAME);

-			if (server == null) {

-				server = "";

-			}

-       }

-		

-		preferences.setDefault(PreferenceConstants.PROXY_PATH, server);

-		preferences.setDefault(PreferenceConstants.OPTIONS, OPTIONS);

-	}

-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/Messages.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/Messages.java
deleted file mode 100644
index fe689b5..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.core.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.slurm.core.messages.messages"; //$NON-NLS-1$

-

-	public static String SLURMJobAttributes_0;

-	public static String SLURMJobAttributes_1;

-	

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-		// Prevent instances.

-	}

-}

-

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/messages.properties b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/messages.properties
deleted file mode 100644
index 41e8690..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-SLURMJobAttributes_0=Number of Nodes

-SLURMJobAttributes_1=Job Time Limit

-

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManager.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManager.java
deleted file mode 100644
index 3758af6..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManager.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.core.rmsystem;

-

-import java.util.Collection;

-

-import org.eclipse.ptp.core.attributes.AttributeManager;

-import org.eclipse.ptp.core.elementcontrols.IPJobControl;

-import org.eclipse.ptp.core.elementcontrols.IPMachineControl;

-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;

-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;

-import org.eclipse.ptp.core.elementcontrols.IPQueueControl;

-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;

-import org.eclipse.ptp.rm.slurm.core.rtsystem.SLURMProxyRuntimeClient;

-import org.eclipse.ptp.rm.slurm.core.rtsystem.SLURMRuntimeSystem;

-import org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager;

-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;

-import org.eclipse.ptp.rtsystem.IRuntimeSystem;

-

-public class SLURMResourceManager extends AbstractRuntimeResourceManager {

-

-	private Integer SLURMRMID;

-	

-	public SLURMResourceManager(Integer id, IPUniverseControl universe, IResourceManagerConfiguration config) {

-		super(id.toString(), universe, config);

-		SLURMRMID = id;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doAfterCloseConnection()

-	 */

-	protected void doAfterCloseConnection() {

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doAfterOpenConnection()

-	 */

-	protected void doAfterOpenConnection() {

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doBeforeCloseConnection()

-	 */

-	protected void doBeforeCloseConnection() {

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doBeforeOpenConnection()

-	 */

-	protected void doBeforeOpenConnection() {

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateJob(org.eclipse.ptp.core.elementcontrols.IPQueueControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)

-	 */

-	@Override

-	protected IPJobControl doCreateJob(IPQueueControl queue, String jobId, AttributeManager attrs) {

-		return newJob(queue, jobId, attrs);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateMachine(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)

-	 */

-	@Override

-	protected IPMachineControl doCreateMachine(String machineId, AttributeManager attrs) {

-		return newMachine(machineId, attrs);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateNode(org.eclipse.ptp.core.elementcontrols.IPMachineControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)

-	 */

-	@Override

-	protected IPNodeControl doCreateNode(IPMachineControl machine, String nodeId, AttributeManager attrs) {

-		return newNode(machine, nodeId, attrs);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateProcess(org.eclipse.ptp.core.elementcontrols.IPJobControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)

-	 */

-	@Override

-	protected IPProcessControl doCreateProcess(IPJobControl job, String processId, AttributeManager attrs) {

-		return newProcess(job, processId, attrs);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateQueue(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)

-	 */

-	@Override

-	protected IPQueueControl doCreateQueue(String queueId, AttributeManager attrs) {

-		return newQueue(queueId, attrs);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateRuntimeSystem()

-	 */

-	@Override

-	protected IRuntimeSystem doCreateRuntimeSystem() {

-		SLURMResourceManagerConfiguration config = (SLURMResourceManagerConfiguration) getConfiguration();

-		/* load up the control and monitoring systems for OMPI */

-		SLURMProxyRuntimeClient runtimeProxy = new SLURMProxyRuntimeClient(config, SLURMRMID);

-		return new SLURMRuntimeSystem(runtimeProxy, getAttributeDefinitionManager());

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateJobs(org.eclipse.ptp.core.elements.IPQueue, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)

-	 */

-	@Override

-	protected boolean doUpdateJobs(IPQueueControl queue, Collection<IPJobControl> jobs,

-			AttributeManager attrs) {

-		return updateJobs(queue, jobs, attrs);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateMachines(java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)

-	 */

-	@Override

-	protected boolean doUpdateMachines(Collection<IPMachineControl> machines,

-			AttributeManager attrs) {

-		return updateMachines(machines, attrs);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateNodes(org.eclipse.ptp.core.elementcontrols.IPMachineControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)

-	 */

-	@Override

-	protected boolean doUpdateNodes(IPMachineControl machine, 

-			Collection<IPNodeControl> nodes, AttributeManager attrs) {

-		return updateNodes(machine, nodes, attrs);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateProcesses(org.eclipse.ptp.core.elementcontrols.IPJobControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)

-	 */

-	@Override

-	protected boolean doUpdateProcesses(IPJobControl job,

-			Collection<IPProcessControl> processes, AttributeManager attrs) {

-		return updateProcesses(job, processes, attrs);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateQueues(java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)

-	 */

-	@Override

-	protected boolean doUpdateQueues(Collection<IPQueueControl> queues,

-			AttributeManager attrs) {

-		return updateQueues(queues, attrs);

-	}

-

-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerConfiguration.java
deleted file mode 100644
index 03b3b31..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerConfiguration.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-/**

- * 

- */

-package org.eclipse.ptp.rm.slurm.core.rmsystem;

-

-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;

-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;

-import org.eclipse.ui.IMemento;

-

-final public class SLURMResourceManagerConfiguration extends

-		AbstractRemoteResourceManagerConfiguration implements Cloneable {

-	public static final String EMPTY_STRING = ""; //$NON-NLS-1$

-

-	private static final String TAG_SLURMD_PATH = "slurmdPath"; //$NON-NLS-1$

-	private static final String TAG_SLURMD_ARGS = "slurmdArgs"; //$NON-NLS-1$

-	private static final String TAG_SLURMD_DEFAULTS = "slurmdDefaults"; //$NON-NLS-1$

-

-	/**

-	 * @param factory

-	 * @param memento

-	 * @return

-	 */

-	public static IResourceManagerConfiguration load(

-			SLURMResourceManagerFactory factory, IMemento memento) {

-

-		RemoteConfig remoteConfig = loadRemote(factory, memento);

-

-		String slurmdPath = memento.getString(TAG_SLURMD_PATH);

-		String slurmdArgs = memento.getString(TAG_SLURMD_ARGS);

-		boolean useDefaults = Boolean.parseBoolean(memento

-				.getString(TAG_SLURMD_DEFAULTS));

-

-		SLURMResourceManagerConfiguration config = new SLURMResourceManagerConfiguration(

-				factory, remoteConfig, slurmdPath, slurmdArgs, useDefaults);

-

-		return config;

-	}

-

-	private String slurmdPath;

-	private String slurmdArgs;

-	private boolean useDefaults;

-

-	public SLURMResourceManagerConfiguration(SLURMResourceManagerFactory factory) {

-		this(factory, new RemoteConfig(), EMPTY_STRING, EMPTY_STRING, true);

-	}

-

-	public SLURMResourceManagerConfiguration(SLURMResourceManagerFactory factory,

-			RemoteConfig config, String slurmdPath, String slurmdArgs,

-			boolean useDefaults) {

-		super(config, factory);

-		setSlurmdPath(slurmdPath);

-		setSlurmdArgs(slurmdArgs);

-		setUseDefaults(useDefaults);

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see java.lang.Object#clone()

-	 */

-	@Override

-	public Object clone() {

-		CommonConfig commonConf = new CommonConfig(getName(),

-				getDescription(), getUniqueName(),

-				getRemoteServicesId(), getConnectionName());

-		RemoteConfig remoteConf = new RemoteConfig(commonConf,

-				getProxyServerPath(), getLocalAddress(),

-				getInvocationOptionsStr(), getOptions());

-		return new SLURMResourceManagerConfiguration(

-				(SLURMResourceManagerFactory) getFactory(), remoteConf,

-				getSlurmdPath(), getSlurmdArgs(), useDefaults());

-	}

-

-	/**

-	 * @return the slurmdArgs

-	 */

-	public String getSlurmdArgs() {

-		return slurmdArgs;

-	}

-

-	/**

-	 * @return the slurmdPath

-	 */

-	public String getSlurmdPath() {

-		return slurmdPath;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration#save(org.eclipse.ui.IMemento)

-	 */

-	public void save(IMemento memento) {

-		super.save(memento);

-		memento.putString(TAG_SLURMD_PATH, slurmdPath);

-		memento.putString(TAG_SLURMD_ARGS, slurmdArgs);

-		memento.putString(TAG_SLURMD_DEFAULTS, Boolean.toString(useDefaults));

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#setDefaultNameAndDesc()

-	 */

-	public void setDefaultNameAndDesc() {

-		String name = "SLURM"; //$NON-NLS-1$

-		String conn = getConnectionName();

-		if (conn != null && !conn.equals(EMPTY_STRING)) {

-			name += "@" + conn; //$NON-NLS-1$

-		}

-		setName(name);

-		setDescription("SLURM Resource Manager"); //$NON-NLS-1$

-	}

-

-	/**

-	 * @param slurmdArguments

-	 *            the slurmdArgs to set

-	 */

-	public void setSlurmdArgs(String slurmdArgs) {

-		this.slurmdArgs = slurmdArgs;

-	}

-

-	/**

-	 * @param slurmdPath

-	 *            the slurmdPath to set

-	 */

-	public void setSlurmdPath(String slurmdPath) {

-		this.slurmdPath = slurmdPath;

-	}

-

-	/**

-	 * @param useDefaults

-	 *            the useDefaults to set

-	 */

-	public void setUseDefaults(boolean useDefaults) {

-		this.useDefaults = useDefaults;

-	}

-

-	/**

-	 * @return the useDefaults

-	 */

-	public boolean useDefaults() {

-		return useDefaults;

-	}

-

-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerFactory.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerFactory.java
deleted file mode 100644
index 94861e3..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.core.rmsystem;

-

-import org.eclipse.core.runtime.Preferences;

-import org.eclipse.ptp.core.PTPCorePlugin;

-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;

-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;

-import org.eclipse.ptp.rm.remote.ui.preferences.PreferenceConstants;

-import org.eclipse.ptp.rm.slurm.core.SLURMPreferenceManager;

-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;

-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;

-import org.eclipse.ui.IMemento;

-

-public class SLURMResourceManagerFactory extends AbstractResourceManagerFactory {

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#create(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)

-	 */

-	public IResourceManagerControl create(IResourceManagerConfiguration confIn) {

-		SLURMResourceManagerConfiguration configuration = (SLURMResourceManagerConfiguration) confIn;

-		final PTPCorePlugin plugin = PTPCorePlugin.getDefault();

-		final IPUniverseControl universe = (IPUniverseControl) plugin.getUniverse();

-		return new SLURMResourceManager(universe.getNextResourceManagerId(), universe, configuration);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#createConfiguration()

-	 */

-	public IResourceManagerConfiguration createConfiguration() {

-		SLURMResourceManagerConfiguration conf = new SLURMResourceManagerConfiguration(this);

-		

-		Preferences preferences = SLURMPreferenceManager.getPreferences();

-		

-		conf.setProxyServerPath(preferences.getString(PreferenceConstants.PROXY_PATH));

-		conf.setOptions(preferences.getInt(PreferenceConstants.OPTIONS));

-

-		return conf;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#loadConfiguration(org.eclipse.ui.IMemento)

-	 */

-	public IResourceManagerConfiguration loadConfiguration(IMemento memento) {

-		return SLURMResourceManagerConfiguration.load(this, memento);

-	}

-

-}

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyCommandFactory.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyCommandFactory.java
deleted file mode 100644
index 9728335..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyCommandFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-

-package org.eclipse.ptp.rm.slurm.core.rtsystem;

-

-import org.eclipse.ptp.proxy.command.IProxyCommand;

-import org.eclipse.ptp.proxy.packet.ProxyPacket;

-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory;

-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeInitCommand;

-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeModelDefCommand;

-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeStartEventsCommand;

-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeStopEventsCommand;

-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeSubmitJobCommand;

-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeTerminateJobCommand;

-import org.eclipse.ptp.proxy.runtime.command.ProxyRuntimeCommandFactory;

-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManagerConfiguration;

-

-public class SLURMProxyCommandFactory implements IProxyRuntimeCommandFactory {

-	public final static String SLURMD_PATH_ATTR = "slurmdPath";

-	public final static String SLURMD_ARGS_ATTR = "slurmdArgs";

-	

-	private IProxyRuntimeCommandFactory factory;

-	private SLURMResourceManagerConfiguration config;

-	

-	public SLURMProxyCommandFactory(SLURMResourceManagerConfiguration config) {

-		this.factory = new ProxyRuntimeCommandFactory();

-		this.config = config;

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeInitCommand(int)

-	 */

-	public IProxyRuntimeInitCommand newProxyRuntimeInitCommand(int baseId) {

-		IProxyRuntimeInitCommand cmd = factory.newProxyRuntimeInitCommand(baseId);

-		if (!config.useDefaults()) {

-			if (!config.getSlurmdPath().equals("")) {

-				cmd.addArgument(SLURMD_PATH_ATTR + "=" + config.getSlurmdPath());

-			}

-			if (!config.getSlurmdArgs().equals("")) {

-				for (String arg : config.getSlurmdArgs().split(" ")) {

-					cmd.addArgument(SLURMD_ARGS_ATTR + "=" + arg);

-				}

-			}

-		}

-		return cmd;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeModelDefCommand()

-	 */

-	public IProxyRuntimeModelDefCommand newProxyRuntimeModelDefCommand() {

-		return factory.newProxyRuntimeModelDefCommand();

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeStartEventsCommand()

-	 */

-	public IProxyRuntimeStartEventsCommand newProxyRuntimeStartEventsCommand() {

-		return factory.newProxyRuntimeStartEventsCommand();

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeStopEventsCommand()

-	 */

-	public IProxyRuntimeStopEventsCommand newProxyRuntimeStopEventsCommand() {

-		return factory.newProxyRuntimeStopEventsCommand();

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeSubmitJobCommand(java.lang.String[])

-	 */

-	public IProxyRuntimeSubmitJobCommand newProxyRuntimeSubmitJobCommand(

-			String[] args) {

-		return factory.newProxyRuntimeSubmitJobCommand(args);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeTerminateJobCommand(java.lang.String)

-	 */

-	public IProxyRuntimeTerminateJobCommand newProxyRuntimeTerminateJobCommand(

-			String jobId) {

-		return factory.newProxyRuntimeTerminateJobCommand(jobId);

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.proxy.command.ProxyCommandFactory#toCommand(org.eclipse.ptp.proxy.packet.ProxyPacket)

-	 */

-	public IProxyCommand toCommand(ProxyPacket packet) {

-		return factory.toCommand(packet);

-	}

-}

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyRuntimeClient.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyRuntimeClient.java
deleted file mode 100644
index 8e98393..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyRuntimeClient.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-

-package org.eclipse.ptp.rm.slurm.core.rtsystem;

-

-import org.eclipse.ptp.proxy.runtime.event.ProxyRuntimeEventFactory;

-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManagerConfiguration;

-import org.eclipse.ptp.rm.remote.core.AbstractRemoteProxyRuntimeClient;

-

-public class SLURMProxyRuntimeClient extends AbstractRemoteProxyRuntimeClient {

-	public SLURMProxyRuntimeClient(SLURMResourceManagerConfiguration config, 

-			int baseModelId) {

-		super(config, baseModelId, new SLURMProxyCommandFactory(config), new ProxyRuntimeEventFactory());

-	}

-}

diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMRuntimeSystem.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMRuntimeSystem.java
deleted file mode 100644
index 72d552b..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMRuntimeSystem.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-

-package org.eclipse.ptp.rm.slurm.core.rtsystem;

-

-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;

-import org.eclipse.ptp.rm.remote.core.AbstractRemoteProxyRuntimeSystem;

-

-public class SLURMRuntimeSystem extends AbstractRemoteProxyRuntimeSystem {

-	public SLURMRuntimeSystem(SLURMProxyRuntimeClient proxy, AttributeDefinitionManager manager) {

-		super(proxy, manager);

-	}

-}

diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/.cproject b/rms/org.eclipse.ptp.rm.slurm.proxy/.cproject
deleted file mode 100644
index 841b658..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/.cproject
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="0.1451097999">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1451097999" moduleId="org.eclipse.cdt.core.settings" name="Default">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactName="org.eclipse.ptp.rm.slurm.proxy" buildProperties="" description="" id="0.1451097999" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-<folderInfo id="0.1451097999." name="/" resourcePath="">
-<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1939665555" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
-<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1939665555.1415213314" name=""/>
-<builder id="org.eclipse.cdt.build.core.settings.default.builder.379503967" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1835313480" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
-<tool id="org.eclipse.cdt.build.core.settings.holder.354226561" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.909176780" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-<tool id="org.eclipse.cdt.build.core.settings.holder.419413029" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1301739134" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-<tool id="org.eclipse.cdt.build.core.settings.holder.1246471449" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2135229327" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-</toolChain>
-</folderInfo>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="0.1451097999">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-</cconfiguration>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<project id="org.eclipse.ptp.rm.slurm.proxy.null.1647747885" name="org.eclipse.ptp.rm.slurm.proxy"/>
-</storageModule>
-</cproject>
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/.project b/rms/org.eclipse.ptp.rm.slurm.proxy/.project
deleted file mode 100644
index 4a8d843..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/.project
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.slurm.proxy</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>?name?</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildCommand</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.contents</key>
-					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/AUTHORS b/rms/org.eclipse.ptp.rm.slurm.proxy/AUTHORS
deleted file mode 100644
index 20edfa2..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Jie Jiang <jiangjie@nudt.edu.cn>
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/COPYING b/rms/org.eclipse.ptp.rm.slurm.proxy/COPYING
deleted file mode 100644
index d75058f..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/COPYING
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2009 School of Computer, National University of Defense Technology, P.R.China 
-
-This program and the accompanying materials 
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- 
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/ChangeLog b/rms/org.eclipse.ptp.rm.slurm.proxy/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/ChangeLog
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/INSTALL b/rms/org.eclipse.ptp.rm.slurm.proxy/INSTALL
deleted file mode 100644
index 5c0c42f..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-See README for build/install instructions.
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/MANIFEST.MF
deleted file mode 100644
index a6b5ca7..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,82 +0,0 @@
-Manifest-Version: 1.0

-Bundle-SymbolicName: org.eclipse.ptp.rm.orte.proxy

-Bundle-ManifestVersion: 2

-Created-By: 1.5.0_13-119 (Apple Inc.)

-Bundle-Name: PTP Proxy Server for OpenRTE

-Bundle-Version: 2.0.1.200806061515

-Bundle-Vendor: Eclipse.org

-Ant-Version: Apache Ant 1.7.0

-Require-Bundle: org.eclipse.ptp.utils,org.eclipse.ptp.proxy

-

-Name: configure.in

-SHA1-Digest: 6zEb7glkC+8rdwwrxA5KDFUOgyI=

-

-Name: Makefile.am

-SHA1-Digest: ROHYubgHwBYTVPIXTNhu4R112l8=

-

-Name: configure

-SHA1-Digest: axCeP1TlINK+7wS5lHX200RIWKg=

-

-Name: ChangeLog

-SHA1-Digest: 2jmj7l5rSw0yVb/vlWAYkK/YBwk=

-

-Name: INSTALL

-SHA1-Digest: us0e070Tu4gXn+nqwifiLOGpbIQ=

-

-Name: about.html

-SHA1-Digest: 67tR7zDg5zZTSqky1HavSrc+IY0=

-

-Name: compile

-SHA1-Digest: 9yZtrtrcGkvhbkbyVJuEtwzwJ9c=

-

-Name: Makefile.in

-SHA1-Digest: xOv2Z+6eN2eQTmlWKogufdkLoik=

-

-Name: COPYING

-SHA1-Digest: qPg+VsliTTBu9Pj5lQzGOyNN61I=

-

-Name: src/ptp_orte_proxy.c

-SHA1-Digest: c26YXCKmymkiudiF8g677Jpm4mI=

-

-Name: ltmain.sh

-SHA1-Digest: FRbVIWsy7X3WW6bmSc1YZX7kirk=

-

-Name: depcomp

-SHA1-Digest: XXQlqcCKZsMXfx4xKG+kCYb/yZY=

-

-Name: AUTHORS

-SHA1-Digest: 5URHvgOFMFtLeqPgwqFoqAEiji0=

-

-Name: NEWS

-SHA1-Digest: 2jmj7l5rSw0yVb/vlWAYkK/YBwk=

-

-Name: missing

-SHA1-Digest: hOFJWuvhBLpo8SS8NgbLShtfbHo=

-

-Name: src/orte_fixup.h

-SHA1-Digest: zjf2tOPZEPOaHNn5FWP+3pYNVlo=

-

-Name: aclocal.m4

-SHA1-Digest: /36j4eu2Q/+iMyClhj8QEkWHqH0=

-

-Name: install-sh

-SHA1-Digest: Kxgl4URD8xmAqKOoBx2z1gjiTE0=

-

-Name: README

-SHA1-Digest: 3HNCziIFDG8857WcSM9Y0Ym8nAE=

-

-Name: config.h.in

-SHA1-Digest: Zg9MFip6DD9nkN+Smu3eGkqewtM=

-

-Name: META-INF/eclipse.inf

-SHA1-Digest: 09gN05tobgS/MdtqyTNQhOhB73M=

-

-Name: config.sub

-SHA1-Digest: bixvOgJrShjcVTjgjLpjrXMJLO0=

-

-Name: config.status

-SHA1-Digest: nYUJgdxawZbAUT8Pnn53lAqFX2U=

-

-Name: config.guess

-SHA1-Digest: sWCO1DGIHZsAcAV22m+35qKOdgU=

-

diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/eclipse.inf b/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/eclipse.inf
deleted file mode 100644
index 92ffed2..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/eclipse.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-#Processed using Jarprocessor
-pack200.conditioned = true
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/Makefile.am b/rms/org.eclipse.ptp.rm.slurm.proxy/Makefile.am
deleted file mode 100644
index a0e47a5..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-bin_PROGRAMS =	ptp_slurm_proxy
-
-ptp_slurm_proxy_SOURCES =	src/ptp_slurm_proxy.c src/srun_opt.h 
-ptp_slurm_proxy_CFLAGS =	$(AM_CFLAGS)
-ptp_slurm_proxy_CPPFLAS =  -I$(SLURMDIR)/include
-ptp_slurm_proxy_LDFLAGS = -L$(SLURMDIR)/lib
-ptp_slurm_proxy_LDADD = 	-lslurm -lpthread
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/NEWS b/rms/org.eclipse.ptp.rm.slurm.proxy/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/NEWS
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/README b/rms/org.eclipse.ptp.rm.slurm.proxy/README
deleted file mode 100644
index bce9c30..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/README
+++ /dev/null
@@ -1,33 +0,0 @@
-This project contains the source code of the SLURM proxy server. The following
-steps are used to set up your build environment so that the executable will be
-correctly built and installed. In order to use the server binary, it needs to 
-be installed in a fragment that corresponds to the architecture of the machine 
-it will be run on. 
-
-1. Make sure the SLURM rms is installed and ensure it work well. 
-   That is, SLURM cmd utilities, such as "sinfo/srun/squeue" work as expected.
-   For more detailed information about how to build and install SLURM, see
-   http://www.llnl.gov/linux/slurm/slurm.html
-
-
-2. Download PTP 2.1 for your platform. And modify proxy_attr.h using libproxy.patch:
-   (1) copy libproxy.patch to $PTPDIR/core/org.eclipse.ptp.proxy
-   (2) cd $PTPDIR/core/org.eclipse.ptp.proxy
-   (3) patch -p1 < libproxy.patch
-
-
-3. Build the corresponding "proxy" and "utils" libraries in $PTPDIR/core/org.eclipse.ptp.proxy 
-   and $PTPDIR/core/org.eclipse.ptp.utils directory using 'configure', 'make' and 'make install' commands.
-
-
-4. Use 'configure', 'make' and 'make install' within this directory from
-   the command line to build and install the executable.
-   NOTE: The 'configure' command MUST require '--with-slurm' option to specify the
-   top install directory of SLURM. If such option is missed, the configure process will fail.
-
-
-5. If any of the automake/autoconf files changes, you should just need to
-   run 'autoreconf' and it will automatically regenerate the appropriate files.
-
-
-
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/about.html b/rms/org.eclipse.ptp.rm.slurm.proxy/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation 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
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/config.h.in b/rms/org.eclipse.ptp.rm.slurm.proxy/config.h.in
deleted file mode 100644
index 0f7134d..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/config.h.in
+++ /dev/null
@@ -1,76 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `proxysvr' library (-lproxysvr). */
-#undef HAVE_LIBPROXYSVR
-
-/* Define to 1 if you have the `slurm' library (-lslurm). */
-#undef HAVE_LIBSLURM
-
-/* Define to 1 if you have the `utils' library (-lutils). */
-#undef HAVE_LIBUTILS
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <slurm/slurm_errno.h> header file. */
-#undef HAVE_SLURM_SLURM_ERRNO_H
-
-/* Define to 1 if you have the <slurm/slurm.h> header file. */
-#undef HAVE_SLURM_SLURM_H
-
-/* Enable SLURM rms support. */
-#undef HAVE_SRUN
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/configure.in b/rms/org.eclipse.ptp.rm.slurm.proxy/configure.in
deleted file mode 100644
index 82a5506..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/configure.in
+++ /dev/null
@@ -1,89 +0,0 @@
-dnl
-dnl
-
-AC_PREREQ([2.50])
-
-AC_INIT([org.eclipse.ptp.slurm], [2.1])
-AC_CONFIG_SRCDIR([src/ptp_slurm_proxy.c])
-
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-
-AC_CANONICAL_BUILD
-
-dnl
-dnl Eclipse adds version number to end of package when deploying via update site
-dnl
-
-UTILS="../../core/org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		AC_MSG_ERROR([utils directory not found])
-	fi
-fi
-
-PROXY="../../core/org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
-	PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
-	if test ! -d $PROXY; then
-		AC_MSG_ERROR([proxy directory not found])
-	fi
-fi
-
-dnl SLURM
-
-AC_ARG_WITH([slurm], AS_HELP_STRING([--with-slurm],
-	[Specify the top dir of installed SLURM rms.@<:@REQUIRED@:>@]),[],[with_slurm=no])
-
-SLURMDIR=
-AS_IF([test "x$with_slurm" != xno],[AC_SUBST([SLURMDIR],[$with_slurm])],
-       AC_MSG_ERROR([The top installation directory of SLURM rms must be specified via "--with-slurm=DIR".]))
-
-
-dnl
-dnl Check for programs.
-dnl
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-CFLAGS="$CFLAGS -Wall -I$UTILS/include -I$PROXY/include -I$SLURMDIR/include"
-LIBS="$LIBS -L$UTILS -L$PROXY -L$SLURMDIR/lib"
-CPPFLAGS="$CPPFLAGS -I$SLURMDIR/include"
-
-dnl
-dnl Check for libraries.
-dnl
-
-AC_CHECK_LIB([utils], [bitset_new])
-AC_CHECK_LIB([proxysvr], [proxy_svr_init])
-AC_CHECK_LIB([slurm],[slurm_ping],[],
-			[AC_MSG_ERROR([libslurm.so/.a not found. Make sure --with-slurm specify correct dir.])])
-
-dnl
-dnl Check for header files.
-dnl
-
-AC_HEADER_STDC
-AC_CHECK_HEADERS([slurm/slurm.h slurm/slurm_errno.h],[],
-				[AC_MSG_ERROR([slurm.h or slurm_errno.h not found])])
-
-dnl
-dnl Check for types
-dnl
-AC_TYPE_SIGNAL
-
-AC_PATH_PROG(SRUN, [srun], no)
-if test "$ac_cv_path_SRUN" != no; then
-	AC_DEFINE([HAVE_SRUN],[1],[Enable SLURM rms support.])
-else
-	AC_MSG_ERROR([srun command not found. Make sure SLURM rms installed.])
-fi
-
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/libproxy.patch b/rms/org.eclipse.ptp.rm.slurm.proxy/libproxy.patch
deleted file mode 100644
index d960a45..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/libproxy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -uNr org.eclipse.ptp.proxy/include/proxy_attr.h org.eclipse.ptp.proxy_slurm/include/proxy_attr.h
---- org.eclipse.ptp.proxy/include/proxy_attr.h	2009-04-14 15:08:29.000000000 +0800
-+++ org.eclipse.ptp.proxy_slurm/include/proxy_attr.h	2009-04-14 15:12:40.000000000 +0800
-@@ -56,10 +56,12 @@
-  * Node attributes
-  */
- #define NODE_STATE_ATTR				"nodeState"
-+#ifndef HAVE_SLURM_SLURM_H
- #define 	NODE_STATE_UP				"UP"
- #define 	NODE_STATE_DOWN				"DOWN"
- #define 	NODE_STATE_ERROR			"ERROR"
- #define 	NODE_STATE_UNKNOWN			"UNKNOWN"
-+#endif
- #define NODE_NUMBER_ATTR			"nodeNumber"
- #ifdef HAVE_SYS_BPROC_H
- #define NODE_GROUP_ATTR				"nodeGroup"
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/src/ptp_slurm_proxy.c b/rms/org.eclipse.ptp.rm.slurm.proxy/src/ptp_slurm_proxy.c
deleted file mode 100644
index 2782888..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/src/ptp_slurm_proxy.c
+++ /dev/null
@@ -1,3064 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008,2009 
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 		Jie Jiang <jiangjie@nudt.edu.cn>
- *******************************************************************************/
-
-
-#ifndef SLURM_PROXY
-#define SLURM_PROXY 
-#endif 
-
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include "config.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdbool.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>       
-#include <assert.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <libgen.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/select.h>
-#include <sys/param.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "handler.h"
-#include "list.h"
-#include "args.h"
-#include "rangeset.h"
-#include "slurm/slurm.h"
-#include "srun_opt.h"
-
-
-#define PTP_JOBID 			0
-#define SLURM_JOBID 		1
-#define DEBUG_JOBID 		2
-#define JOBID_INIT 			0
-#define JOBID_FAIL 			-1
-#define MAX_THREADS 		60
-#define CORE_INVALID   		-1
-#define CORE_DEFAULT 		0
-#define MAX_BUF_SIZE 		8192 
-#define MAX_SRUN_ARG_NUM 	256
-#define ALL_JOBSTATE		-1
-/*
- * Need to undef these if we include
- * two config.h files
- */
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-
-#define WIRE_PROTOCOL_VERSION	"2.0"
-#define DEFAULT_HOST			"localhost"
-#define DEFAULT_PROXY			"tcp"
-
-/*
- * Proxy server states. The SHUTTING_DOWN state is used to
- * give the proxy a chance to send any pending events once
- * a QUIT command has been received.
- */
-#define STATE_INIT			0
-#define STATE_RUNNING		1
-#define STATE_SHUTTING_DOWN	2
-#define STATE_SHUTDOWN		3
-
-
-/*
- * RTEV codes must EXACTLY match org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEvent
- */
-#define RTEV_OFFSET						200
-#define RTEV_ERROR_SLURM_INIT			RTEV_OFFSET + 1000
-#define RTEV_ERROR_SLURM_FINALIZE		RTEV_OFFSET + 1001
-#define RTEV_ERROR_SLURM_SUBMIT			RTEV_OFFSET + 1002
-#define RTEV_ERROR_JOB					RTEV_OFFSET + 1003
-#define RTEV_ERROR_NATTR				RTEV_OFFSET + 1007
-//#define RTEV_ERROR_ORTE_BPROC_SUBSCRIBE	RTEV_OFFSET + 1008
-#define RTEV_ERROR_SIGNAL				RTEV_OFFSET + 1009
-
-/*
- * Queue attributes
- */
-#define DEFAULT_QUEUE_NAME			"default"
-#define SLURM_JOB_NAME_FMT			"job%02d"
-
-#define MAX_RETRIES 				100
-#define JOB_UPDATE_TIMER 			1
-#define NODE_UPDATE_TIMER 			2
-#define JOB_UPDATE_TIMEOUT			500000 	/*usec*/
-#define NODE_UPDATE_TIMEOUT			5000000 /*usec*/
-
-/* SLURM job state and attributes */
-#define	SLURM_JOB_STATE_PENDING			"PENDING"
-#define	SLURM_JOB_STATE_RUNNING			"RUNNING"
-#define	SLURM_JOB_STATE_SUSPENDED		"SUSPENDED"
-#define SLURM_JOB_STATE_TERMINATED		"TERMINATED"
-#define	SLURM_JOB_STATE_COMPLETE		SLURM_JOB_STATE_TERMINATED
-#define SLURM_JOB_STATE_CANCELLED		"CANCELLED"
-#define	SLURM_JOB_STATE_FAILED		  	"FAILED"
-#define	SLURM_JOB_STATE_TIMEOUT		  	"TIMEOUT"
-#define	SLURM_JOB_STATE_NODEFAIL		"NODEFAIL"
-
-#define SLURM_JOB_SUB_ID_ATTR				"jobSubId"
-#define SLURM_JOB_NUM_PROCS_ATTR			"jobNumProcs" 	//-n
-#define SLURM_JOB_NUM_NODES_ATTR			"jobNumNodes" 	//-N
-#define SLURM_JOB_TIME_LIMIT_ATTR			"jobTimeLimit"	//-t
-#define SLURM_JOB_PARTITION_ATTR			"jobPartition" 	//-p
-#define SLURM_JOB_ID_ATTR					"jobId"        	//--jobid
-#define SLURM_JOB_NODELIST_ATTR				"jobNodeList"  	//-w
-#define SLURM_JOB_TYPE_ATTR					"jobType"      	//--jobtype
-#define SLURM_JOB_IOLABEL_ATTR				"jobIoLabel"   	//-l
-#define SLURM_JOB_VERBOSE_ATTR				"jobVerbose"   	//-v
-#define SLURM_JOB_EXEC_NAME_ATTR			"execName"
-#define SLURM_JOB_EXEC_PATH_ATTR			"execPath"
-#define SLURM_JOB_WORKING_DIR_ATTR			"workingDir"
-#define SLURM_JOB_PROG_ARGS_ATTR			"progArgs"
-#define SLURM_JOB_ENV_ATTR					"env"
-#define SLURM_JOB_DEBUG_EXEC_NAME_ATTR		"debugExecName"
-#define SLURM_JOB_DEBUG_EXEC_PATH_ATTR		"debugExecPath"
-#define SLURM_JOB_DEBUG_ARGS_ATTR			"debugArgs"
-#define SLURM_JOB_DEBUG_FLAG_ATTR			"debug"
-
-/* SLURM node state and attributes */
-#define SLURM_NODE_STATE_UNKNOWN		"UNKNOWN"
-#define SLURM_NODE_STATE_DOWN			"DOWN"
-#define SLURM_NODE_STATE_IDLE			"UP"
-#define	SLURM_NODE_STATE_ALLOCATED		"ALLOCATED"
-#define SLURM_NODE_EXTRA_STATE_ATTR		"nodeExtraState"
-#define SLURM_NODE_NUMBER_ATTR			"nodeNumber"
-#define SLURM_NODE_SOCKETS_ATTR			"sockNumber"
-#define SLURM_NODE_CORES_ATTR			"coreNumber"
-#define SLURM_NODE_THREADS_ATTR			"threadNumber"
-#define SLURM_NODE_ARCH_ATTR			"cpuArch"
-#define SLURM_NODE_OS_ATTR				"OS"
-
-#define EXIT_JOB_ALLOC_FAIL		-1
-#define EXIT_JOB_IOTHREAD_FAIL	-2
-#define EXIT_EXEC_FAIL			-3
-
-
-struct sync_msg {
-	int		slurm_jobid;
-	bool 	jobid_set;
-	bool	io_ready;
-};
-typedef struct sync_msg sync_msg;
-
-struct ptp_machine {
-	int		id;
-	List *	nodes;
-};
-typedef struct ptp_machine	ptp_machine;
-
-struct ptp_slurm_node {
-	int 		id;  	/* model element id, generated by proxy agent */
-	int			number;	/* node number, assigned by SLURM */
-	char *		name;
-	uint16_t	state; 	/* (uint16_t)node_info_t.state, converted to (char *)  */
-	uint16_t 	sockets;
-	uint16_t 	cores;
-	uint16_t 	threads;
-	char *		arch;
-	char *		os;
-};
-typedef struct ptp_slurm_node	ptp_node;
-
-struct ptp_slurm_process {
-	int		id;
-	int		node_id;
-	int		task_id; /* MPI rank */
-	int		pid;
-};
-typedef struct ptp_slurm_process	ptp_process;
-
-struct ptp_slurm_job {
-	int 				ptp_jobid;		/* job ID as known by PTP */
-	int 				slurm_jobid;	/* job ID that will be used by program when it starts */
-	bool				need_alloc;		/* need to allocate new resource */
-	int					debug_jobid;
-	int					num_procs;		/* number of procs requested for program (debugger: num_procs+1) */
-	int					state;			/* job state(slurm definition) */
-	pid_t				srun_pid;		/* pid of the srun process */
-	bool				debug;			/* job is debug job */
-	bool 				attach;			/* attach debug */
-	int					fd_err;			/* fd of pipe for srun's stderr */
-	int					fd_out;			/* fd of pipe for srun's stdout */
-	int					iothread_id;	/* id of thread forwarding srun's stdio */
-	bool				iothread_exit_req; /* request iothread to exit */
-	bool				iothread_exit;  /* flag inidication iothread has exited  */
-	bool				removable;
-	ptp_process **  	procs;			/* procs of this job */
-	rangeset * 			set;			/* range set of proc ID */
-};
-typedef struct ptp_slurm_job ptp_job;
-
-typedef struct slurmctld_comm_addr {
-	char * hostname;
-	uint16_t port;
-}slurmctld_comm_addr_t;
-
-typedef void SigFunc(int);
-typedef int32_t slurm_fd;
-
-
-static int SLURM_Initialize(int, int, char **);
-static int SLURM_ModelDef(int, int, char **);
-static int SLURM_StartEvents(int, int, char **);
-static int SLURM_StopEvents(int, int, char **);
-static int SLURM_SubmitJob(int, int, char **);
-static int SLURM_TerminateJob(int, int, char **);
-static int SLURM_Quit(int, int, char **);
-
-static FILE * init_logfp();
-static void debug_log(FILE * fp, char * fmt,...);
-static void * srun_output_forwarding(void * arg);
-static bool job_update_timeout();
-static void update_job_state(int slurm_jobid);
-static bool node_update_timeout();
-static void update_node_state();
-static int create_node_list(ptp_machine *mach);
-static void init_job_timer();
-static void init_node_timer();
-
-static struct timeval 		job_update_timer;
-static struct timeval		node_update_timer;
-static sync_msg *			sync_msg_addr;
-static FILE * 				logfp;
-static int 					destroy_job = 0; /* job allocation cancelled by signal */
-static bool 				enable_state_update = false;
-static 	srun_opt_t			opt;
-static allocation_msg_thread_t* msg_thr = NULL;
-static slurmctld_comm_addr_t slurmctld_comm_addr;
-static int			gTransID = 0; /* transaction id for start of event stream, is 0 when events are off */
-static int			gBaseID = -1; /* base ID for event generation */
-static int			gLastID = 1;  /* ID generator */
-static int			gQueueID;     /* ID of default queue */
-static int 			proxy_state = STATE_INIT;
-static proxy_svr *	slurm_proxy;
-static List *		gJobList;
-static List *		gMachineList;
-static int			ptp_signal_exit = 0;;
-
-
-static proxy_svr_helper_funcs helper_funcs = {
-	NULL,					// newconn() - can be used to reject connections
-	NULL					// numservers() - if there are multiple servers, return the number
-};
-
-#define CMD_BASE	0
-static proxy_cmd	cmds[] = {
-	SLURM_Quit,
-	SLURM_Initialize,
-	SLURM_ModelDef,
-	SLURM_StartEvents,
-	SLURM_StopEvents,
-	SLURM_SubmitJob,
-	SLURM_TerminateJob
-};
-
-static proxy_commands command_tab = {
-	CMD_BASE,
-	sizeof(cmds)/sizeof(proxy_cmd),
-	cmds
-};
-
-static struct option longopts[] = {
-	{"proxy",			required_argument,	NULL, 	'P'}, 
-	{"port",			required_argument,	NULL, 	'p'}, 
-	{"host",			required_argument,	NULL, 	'h'}, 
-	{NULL,				0,					NULL,	0}
-};
-
-
-/* 
- * If the log file is specified, return the FILE pointer.
- * Otherwise, default to stderr.
- */
-static FILE * 
-init_logfp()
-{
-	FILE * fp = stderr;
-	char * logdir;
-	char * logfile;
-	int    rc;
-	
-	if ((logdir = getenv("PTP_SLURM_PROXY_LOGDIR")) == NULL)
-		return fp;
-	
-	rc = access(logdir, R_OK|W_OK);
-	if (rc < 0) {
-		fprintf(stderr, "Please ensure the DIR %s exists and you can READ/WRITE it!\n", logdir);
-		return fp;
-	}
-	asprintf(&logfile,"%s/ptp_proxy.log",logdir);
-	fp = fopen(logfile,"w+");
-	if(fp == NULL) 
-		fp = stderr;
-	free(logfile);
-
-	return fp;
-}
-
-/*
- * Write debug info into logfile.
- */
-static void
-debug_log(FILE * fp, char * fmt,...)
-{
-	va_list va;
-
-	if (fp == NULL)
-		return;
-
-	va_start(va, fmt);
-	vfprintf(fp, fmt, va);
-	fflush(fp);
-	va_end(va);
-
-	return;
-}
-
-/*
- * Generate a model element ID.
- */
-static int
-generate_id(void)
-{
-	return gBaseID + gLastID++;
-}
-
-/*
- * Create a new machine.
- */
-static ptp_machine *
-new_machine()
-{
-	ptp_machine *	m = (ptp_machine *)malloc(sizeof(ptp_machine));
-	m->id = generate_id();
-	m->nodes = NewList();
-    AddToList(gMachineList, (void *)m);
-
-    return m;
-}
-
-/*
- * Convert SLURM node state code (uint16_t) to STRING.
- */
-static char * 
-nodestate_to_string(uint16_t slurm_node_state)
-{
-	char * str = NULL;
-
-	switch (slurm_node_state & NODE_STATE_BASE) {
-		case NODE_STATE_UNKNOWN:
-			str =  SLURM_NODE_STATE_UNKNOWN;
-			break;
-		case  NODE_STATE_DOWN:
-			str =  SLURM_NODE_STATE_DOWN;
-			break;
-		case  NODE_STATE_IDLE:
-			str =  SLURM_NODE_STATE_IDLE;
-			break;
-		case NODE_STATE_ALLOCATED:
-			str =  SLURM_NODE_STATE_ALLOCATED;
-			break;
-		default:
-			str = SLURM_NODE_STATE_UNKNOWN;
-			break;
-	}
-
-	return str;
-}
-
-/*
- * Convert SLURM job state code(uint16_t) to STRING.
- */
-static char *
-jobstate_to_string(uint16_t slurm_job_state)
-{
-	char * str = NULL;
-
-	switch (slurm_job_state & (~JOB_COMPLETING)) {
-		case JOB_PENDING:
-			str = SLURM_JOB_STATE_PENDING; 
-			break;
-		case JOB_RUNNING:
-			str = SLURM_JOB_STATE_RUNNING;
-			break;
-		case JOB_SUSPENDED:
-			str = SLURM_JOB_STATE_SUSPENDED;
-			break;
-		case JOB_COMPLETE:
-			str = SLURM_JOB_STATE_COMPLETE; 
-			break;
-		case JOB_CANCELLED:
-			str = SLURM_JOB_STATE_CANCELLED;
-			break;
-		case JOB_FAILED:
-			str = SLURM_JOB_STATE_FAILED;
-			break;
-		case JOB_TIMEOUT:
-			str = SLURM_JOB_STATE_TIMEOUT;
-			break;
-		case JOB_NODE_FAIL:
-			str = SLURM_JOB_STATE_NODEFAIL;
-			break;
-		default:
-			str = "Unknown job state";
-			break;
-	}
-
-	return str;
-}
-
-
-/*
- * Create a new node and insert it into machine node list.
- */
-static ptp_node *
-new_node(ptp_machine *mach, node_info_t *ni)
-{
-	static int node_number = 0;
-	ptp_node * n = (ptp_node *)malloc(sizeof(ptp_node));
-	
-	memset((char *)n, 0, sizeof(ptp_node));
-	n->id = generate_id();
-	n->number = node_number++;
-
-	n->sockets = ni->sockets;
-	n->cores = ni->cores;
-	n->threads = ni->threads;
-
-	if (ni->name != NULL)
-		n->name = strdup(ni->name);
-	
-	n->state = ni->node_state;
-		
-	if (ni->arch != NULL)
-		n->arch = strdup(ni->arch);
-	if (ni->os != NULL)
-		n->os = strdup(ni->os);
-	
-    AddToList(mach->nodes, (void *)n);
-
-    return n;
-}
-
-/*
- * Get node pointer from node name. 
- */
-static ptp_node *
-find_node_by_name(char *name)
-{
-	ptp_machine *	m;
-	ptp_node *		n;
-	
-	for (SetList(gMachineList); (m = (ptp_machine *)GetListElement(gMachineList)) != NULL; ) {
-		for (SetList(m->nodes); (n = (ptp_node *)GetListElement(m->nodes)) != NULL; ) {
-			if (strcmp(name, n->name) == 0)
-				return n;
-		}
-	}
-	
-	return NULL;
-}
-
-/*
- * Create a new process and insert it into job structure.
- */
-static ptp_process *
-new_process(ptp_job *job, int node_id, int task_id, int pid)
-{
-	ptp_process *	p = (ptp_process *)malloc(sizeof(ptp_process));
-	if (p == NULL)
-		return NULL;
-
-	p->id = generate_id();
-	p->task_id = task_id;
-	p->pid = pid;
-	p->node_id = node_id;
-
-    job->procs[task_id] = p;
-    insert_in_rangeset(job->set, p->id);
-
-    return p;
-}
-
-
-/*
- * Free the space allocated to ptp_process.
- */
-static void
-free_process(ptp_process *p)
-{
-	if (p)
-		free(p);
-	return;
-}
-
-/*
- * Get process pointer given job and task_id.
- */
-static ptp_process *
-find_process(ptp_job *job, int task_id)
-{
-	if (task_id < 0 || task_id >= job->num_procs)
-		return NULL;
-		
-	return job->procs[task_id];
-}
-	
-/*
- *  Get jobid of 'which' type
- */
-static int
-get_jobid(ptp_job *j, int which)
-{
-	int id = -1;
-
-	if (j != NULL) {
-		switch (which) {
-		case PTP_JOBID:
-			id = j->ptp_jobid;
-			break;
-		case SLURM_JOBID:
-			id = j->slurm_jobid;
-			break;
-		case DEBUG_JOBID:
-			id = j->debug_jobid;
-			break;
-		default:
-			id = -1;
-			break;
-		}	
-	}
-
-	return id;
-}
-
-/*
- * Create a new job,set job attributes and add to gJobList.  
- */
-static ptp_job *
-new_job(int num_procs, bool debug, int ptp_jobid, int slurm_jobid, int debug_jobid, bool need_alloc)
-{
-	ptp_job *	j = (ptp_job *)malloc(sizeof(ptp_job));
-	if (j == NULL) {
-		debug_log(logfp, "Allcoate space for job struct fail. \n");
-		return NULL;
-	}	
-
-	j->ptp_jobid = ptp_jobid;
-    j->slurm_jobid = slurm_jobid;
-	j->need_alloc = need_alloc; 
-    j->num_procs = num_procs;
-    j->debug = debug;
-	j->debug_jobid = debug_jobid;
-	j->attach = false;
-	j->srun_pid = -1;
-	j->state = -1;
-	j->removable = false;
-	j->fd_err = -1;
-	j->fd_out = -1;
-	j->iothread_id = -1;
-	j->iothread_exit_req = false;
-	j->iothread_exit = false;
-	j->set = new_rangeset();
-	j->procs = (ptp_process **)malloc(sizeof(ptp_process *) * num_procs);
-	memset(j->procs, 0, sizeof(ptp_process *) * num_procs);
-
-    AddToList(gJobList, (void *)j);
-
-    return j;
-}
-
-/*
- * Free job space allocated by new_job().
- */
-static void
-free_job(ptp_job *j)
-{
-	int i;
-
-	if (j) {
-		if (j->procs) {
-			for (i = 0; i < j->num_procs; i++) {
-				if (j->procs[i] != NULL) 
-					free_process(j->procs[i]);
-			}
-			free(j->procs);
-		}
-		if (j->set) 
-			free_rangeset(j->set);
-
-		free(j);
-	}	
-}
-
-
-/*
- * Get job pointer given the jobid of 'which' type.
- * If debug is true, find the job using the debug jobid.
- */
-static ptp_job *
-find_job(int jobid, int which)
-{
-	ptp_job *	j = NULL;
-	
-	for (SetList(gJobList); (j = (ptp_job *)GetListElement(gJobList)) != NULL; ) {
-		if (get_jobid(j, which) == jobid) 
-			return j;
-	}
-	return NULL;
-}
-
-/*
- * Determin if the given job is ACTIVE.
- */
-static bool 
-slurm_job_active(ptp_job * job)
-{
-	uint16_t state;
-	bool 	active;
-	
-	state = job->state;
-	if (state == JOB_COMPLETE || state == JOB_CANCELLED 
-		|| state == JOB_FAILED || state == JOB_TIMEOUT || state == JOB_NODE_FAIL) {
-		active = false;
-	} else
-		active = true;  /* JOB_COMPLETING is ACTIVE */
-
-	return active;
-}
-
-static void
-sendOKEvent(int trans_id)
-{
-	proxy_svr_queue_msg(slurm_proxy, proxy_ok_event(trans_id));
-}
-
-static void
-sendShutdownEvent(int trans_id)
-{
-	proxy_svr_queue_msg(slurm_proxy, proxy_shutdown_event(trans_id));
-}
-
-static void
-sendMessageEvent(int trans_id, char *level, int code, char *fmt, ...)
-{
-	va_list		ap;
-
-	va_start(ap, fmt);
-	proxy_svr_queue_msg(slurm_proxy, proxy_message_event(trans_id, level, code, fmt, ap));
-	va_end(ap);
-}
-
-static void
-sendErrorEvent(int trans_id, int code, char *fmt, ...)
-{
-	va_list		ap;
-
-	va_start(ap, fmt);
-	debug_log(logfp, "sendErrorEvent(%d,%d),", trans_id, code);
-	debug_log(logfp, fmt,ap);
-	proxy_svr_queue_msg(slurm_proxy, proxy_error_event(trans_id, code, fmt, ap));
-	va_end(ap);
-}
-
-static void
-sendJobSubErrorEvent(int trans_id, char *jobSubId, char *msg)
-{
-	proxy_svr_queue_msg(slurm_proxy, proxy_submitjob_error_event(trans_id, jobSubId, RTEV_ERROR_SLURM_SUBMIT, msg));
-}
-
-
-static void
-sendJobTerminateErrorEvent(int trans_id, int id, char *msg)
-{
-	char *	job_id;
-	
-	asprintf(&job_id, "%d", id);
-	proxy_svr_queue_msg(slurm_proxy, proxy_terminatejob_error_event(trans_id, job_id, RTEV_ERROR_JOB, msg));
-}
-
-static void
-sendNewMachineEvent(int trans_id, int id, char *name)
-{
-	char *	rm_id;
-	char *	machine_id;
-	
-	asprintf(&rm_id, "%d", gBaseID);	
-	asprintf(&machine_id, "%d", id);	
-	proxy_svr_queue_msg(slurm_proxy, proxy_new_machine_event(trans_id, rm_id, machine_id, name, MACHINE_STATE_UP));
-	free(machine_id);
-	free(rm_id);
-}
-
-
-/*
- * Get the number of node attributes setup in ptp_node.
- */
-static int
-num_node_attrs(ptp_node *node)
-{
-	int	cnt = 0;
-
-	if (node->number >= 0)
-		cnt++;
-	if (node->sockets > 0)
-		cnt++;
-	if (node->cores > 0)
-		cnt++;
-	if (node->threads > 0)
-		cnt++;
-	if (node->arch != NULL)
-		cnt++;
-	if (node->os != NULL)
-		cnt++;
-
-	return cnt;	
-}
-
-/*
- * Add node attributes to proxy_msg. 
- */
-static void
-add_node_attrs(proxy_msg *m, ptp_node *node)
-{
-	
-    /* NODE_NUMBER_ATTR enables the node number ruler in Machine View */
-	if (node->number >= 0)
-		proxy_add_int_attribute(m, SLURM_NODE_NUMBER_ATTR, node->number);
-
-	proxy_add_int_attribute(m, SLURM_NODE_SOCKETS_ATTR, (int)node->sockets);
-	proxy_add_int_attribute(m, SLURM_NODE_CORES_ATTR, (int)node->cores);
-	proxy_add_int_attribute(m, SLURM_NODE_THREADS_ATTR, (int)node->threads);
-
-	if (node->arch != NULL)
-		proxy_add_string_attribute(m, SLURM_NODE_ARCH_ATTR, node->arch);
-	if (node->os != NULL)
-		proxy_add_string_attribute(m, SLURM_NODE_OS_ATTR, node->os);
-}
-
-static void
-sendNewJobEvent(int trans_id, int jobid, char *name, char *jobSubId, char *state)
-{
-	char *	queue_id;
-	char *	job_id;
-	
-	asprintf(&queue_id, "%d", gQueueID);	
-	asprintf(&job_id, "%d", jobid);
-	proxy_svr_queue_msg(slurm_proxy, proxy_new_job_event(trans_id, queue_id, job_id, name, state, jobSubId));
-	free(queue_id);
-	free(job_id);
-}
-
-static void
-sendNewNodeEvent(int trans_id, int machid, ptp_machine *mach)
-{
-	ptp_node *	n;
-	proxy_msg *	m;
-	char *		machine_id;
-	char *		node_id;
-	
-	asprintf(&machine_id, "%d", machid);
-	m = proxy_new_node_event(trans_id, machine_id, SizeOfList(mach->nodes));
-	for (SetList(mach->nodes); (n = (ptp_node *)GetListElement(mach->nodes)) != NULL; ) {
-		asprintf(&node_id, "%d", n->id);
-		proxy_add_node(m, node_id, n->name, nodestate_to_string(n->state), num_node_attrs(n));
-		add_node_attrs(m, n);
-		free(node_id);
-	}
-	proxy_svr_queue_msg(slurm_proxy, m);
-	free(machine_id);
-}
-
-static void
-sendNodeChangeEvent(int trans_id, char * id_range, char * state)
-{
-	proxy_msg * m;
-
-	m = proxy_node_change_event(trans_id, id_range, 1);
-	proxy_add_string_attribute(m, NODE_STATE_ATTR, state);
-	proxy_svr_queue_msg(slurm_proxy, m);
-}
-
-/*
- * FIXME: 
- *	Add extra attributes when task topology information is available.
- *  This can be done via slurm_job_step_layout_get() API when updating job state.
- */
-static void
-sendNewProcessEvent(int trans_id, int jobid, ptp_process *p, char *state)
-{
-	proxy_msg *	m;
-	char *		job_id;
-	char *		proc_id;
-	char *		name;
-	
-	if (p == NULL)
-		return;
-	
-	asprintf(&job_id, "%d", jobid);
-	asprintf(&proc_id, "%d", p->id);
-	asprintf(&name, "%d",  p->task_id);
-	
-	m = proxy_new_process_event(trans_id, job_id, 1);
-	/*
-	 * By now, p->node_id, p->task_id, p->pid can't be obtained.
-	 * So set the extra_attrs=0
-	 */
-	proxy_add_process(m, proc_id, name, state, 0);
-	/*	
-	proxy_add_process(m, proc_id, name, state, 3);
-	proxy_add_int_attribute(m, PROC_NODEID_ATTR, p->node_id);	
-	proxy_add_int_attribute(m, PROC_INDEX_ATTR, p->task_id);	
-	proxy_add_int_attribute(m, PROC_PID_ATTR, p->pid);
-	*/
-	proxy_svr_queue_msg(slurm_proxy, m);
-	
-	free(job_id);
-	free(proc_id);
-	free(name);
-}
-
-static void
-sendNewQueueEvent(int trans_id)
-{
-	char *		rm_id;
-	char *		queue_id;
-	
-	gQueueID = generate_id();
-	
-	asprintf(&rm_id, "%d", gBaseID);
-	asprintf(&queue_id, "%d", gQueueID);
-	proxy_svr_queue_msg(slurm_proxy, proxy_new_queue_event(trans_id, rm_id, queue_id, DEFAULT_QUEUE_NAME, QUEUE_STATE_NORMAL));
-	
-	free(rm_id);
-	free(queue_id);
-}
-
-static void
-sendProcessStateChangeEvent(int trans_id, ptp_job *j, char *state)
-{
-	proxy_msg *	m;
-	
-	if (j == NULL || j->num_procs == 0)
-		return;
-		
-	m = proxy_process_change_event(trans_id, rangeset_to_string(j->set), 1);
-	proxy_add_string_attribute(m, PROC_STATE_ATTR, state);
-	proxy_svr_queue_msg(slurm_proxy, m);
-}
-	
-	
-static void
-sendJobStateChangeEvent(int trans_id, int jobid, char *state)
-{
-	char *		job_id;
-	proxy_msg *	m;
-	
-	asprintf(&job_id, "%d", jobid);
-
-	m = proxy_job_change_event(trans_id, job_id, 1);
-	proxy_add_string_attribute(m, JOB_STATE_ATTR, state);
-	proxy_svr_queue_msg(slurm_proxy, m);
-	
-	free(job_id);
-}
-
-/*
- * SLURM provides no process state, only job state.
- * Let process state equal to job state.
- */
-static void
-sendProcessChangeEvent(int trans_id, ptp_process *p, int node_id, int task_id, int pid)
-{
-	return;
-}
-
-static void
-sendProcessOutputEvent(int trans_id, int procid, char *output)
-{
-	char *		proc_id;
-	proxy_msg *	m;
-	
-	asprintf(&proc_id, "%d", procid);
-	
-	m = proxy_process_change_event(trans_id, proc_id, 1);
-	proxy_add_string_attribute(m, PROC_STDOUT_ATTR, output);
-	proxy_svr_queue_msg(slurm_proxy, m);
-	
-	free(proc_id);	
-}
-
-/*
- * Get the number of compute nodes managed by SLURM.
- */
-static int
-get_num_nodes(int machid)
-{
-	uint32_t cnt = 0;
-	node_info_msg_t * ninfo;
-
-	slurm_load_node((time_t)NULL, &ninfo, SHOW_ALL);
-	cnt = ninfo->record_count;
-	slurm_free_node_info_msg(ninfo);
-	
-	return cnt;
-}
-
-/* 
- * Currently only ONE machine supported.
- */
-static int 
-get_num_machines()
-{
-	return 1;
-}
-
-/*
- * Get hostname of the server node where slurmctld runs.
- */
-static char *
-get_machine_name(int num)
-{
-	static char	hostname[512];
-	
-	gethostname(hostname, 512);
-	return hostname;
-}
-
-/*
- * Cteate the node list for a machine.
- */
-static int
-create_node_list(ptp_machine *mach)
-{
-	uint32_t cnt;
-	node_info_msg_t *nmsg;
-	ptp_node *		node;
-	int i;
-
-	if (slurm_load_node((time_t)NULL,&nmsg, SHOW_ALL))
-		return -1;
-
-	cnt = nmsg->record_count;
-	for (i = 0; i < cnt; i++) 
-		node = new_node(mach, nmsg->node_array + i);
-
-	return 0;
-}
-
-/*
- * If we're under debug control, let the debugger handle process state update. 
- * 
- * Note: this will only be called if the debugger allows the program to
- * reach MPI_Init(), which may never happen (e.g. if it's not an MPI program). 
- * Don't rely this to do anything for arbitrary jobs.
- * 
- * Note also: the debugger manages process state updates so we don't need
- * to send events back to the runtime.
- */
-
- 
-//static void
-//debug_app_job_state_callback(orte_jobid_t jobid, orte_proc_state_t state)
-//{
-	/* this is what it has before, untouched */
-//	switch(state) {
-//		case ORTE_PROC_STATE_TERMINATED:
-//		case ORTE_PROC_STATE_ABORTED:
-//			break;
-//	}
-//}
-
-/*
- * job_state_callback for the debugger. Detects debugger start and exit and notifies the
- * UI. Cleans up job id map.
- */
-/* 
-static void
-debug_job_state_callback(orte_jobid_t jobid, orte_proc_state_t state)
-{
-	ptp_job	*		j;
-	
-	if ((j = find_job(jobid, JOBID_DEBUG)) == NULL)
-		return;
-	
-	do_state_callback(j, state);
-}
-*/
-
-/* 
- * Tell the daemon to exit. 
- * Noops for SLURM.
- */
-static int
-do_slurm_shutdown(void)
-{
-	debug_log(logfp, "do_slurm_shutdown() called.\n"); 
-	return 0;
-}
-
-/* 
- * gethostname_short - equivalent to gethostname, but return only the first
- * component of the fully qualified name 
- * (e.g. "linux123.foo.bar" becomes "linux123") 
- */
-static int
-gethostname_short (char *name, size_t len)
-{
-	int error_code, name_len;
-	char *dot_ptr, path_name[1024];
-
-	error_code = gethostname (path_name, sizeof(path_name));
-	if (error_code)
-		return error_code;
-
-	dot_ptr = strchr (path_name, '.');
-	if (dot_ptr == NULL)
-		dot_ptr = path_name + strlen(path_name);
-	else
-		dot_ptr[0] = '\0';
-
-	name_len = dot_ptr - path_name;
-	if (name_len > len)
-		return ENAMETOOLONG;
-
-	strcpy (name, path_name);
-	return 0;
-}
-
-
-/*
- * Set default srun options.
- */
-static int 
-opt_default(srun_opt_t * opt)
-{
-	char buf[MAXPATHLEN + 1];
-	struct passwd *pw;
-	int i;
-	char hostname[64];
-	
-	if (opt == NULL)
-		return -1;
-
-	if ((pw = getpwuid(getuid())) != NULL) {
-		strncpy(opt->ps_user, pw->pw_name, MAX_USERNAME);
-		opt->ps_uid = pw->pw_uid;
-	} else {
-		debug_log(logfp, "opt_default:who are you?");
-		return -1;
-	}
-
-	opt->ps_gid = getgid();
-
-	if ((getcwd(buf, MAXPATHLEN)) == NULL) {
-		debug_log(logfp,"getcwd failed");
-		return -1;
-	}
-	opt->ps_cwd = strdup(buf); 
-	opt->ps_cwd_set = false;
-	opt->ps_progname = NULL;
-	opt->ps_nprocs = 1;
-	opt->ps_nprocs_set = false;
-	opt->ps_cpus_per_task = 1; 
-	opt->ps_cpus_set = false;
-	opt->ps_min_nodes = 1;
-	opt->ps_max_nodes = 0;
-	opt->ps_min_sockets_per_node = NO_VAL; /* requested min/maxsockets */
-	opt->ps_max_sockets_per_node = NO_VAL;
-	opt->ps_min_cores_per_socket = NO_VAL; /* requested min/maxcores */
-	opt->ps_max_cores_per_socket = NO_VAL;
-	opt->ps_min_threads_per_core = NO_VAL; /* requested min/maxthreads */
-	opt->ps_max_threads_per_core = NO_VAL; 
-	opt->ps_ntasks_per_node      = NO_VAL; /* ntask max limits */
-	opt->ps_ntasks_per_socket    = NO_VAL; 
-	opt->ps_ntasks_per_core      = NO_VAL; 
-	opt->ps_nodes_set = false;
-	opt->ps_cpu_bind_type = 0;
-	opt->ps_cpu_bind = NULL;
-	opt->ps_mem_bind_type = 0;
-	opt->ps_mem_bind = NULL;
-	opt->ps_time_limit = NO_VAL;
-	opt->ps_time_limit_str = NULL;
-	opt->ps_ckpt_interval = 0;
-	opt->ps_ckpt_interval_str = NULL;
-	opt->ps_ckpt_path = NULL;
-	opt->ps_partition = NULL;
-	
-	//use default value:32
-	/* 
-	opt->ps_max_threads = MAX_THREADS;
-	pmi_server_max_threads(opt->ps_max_threads);
-	*/
-
-	opt->ps_relative = NO_VAL;
-	opt->ps_relative_set = false;
-	opt->ps_job_name = NULL;
-	opt->ps_job_name_set = false;
-	opt->ps_jobid = NO_VAL;
-	opt->ps_jobid_set = false;
-	opt->ps_dependency = NULL;
-	opt->ps_account  = NULL;
-	opt->ps_comment  = NULL;
-
-	opt->ps_distribution = SLURM_DIST_UNKNOWN;
-	opt->ps_plane_size   = NO_VAL;
-
-	opt->ps_ofname = NULL;
-	opt->ps_ifname = NULL;
-	opt->ps_efname = NULL;
-
-	opt->ps_core_type = CORE_DEFAULT;
-
-	opt->ps_labelio = false;
-	opt->ps_unbuffered = false;
-	opt->ps_overcommit = false;
-	opt->ps_shared = (uint16_t)NO_VAL;
-	opt->ps_exclusive = false;
-	opt->ps_no_kill = false;
-	opt->ps_kill_bad_exit = false;
-
-	opt->ps_immediate = false;
-
-	opt->ps_join = false;
-	slurm_ctl_conf_t * slurm_ctl_conf_ptr;
-	slurm_load_ctl_conf((time_t)NULL, &slurm_ctl_conf_ptr);
-	opt->ps_max_wait = slurm_ctl_conf_ptr->wait_time;
-
-	opt->ps_quit_on_intr = false;
-	opt->ps_disable_status = false;
-	opt->ps_test_only   = false;
-	
-	opt->ps_quiet = 0;
-
-	opt->ps_job_min_cpus    = NO_VAL;
-	opt->ps_job_min_sockets = NO_VAL;
-	opt->ps_job_min_cores   = NO_VAL;
-	opt->ps_job_min_threads = NO_VAL;
-	opt->ps_job_min_memory  = NO_VAL;
-	opt->ps_task_mem        = NO_VAL;
-	opt->ps_job_min_tmp_disk= NO_VAL;
-
-	opt->ps_hold = false;
-	opt->ps_constraints = NULL;
-	opt->ps_contiguous = false;
-	opt->ps_nodelist = NULL;
-	opt->ps_exc_nodes = NULL;
-	opt->ps_max_launch_time = 120;/* 120 seconds to launch job */
-	opt->ps_max_exit_timeout= 60; /* Warn user 60 seconds after task exit */
-	/* Default launch msg timeout */
-	opt->ps_msg_timeout = slurm_ctl_conf_ptr->msg_timeout;  
-
-	for (i=0; i<SYSTEM_DIMENSIONS; i++)
-		opt->ps_geometry[i] = (uint16_t) NO_VAL;
-	opt->ps_reboot = false;
-	opt->ps_no_rotate = false;
-	opt->ps_conn_type = (uint16_t) NO_VAL;
-	opt->ps_blrtsimage = NULL;
-	opt->ps_linuximage = NULL;
-	opt->ps_mloaderimage = NULL;
-	opt->ps_ramdiskimage = NULL;
-	opt->ps_euid = (uid_t) -1;
-	opt->ps_egid = (gid_t) -1;
-	opt->ps_propagate = NULL;  /* propagate specific rlimits */
-	opt->ps_prolog = slurm_ctl_conf_ptr->srun_prolog;
-	opt->ps_epilog = slurm_ctl_conf_ptr->srun_epilog;
-	opt->ps_task_prolog = NULL;
-	opt->ps_task_epilog = NULL;
-	gethostname_short(hostname, sizeof(hostname));
-	opt->ps_ctrl_comm_ifhn = strdup(hostname);
-	opt->ps_pty = false;
-	opt->ps_open_mode = 0;
-	opt->ps_acctg_freq = -1;
-	
-	if (slurm_ctl_conf_ptr)
-		slurm_free_ctl_conf(slurm_ctl_conf_ptr);
-	
-	return 0;
-}
-
-/* 
- * Initialize option defaults. 
- */
-static int
-set_srun_options_defaults(srun_opt_t * opt)
-{
-	return opt_default(opt);
-}
-
-/*
- * Free space allocated for job "opt". 
- */
-static void 
-free_opt(srun_opt_t * opt)
-{
-	if (opt == NULL)
-		return;
-
-	if (opt->ps_cwd_set == true && opt->ps_cwd != NULL)
-		free(opt->ps_cwd);
-	if (opt->ps_nodes_set == true && opt->ps_nodelist != NULL)
-		free(opt->ps_nodelist);
-	if (opt->ps_ctrl_comm_ifhn) /* allocated in opt_default() */
-		free(opt->ps_ctrl_comm_ifhn);
-}
-
-/*
- * Free space allocated to save srun args in SLURM_SubmitJob().
- */
-static void 
-free_srun_argv(int srun_argc,char ** srun_argv)
-{
-	int i;
-
-	for (i = 0; i< srun_argc; i++) {
-		if (srun_argv[i] != NULL)
-			free(srun_argv[i]);
-	}
-
-	free(srun_argv);
-}
-
-
-/*
- * Create job desc. msg from opts for job allocation.
- * By now, -w/-x options are not supported.
- */
-static job_desc_msg_t * 
-create_job_desc_msg_from_opts(srun_opt_t *opt)
-{
-
-	job_desc_msg_t * j = NULL;
-	
-	assert(opt != NULL);
-	if ((j = (job_desc_msg_t *)malloc(sizeof(job_desc_msg_t))) == NULL) {
-		debug_log(logfp, "Allocate job_desg_msg fail");
-		return NULL;
-	}
-
-	slurm_init_job_desc_msg(j);
-	
-	if (opt->ps_account)
-		j->account = strdup(opt->ps_account);
-
-	j->contiguous     = opt->ps_contiguous;
-	j->features       = opt->ps_constraints;
-	j->immediate      = (uint16_t)opt->ps_immediate;
-	j->name           = opt->ps_job_name;
-
-	if (opt->ps_nodelist) 
-		j->req_nodes = strdup(opt->ps_nodelist);
-	/*
-	 * FIXME: handle -w nodelist request
-	 */
-	/*
-	if(j->req_nodes) {
-		hl = hostlist_create(j->req_nodes);
-		hostlist_ranged_string(hl, sizeof(buf), buf);
-		xfree(opt.nodelist);
-		opt.nodelist = xstrdup(buf);
-		hostlist_uniq(hl);
-		hostlist_ranged_string(hl, sizeof(buf), buf);
-		hostlist_destroy(hl);
-		xfree(j->req_nodes);
-		j->req_nodes = xstrdup(buf);
-	}
-	*/
-	if(opt->ps_distribution == SLURM_DIST_ARBITRARY
-	   && !j->req_nodes) {
-		debug_log(logfp,"With Arbitrary distribution you need to \
-				specify a nodelist or hostfile with the -w option");
-		return NULL;
-	}
-	j->exc_nodes = opt->ps_exc_nodes;
-	j->partition = opt->ps_partition;
-	j->min_nodes = opt->ps_min_nodes;
-	if (opt->ps_min_sockets_per_node != NO_VAL)
-		j->min_sockets = (uint16_t)opt->ps_min_sockets_per_node;
-	if (opt->ps_min_cores_per_socket != NO_VAL)
-		j->min_cores = (uint16_t)opt->ps_min_cores_per_socket;
-	if (opt->ps_min_threads_per_core != NO_VAL)
-		j->min_threads = (uint16_t)opt->ps_min_threads_per_core;
-	j->user_id = opt->ps_uid;
-	j->dependency = opt->ps_dependency;
-	if (opt->ps_nice)
-		j->nice = (uint16_t)(NICE_OFFSET + opt->ps_nice);
-	j->task_dist = (uint16_t)opt->ps_distribution;
-	if (opt->ps_plane_size != NO_VAL)
-		j->plane_size = (uint16_t)opt->ps_plane_size;
-	j->group_id = opt->ps_gid;
-	j->mail_type = opt->ps_mail_type;
-
-	if (opt->ps_ntasks_per_node != NO_VAL)
-		j->ntasks_per_node = (uint16_t)opt->ps_ntasks_per_node;
-	if (opt->ps_ntasks_per_socket != NO_VAL)
-		j->ntasks_per_socket = (uint16_t)opt->ps_ntasks_per_socket;
-	if (opt->ps_ntasks_per_core != NO_VAL)
-		j->ntasks_per_core =(uint16_t)opt->ps_ntasks_per_core;
-
-	if (opt->ps_mail_user)
-		j->mail_user = strdup(opt->ps_mail_user);
-	if (opt->ps_begin)
-		j->begin_time = opt->ps_begin;
-	if (opt->ps_licenses)
-		j->licenses = strdup(opt->ps_licenses);
-	if (opt->ps_network)
-		j->network = strdup(opt->ps_network);
-	if (opt->ps_comment)
-		j->comment = strdup(opt->ps_comment);
-
-	if (opt->ps_hold)
-		j->priority = 0;
-	if (opt->ps_jobid != NO_VAL)
-		j->job_id = opt->ps_jobid;
-
-	#if SYSTEM_DIMENSIONS
-	if (opt->ps_geometry[0] > 0) {
-		int i;
-		for (i=0; i<SYSTEM_DIMENSIONS; i++)
-			j->geometry[i] = opt->ps_geometry[i];
-	}
-	#endif
-
-	if (opt->ps_conn_type != (uint16_t) NO_VAL)
-		j->conn_type = opt->ps_conn_type;
-			
-	if (opt->ps_reboot)
-		j->reboot = 1;
-	if (opt->ps_no_rotate)
-		j->rotate = 0;
-
-	if (opt->ps_blrtsimage)
-		j->blrtsimage = strdup(opt->ps_blrtsimage);
-	if (opt->ps_linuximage)
-		j->linuximage = strdup(opt->ps_linuximage);
-	if (opt->ps_mloaderimage)
-		j->mloaderimage = strdup(opt->ps_mloaderimage);
-	if (opt->ps_ramdiskimage)
-		j->ramdiskimage = strdup(opt->ps_ramdiskimage);
-
-	if (opt->ps_max_nodes)
-		j->max_nodes = opt->ps_max_nodes;
-	if (opt->ps_max_sockets_per_node)
-		j->max_sockets = opt->ps_max_sockets_per_node;
-	if (opt->ps_max_cores_per_socket)
-		j->max_cores = opt->ps_max_cores_per_socket;
-	if (opt->ps_max_threads_per_core)
-		j->max_threads = opt->ps_max_threads_per_core;
-
-	if (opt->ps_job_min_cpus != NO_VAL)
-		j->job_min_procs = opt->ps_job_min_cpus;
-	if (opt->ps_job_min_sockets != NO_VAL)
-		j->job_min_sockets = opt->ps_job_min_sockets;
-	if (opt->ps_job_min_cores != NO_VAL)
-		j->job_min_cores = opt->ps_job_min_cores;
-	if (opt->ps_job_min_threads != NO_VAL)
-		j->job_min_threads = opt->ps_job_min_threads;
-	if (opt->ps_job_min_memory != NO_VAL)
-		j->job_min_memory = opt->ps_job_min_memory;
-	if (opt->ps_job_min_tmp_disk != NO_VAL)
-		j->job_min_tmp_disk = opt->ps_job_min_tmp_disk;
-	if (opt->ps_overcommit) {
-		j->num_procs  = opt->ps_min_nodes;
-		j->overcommit = opt->ps_overcommit;
-	} else
-		j->num_procs  = opt->ps_nprocs * opt->ps_cpus_per_task;
-	if (opt->ps_nprocs_set)
-		j->num_tasks  = opt->ps_nprocs;
-
-	if (opt->ps_cpus_set)
-		j->cpus_per_task = opt->ps_cpus_per_task;
-
-	if (opt->ps_no_kill)
-		j->kill_on_node_fail = 0;
-	if (opt->ps_time_limit != NO_VAL)
-		j->time_limit  = opt->ps_time_limit;
-	j->shared = opt->ps_shared;
-
-	/*
-	 * srun uses the same listening port for the allocation response
-	 * message as for all other message.
-	 * slurmctld_comm_addr structure initialized by slurmctld_msg_init()
-	 */
-	j->alloc_resp_port = slurmctld_comm_addr.port;
-	j->other_port = slurmctld_comm_addr.port;
-
-	return j;
-}
-
-/*
- * Callback handlers for job allocation.
- */
-static void 
-timeout_handler(srun_timeout_msg_t *msg)
-{
-	static time_t last_timeout = 0;
-
-	if (msg->timeout != last_timeout) {
-		last_timeout = msg->timeout;
-		debug_log(logfp,"callback--->timeout_handler:");
-		debug_log(logfp,"job time limit to be reached at %s", 
-			ctime(&msg->timeout));
-	}
-}
-
-static void 
-user_msg_handler(srun_user_msg_t *msg)
-{
-	debug_log(logfp,"callback--->usr_msg_handler: %s", msg->msg);
-}
-
-static void
-ping_handler(srun_ping_msg_t *msg) 
-{
-	debug_log(logfp,"callback--->pingt_handler:");
-}
-
-
-static void 
-node_fail_handler(srun_node_fail_msg_t *msg)
-{
-	debug_log(logfp,"callback--->node_fail_handler: Node failure on %s", msg->nodelist);
-}
-
-static void 
-job_complete_handler(srun_job_complete_msg_t * msg)
-{
-	debug_log(logfp,"callback--->job_complete_handler: Force Terminate job\n");
-}
-
-static bool 
-wait_retry()
-{
-	static int count = 0;
-
-	if (count < MAX_RETRIES) {
-		sleep(++count);
-		return true;
-	}else
-		return false;
-}
-
-/*
- * Install signo handler.
- */
-static SigFunc *
-xsignal(int signo, SigFunc *f)
-{
-	struct sigaction sa, old_sa;
-
-	sa.sa_handler = f;
-	sigemptyset(&sa.sa_mask);
-	sigaddset(&sa.sa_mask, signo);
-	sa.sa_flags = 0;
-	if (sigaction(signo, &sa, &old_sa) < 0)
-		debug_log(logfp,"xsignal(%d) failed: %m", signo);
-
-	return old_sa.sa_handler;
-}
-
-/*
- * Signal handler during allocating jobs.
- */
-static void
-signal_while_allocating(int signo)
-{
-	destroy_job = 1;
-	if (sync_msg_addr && (sync_msg_addr->slurm_jobid > 0)) 
-		slurm_complete_job(sync_msg_addr->slurm_jobid, 0);
-}
-
-
-/*
- * Pending callback during block job allocation.
- */
-static void
-set_pending_jobid(uint32_t id)
-{
-	/* 
-	 * This callback can set the jobid even in the case of blocking allocation.
-	 * So proxy agent can get the slurm jobid and will not block .
-	 */
-	 if (sync_msg_addr != NULL) {
-		sync_msg_addr->slurm_jobid = (int) id;
-		sync_msg_addr->jobid_set = true;
-	}
-}
-
-static void 
-ignore_signal(int signo)
-{
-	/*do nothing*/
-}
-
-/*
- * Release allocated memory in job_desc_msg.
- */
-static void 
-destroy_job_desc_msg(job_desc_msg_t * j)
-{
-	if (j != NULL) {
-		if (j->account != NULL)
-			free(j->account);
-		if (j->req_nodes != NULL) 
-			free(j->req_nodes);
-		if (j->mail_user != NULL)
-			free(j->mail_user);
-		if (j->licenses != NULL)
-			free(j->licenses);
-		if (j->network != NULL)
-			free(j->network);
-		if (j->comment != NULL)
-			free(j->comment);
-		if (j->blrtsimage != NULL)
-			free(j->blrtsimage);
-		if (j->linuximage != NULL)
-			free(j->linuximage);
-		if (j->mloaderimage != NULL)
-			free(j->mloaderimage);
-		if (j->ramdiskimage != NULL)
-			free(j->ramdiskimage);
-
-		free(j);
-	}
-}
-
-/*
- * Create a socket to communicate with slurmctld 
- * during job allocation. This fd will be closed
- * on executing srun after job allocation.
- */
-slurm_fd 
-slurm_init_msg_engine_port(uint16_t port)
-{
-	slurm_addr addr;
-
-	int fd;
-	int rc;
-	const int one = 1;
-	const size_t sz1 = sizeof(one);
-
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons(port);
-	addr.sin_addr.s_addr = htonl(INADDR_ANY);
-
-	if ((fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
-		debug_log(logfp,"create slurmctld socket error\n");
-		return fd;
-	}
-	rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,&one,sz1);
-	if (rc < 0) {
-		goto error;
-	}
-	rc = bind(fd, &addr, sizeof(addr));
-	if (rc < 0) {
-		goto error;
-	}
-	rc = listen(fd, 128);
-	if(rc < 0) {
-		goto error;
-	}
-	
-	return fd;
-
-error:
-	if ((close(fd) < 0) && (errno == EINTR))
-		close(fd); /*try again*/
-	return rc;
-}
-
-
-/* 
- * Init socket fd to handle message from slurmctld.
- */
-slurm_fd 
-slurmctld_msg_init(srun_opt_t * opt)
-{
-	slurm_addr slurm_address;
-	uint16_t port;
-	static slurm_fd slurmctld_fd = 0;
-	socklen_t name_len;
-	int fval;
-	int rc;
-	
-	if (slurmctld_fd)
-		return slurmctld_fd;
-
-	slurmctld_fd = -1;
-	slurmctld_comm_addr.hostname = NULL;
-	slurmctld_comm_addr.port = 0;
-	
-	/* open socket */
-	if ((slurmctld_fd = slurm_init_msg_engine_port(0)) < 0) {
-		debug_log(logfp, "slurm_init_msg_engine_port error\n");
-		return -1;	
-	}
-
-	/* get socket port number */	
-	name_len = sizeof(slurm_address);
-	if ((rc = getsockname(slurmctld_fd, &slurm_address, &name_len)) < 0) {
-		debug_log(logfp, "getsockname error\n");
-		return -1;
-	}
-
-	/* set non-blocking */
-	fval = fcntl(slurmctld_fd, F_GETFL, 0);
-	fcntl(slurmctld_fd, F_SETFL, fval|O_NONBLOCK);
-
-	/* set FD_CLOEXEC: close slurmctld_fd when exec(srun) after allocation */
-	fval = fcntl(slurmctld_fd, F_GETFD, 0);
-	fcntl(slurmctld_fd, F_SETFD, fval|FD_CLOEXEC);
-	
-	/* set global var.: slurmctld_comm_addr */
-	slurmctld_comm_addr.hostname = strdup(opt->ps_ctrl_comm_ifhn);
-	port = ntohs(slurm_address.sin_port);
-	slurmctld_comm_addr.port = port;
-
-	return slurmctld_fd;
-}
-
-/*
- * Allocate job resource in response to SubmitJob cmd.
- * Called in child process 
- */
-static resource_allocation_response_msg_t *
-allocate_nodes(srun_opt_t *opt)
-{
-	resource_allocation_response_msg_t *resp = NULL;
-	slurm_allocation_callbacks_t callbacks;
-
-	slurmctld_msg_init(opt);
-	job_desc_msg_t *j = create_job_desc_msg_from_opts(opt);
-	if (!j) 
-		return NULL;
-	
-	/* 
-	 * Do not re-use existing job id when submitting new job
-	 * from within a running job 
-	 */
-	if ((j->job_id != NO_VAL) && !opt->ps_jobid_set) {
-		if (!opt->ps_jobid_set)	/* Let slurmctld set jobid */
-			j->job_id = NO_VAL;
-	}
-	callbacks.ping = ping_handler;
-	callbacks.timeout = timeout_handler;
-	callbacks.job_complete = job_complete_handler;
-	callbacks.user_msg = user_msg_handler;
-	callbacks.node_fail = node_fail_handler;
-
-	/* create message thread to handle pings and such from slurmctld */
-	msg_thr = slurm_allocation_msg_thr_create(&j->other_port, &callbacks);
-
-	xsignal(SIGHUP, signal_while_allocating);
-	xsignal(SIGINT, signal_while_allocating);
-	xsignal(SIGQUIT, signal_while_allocating);
-	xsignal(SIGPIPE, signal_while_allocating);
-	xsignal(SIGTERM, signal_while_allocating);
-	xsignal(SIGUSR1, signal_while_allocating);
-	xsignal(SIGUSR2, signal_while_allocating);
-
-//	while (!resp) 
-	{
-		/* 
-		 * BLOCK unitl allocation granted or interrupt by signal
-		 * if allocation blocked/pending, 
-		 * the jobid can be returned to parent by 'set_pending_jobid' callback
-		 */
-		resp = slurm_allocate_resources_blocking(j, 0, set_pending_jobid);
-		if (resp == NULL)
-			debug_log(logfp, "blocking job allocate error!\n");
-//		if (destroy_job) /* interrupt by signal */
-//			break;
-//	 	else if(!resp && !wait_retry()) /* time out */ 
-//			break;		
-	}
-	
-
-	xsignal(SIGHUP, ignore_signal);
-	xsignal(SIGINT, ignore_signal);
-	xsignal(SIGQUIT, ignore_signal);
-	xsignal(SIGPIPE, ignore_signal);
-	xsignal(SIGTERM, ignore_signal);
-	xsignal(SIGUSR1, ignore_signal);
-	xsignal(SIGUSR2, ignore_signal);
-
-	destroy_job_desc_msg(j);
-	return resp;
-}
-
-static int 
-handle_attach_debug()
-{
-	return 0;
-}
-
-static int 
-handle_debug()
-{
-	return 0;
-}
-
-/*
- * Create a thread to retrieve srun's stdout/stderr,
- * and send to ptp ui.
- */
-static int 
-create_iothread(ptp_job * job)
-{
-	pthread_attr_t attr;
-	pthread_t iothread_id;
-	int rc;
-				
-	pthread_attr_init(&attr);
-	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-	if (pthread_create(&iothread_id, &attr, srun_output_forwarding, (void *)job) == 0 ) {
-		job->iothread_id = iothread_id;
-		debug_log(logfp, "iothread created for job[%d].\n", job->slurm_jobid);
-		rc = 0;
-	} else {
-		debug_log(logfp,"error on creating iothread for job[%d].\n", job->slurm_jobid);
-		rc =  -1;
-	}	
-
-	return rc;
-}
-
-/*
- * Allocate job resource if necessary, launch job
- * and forward job stdout/stderr to ptp ui. 
- */
-static int 
-allocate_and_launch_job(int trans_id, char * jobsubid, ptp_job * in, srun_opt_t * opt, int srun_argc, char * srun_argv[])
-{
-	int i;
-	int shmid;
-	int fd_out[2];
-	int fd_err[2];
-	bool need_alloc;
-	pid_t pid;
-	int rc;
-	char * ptr;
-	sync_msg * pp, *pc;
-	char * msg;
-	ptp_job * job;
-	char * name;
-	ptp_process  * p;
-	int node_id = -1;
-	int task_id = -1;
-	int proc_pid = -1;
-	ptp_machine * m;
-	ptp_node * n;
-	int kill_jobid = -1;
-	int allocated_jobid = -1;
-	resource_allocation_response_msg_t * resp = NULL;
-
-	/* create a shared memory region to communiate/synchronize with child process */
-	if ((shmid = shmget(IPC_PRIVATE, sizeof(sync_msg), SHM_R|SHM_W)) < 0) {
-		debug_log(logfp,"error on creating shared memory\n");
-		return -1;
-	}
-	/* init shm */
-	pp = (sync_msg *)shmat(shmid, 0, 0);
-	pp->slurm_jobid = JOBID_INIT;
-	pp->jobid_set = false; 
-	pp->io_ready = false;
-
-	pipe(fd_out);
-	pipe(fd_err); 
-	
-	if (opt->ps_jobid == NO_VAL && opt->ps_jobid_set == false)
-		need_alloc = true;
-	else {
-		need_alloc = false;
-		allocated_jobid = opt->ps_jobid;
-	}	
-
-	switch (pid = fork()) {
-	case 0:	/* child: allocate job if necessary and launch job via srun */
-		/* attach shm */
-		pc = (sync_msg *)shmat(shmid, 0, 0);
-		/*
-		 * save shm addr in a global variable.
-		 * if job allocation blocked, SLURM callback can store the pending job id at this addr, 
-		 * so parent can get the slurm jobid without blocking.
-		 */
-		sync_msg_addr = pc;
-
-		if (need_alloc) { /* require new job allocation */
-			resp = allocate_nodes(opt);			
-			if (resp == NULL || resp->node_list == NULL) { /* allocation fail, rarely happen */
-				pc->slurm_jobid = JOBID_FAIL;
-				pc->jobid_set = true;
-				shmdt(pc);
-				exit(EXIT_JOB_ALLOC_FAIL); 
-			}
-
-			/* allocation granted */
-			if (pc->jobid_set  == false) {
-				pc->slurm_jobid = resp->job_id;
-				pc->jobid_set = true;
-			}	
-			
-			kill_jobid = resp->job_id;
-
-			asprintf(&ptr,"%d",(int)resp->job_id);
-			/* srun will no more allocate resource if SLURM_JOBID set. */
-			setenv("SLURM_JOBID", ptr, 1);
-			free(ptr);
-			if (resp)
-				slurm_free_resource_allocation_response_msg(resp);
-		}
-		else { 
-			/* 
-			 * run in allocated job (required by ATTACH debug)
-			 */
-			pc->slurm_jobid = allocated_jobid;
-			pc->jobid_set = true;
-			asprintf(&ptr,"%d",allocated_jobid);
-			setenv("SLURM_JOBID", ptr, 1);
-			free(ptr);
-		}
-		/*
-		 * BLOCK until parent sets io_ready to true,
-		 * which means the io thread is ready.
-		 * Parent sets this flag after getting jobid and create iothread.
-		 */
-		while (!pc->io_ready && wait_retry()) {
-			continue;
-		}
-
-		if (!pc->io_ready) {
-			if (need_alloc){
-				//slurm_complete_job(kill_jobid, 0);
-				slurm_kill_job(kill_jobid, SIGKILL, 0);
-			}	
-			shmdt(pc);
-			debug_log(logfp, "child exits due to iothread fail\n");
-			exit(EXIT_JOB_IOTHREAD_FAIL); 
-		} else { /* io thread ready */
-			shmdt(pc);
-			/* redirect srun's stdout and stderr */
-			close(fd_out[0]);
-			close(fd_err[0]);
-			/* job stdout+stderr ==> srun's stdout */
-			dup2(fd_out[1],1);
-			/* srun outputs ==> srun's stderr */
-			dup2(fd_err[1],2);
- 			/* spawn job with srun cmd */
-			rc = execvp(srun_argv[0], srun_argv); 
-			if (rc < 0) {/* rarely happens */
-				if (need_alloc) {
-					//slurm_complete_job(kill_jobid, 0);
- 					slurm_kill_job(kill_jobid, SIGKILL, 0);
-				}	
-				debug_log(logfp,"srun exec fail\n");
-				exit(EXIT_EXEC_FAIL); 
-			}	
-		}
-		break;
-	case -1:/* error */
-		debug_log(logfp,"child fork error\n");
-		close(fd_out[0]);
-		close(fd_out[1]);
-		close(fd_err[0]);
-		close(fd_err[1]);
-		if (pp)
-			shmdt(pp);
-		shmctl(shmid,IPC_RMID, 0);
-		return -1;
-	default:/* parent */
-		/* 
-		 * BLOCK until child set the slurm jobid  
-		 */
-		while (!pp->jobid_set && wait_retry()) {
-			continue;
-		}
-		if (!pp->jobid_set || pp->slurm_jobid == JOBID_FAIL) { 
-			msg = "Job allocation fail!\nPlease check RMS and job config parameters!";
-			debug_log(logfp, msg);
-			sendJobSubErrorEvent(trans_id, jobsubid, msg);
-			close(fd_out[0]);
-			close(fd_out[1]);
-			close(fd_err[0]);
-			close(fd_err[1]);
-			shmdt(pp);
-			kill(pid, SIGKILL); 
-			shmctl(shmid, IPC_RMID, 0);
-			return -1;
-		}
-
-		/* ceate job structure after getting slurm jobid */
-		in->slurm_jobid = pp->slurm_jobid;
-		job = new_job(in->num_procs, in->debug, in->ptp_jobid, in->slurm_jobid, in->debug_jobid, need_alloc);
-		job->srun_pid = pid;
-		
-		
-		/* send OK event for SubmitJob cmd */	
-		sendOKEvent(trans_id);
-	
-		/* send NewJob event */
-		asprintf(&name, SLURM_JOB_NAME_FMT, job->slurm_jobid);
-		sendNewJobEvent(gTransID, job->ptp_jobid, name, jobsubid, JOB_STATE_INIT);
-		free(name);
-
-		/*
-		 * As required by ptp ui,
-		 * one NewProcess Event MUST be sent for each process of this new job.
-		 */
-		task_id = 0;
-		node_id = 0;
-		proc_pid = 0;
-		SetList(gMachineList);
-		/* By now, only 1 machine is supported */
-		m = (ptp_machine *)GetFirstElement(gMachineList);
-		SetList(m->nodes);
-		n = (ptp_node *)GetListElement(m->nodes);
-		node_id = n->id; /* node_id calculated by generateid() */
-
-		for (i = 0; i < job->num_procs; i++) {
-			/*
-			 * SLURM provide no API to get pid ,node_id and task_id.
-			 * And these information can obtained ONLY after job launching.
-			 * So FAKE them by now. 
-			 * sendNewProcessEvent() shouldn't make use of these fileds.
-			 * FIXME:
-			 *	call slurm_job_step_layout_get() to obtain such information
-			 *	and send to ui via sendProcessChangeEvent	
-			 */
-			p = new_process(job, node_id, task_id, proc_pid);
-			sendNewProcessEvent(gTransID, job->ptp_jobid, p, PROC_STATE_STARTING);
-			task_id += 1;
-			proc_pid += 1;
-		 }
-
-		close(fd_out[1]);
-		close(fd_err[1]);
-		job->fd_out = fd_out[0];
-		job->fd_err = fd_err[0];
-
-		/* 
-		 * Create io thread to manage srun's stderr and stdout 
-	     * Don't start it before sending the NewProcess events!
-	     */
-		if (create_iothread(job) == 0) {
-			pp->io_ready = true;
-		} else {
-			pp->io_ready = false;
-			job->iothread_exit = true;
-		}
-		shmdt(pp);
-		shmctl(shmid, IPC_RMID, 0);
-		return 0;
-	}
-
-	return 0;
-}
-
-/*
- * Search $CWD and $PATH dir and return the absolute path of cmd. 
- */
-static char *
-get_path(char * cmd, char * cwd, int mode)
-{
-	char * path = NULL;
-	char * fullpath = NULL;
-	char * c;
-	char * ptr;
-
-	if ( (cmd[0] == '.' || cmd[0] == '/')
-		&& access(cmd, mode) == 0) {
-		if (cmd[0] == '.') 
-			asprintf(&fullpath,"%s/%s",cwd,cmd);
-		else 
-			asprintf(&fullpath,cmd);
-	} else {
-		/* search $PATH */
-		path = getenv("PATH");
-		if (path != NULL) {
-			c = ptr = path;
-			while((c=strchr(ptr,':')) != NULL) {
-				*c = '\0';
-				asprintf(&fullpath, "%s/%s",ptr,cmd);
-				if (access(fullpath, mode) == 0)
-					break;
-				else {
-					free(fullpath);
-					fullpath = NULL;
-					ptr = c + 1;
-				}	
-			}
-			/* handle the last element */
-			if (*ptr != '\0') {
-				asprintf(&fullpath, "%s/%s",ptr,cmd);
-				if (access(fullpath, mode) != 0) {
-					free(fullpath);
-					fullpath = NULL;
-				}	
-			}
-		}
-	}
-	return fullpath;
-}
-
-ssize_t fd_read_line(int fd, void *buf, size_t maxlen)
-{
-    ssize_t n, rc;
-    unsigned char c, *p;
-
-    n = 0;
-    p = buf;
-    while (n < maxlen - 1) {   /* reserve space for NUL-termination */
-		if ((rc = read(fd, &c, 1)) == 1) {
-			n++;
-			*p++ = c;
-			if (c == '\n')
-				break;         /* store newline, like fgets() */
-		}else if (rc == 0) {
-			if (n == 0)        /* EOF, no data read */
-				return(0);
-			else               /* EOF, some data read */
-				break;
-		}else {
-			if (errno == EINTR)
-				continue;
-			return(-1);
-		}
-	}
-
-	*p = '\0';  /* NULL-terminate, like fgets() */
-	return(n);
-}
-
-/*
- * Forwarding srun's stdout to ptp ui
- * FIXME:
- * 		How about srun's stderr? By now, it's ignored.
- */
-void *
-srun_output_forwarding(void * arg)
-{
-	int fd = -1;
-	char * ptr;
-	ptp_job * job;
-	int task_id;
-	fd_set rfds;
-	struct timeval tv;
-	char buf[MAX_BUF_SIZE];
-	FILE * fp = NULL;
-	int cancel_state;
-	int cancel_type;
-	int	ret;
-	char * p;
-	pid_t cpid;
-	int status;
-	
-	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE,&cancel_state);
-	pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &cancel_type);
-	
-	job = (ptp_job *)arg;
-	job->iothread_exit = false;
-	/* By now only focus on job stdout */
-	fd = job->fd_out;
-	
-	while (1)
-	{
-		if (job->iothread_exit_req) {
-			debug_log(logfp, "job[%d] iothread exit on exit_request.\n", job->slurm_jobid);
-			job->iothread_exit = true;
-			if (fp)
-				fclose(fp);
-			pthread_exit(NULL);
-		}
-		
-		tv.tv_sec = 0;
-		tv.tv_usec = 5000;
-		
-		/* 
-		 * if timeout, the rfds will be cleared 
-		 * rfds must be set in each iteration
-		 */
-		FD_ZERO(&rfds);
-		FD_SET(fd, &rfds);
-		ret = select(fd+1,&rfds,NULL,NULL,&tv);
-
-		switch(ret)
-		{
-		case -1: /* error */
-			debug_log(logfp,"job[%d] iothread exit on select error\n",job->slurm_jobid);
-			if (fp)
-				fclose(fp);
-			job->iothread_exit = true;
-			pthread_exit(NULL);
-			break;
-
-		case 0: /* timeout */
-			//debug_log(logfp,"select timeout\n");
-			break;
-				
-		default: /* fd ready */
-			if (fp == NULL)
-				fp = fdopen(fd,"r");
-			if (fgets(buf, sizeof(buf), fp) != NULL) {
-			//if ((rc = fd_read_line(fd, buf, sizeof(buf)))> 0 ) {
-				p = buf;
-				/* get task id from srun label */
-				task_id = atoi(p);
-				ptr = strchr(p, ':');
-				ptr ++;
-				if (ptr != NULL) {
-					//debug_log(logfp,"send task[%d] output to ptp ui\n", task_id);
-					/* 
-					 * no synchronization needed 
-					 * since the event list is internally protected by pthread_mutex
-					 */
-					ptp_process * proc;
-					proc = find_process(job, task_id);
-					sendProcessOutputEvent(gTransID, proc->id, ptr);
-				} else 
-					debug_log(logfp,"process label not found\n");
-			} else { /* error or EOF of pipe(write end closed) */
-				debug_log(logfp,"EOF of pipe\n");
-				if (fp)
-					fclose(fp);
-				job->iothread_exit = true;
-				cpid = waitpid(job->srun_pid, &status, 0);
-				if (cpid == job->srun_pid) {
-					if (WIFEXITED(status)) {
-						if (job->need_alloc)
-							slurm_complete_job(job->slurm_jobid, 0);
-						debug_log(logfp, "srun exit code:%d\n", WEXITSTATUS(status));
-					}
-					else if (WIFSIGNALED(status)) {
-						if (job->need_alloc)
-							slurm_kill_job(job->slurm_jobid, SIGKILL, 0);
-						debug_log(logfp, "srun terminated by signal[%d]\n", WTERMSIG(status));
-					}
-					pthread_exit(NULL);
-				}
-			}	
-			break; 
-		}	
-	}		
-	
-	return NULL;
-}
-
-/*
- * Delete removable job fro gJobList.
- */
-static void 
-purge_global_joblist()
-{
-	ptp_job * j;
-	
-	for (SetList(gJobList); (j = (ptp_job *)GetListElement(gJobList)) != NULL; ) {
-		if (j->iothread_exit && !slurm_job_active(j))
-			j->removable = true;
-		if (j->removable) {
-			RemoveFromList(gJobList, j);
-			free_job(j);
-		}	
-	}
-	return;
-}
-
-
-/******************************
- * START OF DISPATCH ROUTINES *
- ******************************/
-
-int
-SLURM_Initialize(int trans_id, int nargs, char **args)
-{
-	int		i;
-	int 	primary = 1;
-	int 	secondary = 2;
-	long	version;
-	
-	debug_log(logfp, "SLURM_Initialize (%d):\n", trans_id);
-	
-	if (proxy_state != STATE_INIT) {
-		sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "Already initialized");
-		return PROXY_RES_OK;
-	}
-	
-	for (i = 0; i < nargs; i++) {
-		if (proxy_test_attribute(PROTOCOL_VERSION_ATTR, args[i])) {
-			if (strcmp(proxy_get_attribute_value_str(args[i]), WIRE_PROTOCOL_VERSION) != 0) {
-				sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "Wire protocol version \"%s\" not supported", args[0]);
-				return PROXY_RES_OK;
-			}
-		} else if (proxy_test_attribute(BASE_ID_ATTR, args[i])) 
-			gBaseID = proxy_get_attribute_value_int(args[i]);
-	}
-
-	if (gBaseID < 0) {
-		sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "No base ID supplied");
-		return PROXY_RES_OK;
-	}
-	
- 	/* confirm slurmctld works well via slurm_ping */ 
-	if (slurm_ping(primary) && slurm_ping(secondary)) {
-		sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "No response from slurmctld. Check SLURM RMS!");
-		return PROXY_RES_OK;
-	}	
-  	/* 
-	 * SLURM version verfication,
-	 * Should work on more versions supporting used API. 
-	 */
-	 version = slurm_api_version();
-	 if (version < SLURM_VERSION_NUM(1,3,4)) {
-		sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "SLURM version number too low");
-		return PROXY_RES_OK;
-	 }
-
-	proxy_state = STATE_RUNNING;
-	sendOKEvent(trans_id);
-	
-	return PROXY_RES_OK;
-}
-
-/*
- * Init the model definition phase.
- */
-int
-SLURM_ModelDef(int trans_id, int nargs, char **args)
-{
-	debug_log(logfp, "SLURM_ModelDef (%d):\n", trans_id); 
-	
-	sendOKEvent(trans_id);
-	return PROXY_RES_OK;
-}
-
-int
-SLURM_StopEvents(int trans_id, int nargs, char **args)
-{
-	debug_log(logfp, "SLURM_StopEvents (%d):\n", trans_id); 
-
-	/* Notify that tartEvents complete */
-	sendOKEvent(gTransID);
-	gTransID = 0;
-	sendOKEvent(trans_id);
-	return PROXY_RES_OK;	
-}
-
-
-/*
- * Submit a job with the given executable path and arguments. 
- * (1)Process cmd arguments;
- * (2)Distinguish between debug job and non-debug job;
- * (3)Allocate resource and spawn job step.
- */
-int
-SLURM_SubmitJob(int trans_id, int nargs, char **args)
-{
-	int		i,k;
-	int		num_args = 0;
-	int		num_env = 0;
-	char *	jobsubid = NULL; /* jobid assigned by RMS(ui) */
-	
-	/* srun options: -n, -N, -t, -p, -l, -v, --jobid, -w, -x, --job_type */
-	int		num_procs = 0; /* -n: number of tasks to run*/
-	int		num_nodes = 0; /* -N: number of nodes on which to run (N=min[-max]) */
-	int		tlimit = -1;   /* -t: time limit */		
-	bool 	tlimit_set = false;
-	char * 	partition = NULL; /* -p: partition requested */
-	bool	partition_set = false;
-	bool	io_label = false; /* -l: prepend task number to lines of stdout/err */
-	bool 	io_label_set = false;
-	bool 	verbose = false;	/* -v:verbose mode */
-	bool	verbose_set = false;
-	char * 	node_list=NULL;	/* -w: request a specific list of hosts */
-	bool	nodelist_set = false;
-	int		allocated_jobid; /* --jobid: run under already allocated job */
-	bool	jobid_set = false;
-	char * 	jobtype = NULL;	/* --job_type:mpi,omp,serial */
-	bool	jobtype_set = false;
-
-	char *	full_path = NULL;
-	char *	cwd = NULL;
-	char *	exec_path = NULL; /* PATH of executable */
-	char *	pgm_name = NULL; 
-	
-	/* debug job support */ 
-	bool	debug = false;
-	int		debug_argc = 0;
-	int		attach_mode;
-	char *	debug_exec_name = NULL;
-	char *	debug_exec_path = NULL;
-	char *	debug_full_path;
-	char **	debug_args = NULL;
-
-	int		srun_argc = 0;
-	char ** srun_argv = NULL;
-	int 	ret;
-	int		ptpid = generate_id();
-
-	debug_log(logfp, "SLURM_SubmitJob (%d):\n", trans_id);
-	/* Process job submit args  */
-	debug_log(logfp, "job submit commands:\n");
-	for (i = 0; i < nargs; i++) {
-		debug_log(logfp, "\t%s\n", args[i]);
-		if (proxy_test_attribute(SLURM_JOB_SUB_ID_ATTR, args[i])) {
-			jobsubid = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_NUM_PROCS_ATTR, args[i])) {
-			num_procs = proxy_get_attribute_value_int(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_NUM_NODES_ATTR, args[i])) {
-			num_nodes = proxy_get_attribute_value_int(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_TIME_LIMIT_ATTR, args[i])) {
-			tlimit_set = true;
-			tlimit = proxy_get_attribute_value_int(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_PARTITION_ATTR, args[i])) {
-			partition_set = true;
-			partition = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_IOLABEL_ATTR, args[i])) {
-			io_label_set = true;
-			io_label = proxy_get_attribute_value_bool(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_VERBOSE_ATTR, args[i])) {
-			verbose_set = true;
-			verbose = proxy_get_attribute_value_bool(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_ID_ATTR, args[i])) {
-			jobid_set = true;
-			allocated_jobid = proxy_get_attribute_value_int(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_TYPE_ATTR, args[i])) {
-			jobtype_set = true;
-			jobtype = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_NODELIST_ATTR, args[i])) {
-			nodelist_set = true;
-			node_list = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_EXEC_NAME_ATTR, args[i])) {
-			pgm_name = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_EXEC_PATH_ATTR, args[i])) {
-			exec_path = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_WORKING_DIR_ATTR, args[i])) {
-			cwd = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(SLURM_JOB_PROG_ARGS_ATTR, args[i])) {
-			num_args++;
-		} else if (proxy_test_attribute(SLURM_JOB_ENV_ATTR, args[i])) {
-			num_env++;
-		} else if (proxy_test_attribute(SLURM_JOB_DEBUG_ARGS_ATTR, args[i])) {
-			debug_argc++;
-		} else if (proxy_test_attribute(SLURM_JOB_DEBUG_FLAG_ATTR, args[i])) {
-			debug = proxy_get_attribute_value_bool(args[i]);
-		}
-	}
-
-	/* Do some checking first */
-	if (jobsubid == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_SLURM_SUBMIT, "missing ID on job submission");
-		return PROXY_RES_OK;
-	}
-	if (proxy_state != STATE_RUNNING) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "must call INIT first");
-		return PROXY_RES_OK;
-	}
-	if (nargs < 1) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "incorrect arg count");
-		return PROXY_RES_OK;
-	}
-	if (pgm_name == NULL) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "must specify a program name");
-		return PROXY_RES_OK;
-	}
-	if (num_procs <= 0) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "must specify number of task to launch");
-		return PROXY_RES_OK;
-	}
-
-	/*
-	 * Process environment variables. 
-	 * Environment variables will be brought to compute node 
-	 * by SLURM before launching job. 
-	 */
-	if (num_env > 0) {
-		for (i = 0; i < nargs; i++) {
-			if (proxy_test_attribute(SLURM_JOB_ENV_ATTR, args[i]))
-				putenv(proxy_get_attribute_value_str(args[i]));
-		}
-	}
-	/* locate execuable */
-	if (exec_path == NULL) {
-		full_path = get_path(pgm_name, cwd, X_OK);
-		if (full_path == NULL) {
-			sendJobSubErrorEvent(trans_id, jobsubid, "executable not found");
-			return PROXY_RES_OK;
-		}
-	} else 
-		asprintf(&full_path, "%s/%s", exec_path, pgm_name);
-	/* check access right */		
-	if (access(full_path, X_OK) < 0) {
-		sendJobSubErrorEvent(trans_id, jobsubid, strerror(errno));
-		if (full_path != NULL)
-			free(full_path);
-		return PROXY_RES_OK;
-	}
-	
-	/* allocate space for srun args */
-	srun_argv = (char **)malloc(sizeof(char *)*MAX_SRUN_ARG_NUM);
-	if (srun_argv == NULL) {
-		debug_log(logfp, "memory allocation for srun_argv fail");
-		sendJobSubErrorEvent(trans_id, jobsubid, "memory allocation for srun_args fail");
-		return PROXY_RES_OK;
-	}
-
-	/*
-	 *FIXME: more debug job support will be added soon.
-	 */
-	/****************handle debug job*****************/
-	if (debug) {		
-		debug_argc++;
-		debug_args = (char **)malloc((debug_argc+1) * sizeof(char *));
-		for (i = 0, k = 1; i < nargs; i++) {
-			if (proxy_test_attribute(SLURM_JOB_DEBUG_ARGS_ATTR, args[i])) {
-				debug_args[k++] = proxy_get_attribute_value_str(args[i]);
-			} else if (proxy_test_attribute(SLURM_JOB_DEBUG_EXEC_NAME_ATTR, args[i])) {
-				debug_exec_name = proxy_get_attribute_value_str(args[i]);
-			} else if (proxy_test_attribute(SLURM_JOB_DEBUG_EXEC_PATH_ATTR, args[i])) {
-				debug_exec_path = proxy_get_attribute_value_str(args[i]);
-			}
-		}
-		debug_args[k] = NULL;
-		
-		/*
-		 * If no path specified, try to locate execuable.
-		 */		
-		if (debug_exec_path == NULL) {
-			debug_full_path = get_path(debug_exec_name, cwd, X_OK);
-			if (debug_full_path == NULL) {
-				sendJobSubErrorEvent(trans_id, jobsubid, "Debugger executuable not found");
-				return PROXY_RES_OK;
-			}
-		} else {
-			asprintf(&debug_full_path, "%s/%s", debug_exec_path, debug_exec_name);
-		}
-		
-		if (access(debug_full_path, X_OK) < 0) {
-			sendJobSubErrorEvent(trans_id, jobsubid, strerror(errno));
-			if (debug_full_path != NULL)
-				free(debug_full_path);
-			return PROXY_RES_OK;
-		}
-
-		debug_args[0] = strdup(debug_full_path);
-		if (debug_full_path != NULL)
-			free(debug_full_path);
-	}
-	/*******************************************************/
-
-	/* set default srun options */
-	set_srun_options_defaults(&opt);
-
-	/*
-	 * change srun options based on SubmitJob cmd args
-	 * and prepare srun_argc,srun_argv
-	 */
-	int index = 0;
-	srun_argv[index++] = strdup("srun");
-
-	if (num_procs > 0) {
-		opt.ps_nprocs = num_procs;
-		opt.ps_nprocs_set = true;
-		asprintf(&(srun_argv[index]), "--ntasks=%d", opt.ps_nprocs);
-		index += 1;
-	}	
-	if (num_nodes > 0) {
-		opt.ps_min_nodes = num_nodes;
-		opt.ps_nodes_set = true;
-		asprintf(&(srun_argv[index]), "--nodes=%d", opt.ps_min_nodes);
-		index += 1;
-	}
-	if (tlimit_set) {
-		opt.ps_time_limit = tlimit;
-		asprintf(&(srun_argv[index]), "--time=%d", opt.ps_time_limit);
-		index += 1;
-	}
-	if (partition_set) {
-		opt.ps_partition =  partition;
-		asprintf(&(srun_argv[index]), "--partition=%s", opt.ps_partition);
-		index += 1;
-	}
-	/* To distinguish task stdout, this option MUST be set */
-	io_label_set = true;
-	if (io_label_set) { 
-		opt.ps_labelio = io_label;
-		asprintf(&(srun_argv[index]), "--label");
-		index += 1;
-	}
-	if (verbose_set) {
-		asprintf(&(srun_argv[index]), "--verbose");
-		index += 1;
-	}
-	if (jobid_set) {
-		opt.ps_jobid = allocated_jobid;
-		opt.ps_jobid_set = true;
-		asprintf(&(srun_argv[index]), "--jobid=%d", opt.ps_jobid);
-		index += 1;
-	}
-	
-	/*if (jobtype_set) {
-		opt.ps_jobtype = jobtype;
-    	asprintf(&(srun_argv[index]), "--jobtype=%s", opt.ps_jobtype);
-		index += 1;
-	}
-	*/
-	if (nodelist_set) {
-		opt.ps_nodelist = strdup(node_list);
-		opt.ps_nodes_set = true;
-		asprintf(&(srun_argv[index]), "--nodelist=%s", opt.ps_nodelist);
-		index += 1;
-	}
-
-	if (cwd) {
-		if (opt.ps_cwd != NULL)
-			free(opt.ps_cwd);
-		opt.ps_cwd = strdup(cwd);
-		opt.ps_cwd_set = true;
-	}
-
-	opt.ps_progname = full_path;
-	/* set job name,otherwise be NULL */
-	opt.ps_job_name = basename(full_path);
-	asprintf(&(srun_argv[index]), "%s", opt.ps_progname);
-	index += 1;
-	
-	/* program name followd by args */
-	if (num_args > 0) {
-		for (i = 0; i < nargs; i++) {
-			if (proxy_test_attribute(SLURM_JOB_PROG_ARGS_ATTR, args[i])) {
-				asprintf(&(srun_argv[index]), "%s", proxy_get_attribute_value_str(args[i]));
-				index += 1;
-			}	
-		}
-	}
-	srun_argv[index] = NULL; /* mark the end of srun_argv[] */
-
-	srun_argc = index;	
-	debug_log(logfp, "srun cmd:");
-	for (i = 0; i < srun_argc; i++) 
-		debug_log(logfp,"%s ",srun_argv[i]);
-	debug_log(logfp, "\n");
-
-
-	/*
-	 * FIXME: By now, debug job is not supported.
-	 */
-	if (debug) {
-		if (attach_mode) {
-			ret =  handle_attach_debug();
-		} else {
-			ret = handle_debug();
-		}	
-	} else {
-		ptp_job j;
-		j.debug = debug;
-		j.ptp_jobid = ptpid; /* model element id generated by proxy agent */
-		j.num_procs = num_procs;
-		allocate_and_launch_job(trans_id, jobsubid, &j, &opt, srun_argc, srun_argv);
-		free_opt(&opt);
-		free_srun_argv(srun_argc,srun_argv);
-	}
-
-	return PROXY_RES_OK;
-}		
-
-/* 
- * Cancel job, given ptp jobid (not slurm jobid).
- */
-int
-SLURM_TerminateJob(int trans_id, int nargs, char **args)
-{
-	int			i;
-	int 		ptp_jobid = -1;
-	ptp_job * 	j;
-
-	
-	if (proxy_state != STATE_RUNNING) {
-		sendErrorEvent(trans_id, RTEV_ERROR_JOB, "must call INIT first");
-		return PROXY_RES_OK;
-	}
-	
-	for (i = 0; i < nargs; i++) {
-		if (proxy_test_attribute(JOB_ID_ATTR, args[i])) {
-			ptp_jobid = proxy_get_attribute_value_int(args[i]);
-			break;
-		}
-	}
-
-	if (ptp_jobid < 0) {
-		sendJobTerminateErrorEvent(trans_id, ptp_jobid, "invalid jobid ");
-		return PROXY_RES_OK;
-	}
-
-	/* convert ptp jobid to slurm jobid */
-	if ((j = find_job(ptp_jobid, PTP_JOBID)) != NULL) {
-		/*
-		 * Kill all job steps and request iothread to exit.
-		 * Removing job structure from the global job list 
-		 * is left to purge_global_joblist().
-		 */
-		kill(j->srun_pid, SIGKILL);
-		j->iothread_exit_req = true;
-		if (j->need_alloc) {
-			slurm_kill_job(j->slurm_jobid, SIGKILL, 0); 
-		}	
-	} 
-	sendOKEvent(trans_id);
-
-	return PROXY_RES_OK;
-}
-
-/*
- * Enable sending of events.
- * The first msg that must be sent is a description of the model. 
- * This comprises NEW model element events
- * (NewMachine, NewNode, NewQueue) for each element in the model. 
- * Once the model description has been sent, model change events will be sent as detected.
- */
-int
-SLURM_StartEvents(int trans_id, int nargs, char **args)
-{
-	int 			num_machines;
-	int				m;
-	ptp_machine *	mach;
-	int				num_nodes;
-	
-	debug_log(logfp, "SLURM_StartEvents (%d):\n", trans_id); 
-
-	if (proxy_state != STATE_RUNNING) {
-		sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "Must call INIT first");
-		return PROXY_RES_OK;
-	}
-
-	/* NodeChange, JobChange event use gTransID as TID to match START_EVENTS cmd */
-	gTransID = trans_id;
-	
-	/*
-	 * FIXME: how to handle partition information in SLURM?
-	 */
-	num_machines = get_num_machines();
-	for(m = 0; m < num_machines; m++) {
-		mach = new_machine();
-		/* NewMachine element */
-		sendNewMachineEvent(trans_id, mach->id, get_machine_name(m));
-		num_nodes = get_num_nodes(mach->id);
-		if(create_node_list(mach)) {
-			sendErrorEvent(trans_id, RTEV_ERROR_NATTR, "Fail to create nodelist");
-			return PROXY_RES_OK;
-		}
-		/* NewNode element */
-		sendNewNodeEvent(trans_id, mach->id, mach);
-	}
-	/* NewQueue element */
-	sendNewQueueEvent(trans_id);
-
-	/* From now on, job state and node state update msg can be sent */
-	enable_state_update = true;
-	
-	return PROXY_RES_OK;
-}
-
-
-/*
- * Compitable interface.
- * Proxy not allowed to stop SLURM rms.
- */
-int
-SLURM_Quit(int trans_id, int nargs, char **args)
-{
-	int old_state = proxy_state;
-	
-	debug_log(logfp, "SLURM_Quit called\n");
-	
-	proxy_state = STATE_SHUTTING_DOWN;
-	if (old_state == STATE_RUNNING) 
-		do_slurm_shutdown();
-	
-	sendShutdownEvent(trans_id);
-	
-	return PROXY_RES_OK;
-}
-
-/******************************
- * END OF DISPATCH ROUTINES *
- ******************************/
-
-/*
- * Init jobstate_update_timer.
- */
-static void 
-init_job_timer()
-{
-	gettimeofday(&job_update_timer, NULL);
-	return;
-}
-
-/*
- * Init nodestate_update_timer.
- */
-static void 
-init_node_timer()
-{
-	gettimeofday(&node_update_timer, NULL);
-	return;
-}
-
-/*
- * Check if timer expires given timeout value.
- */
-static bool
-update_timeout(int timer_id, const int timeout)
-{
-	struct timeval * timer;
-	struct timeval now;
-	int val;
-	bool rc = false;
-
-	switch (timer_id) {
-	case JOB_UPDATE_TIMER:
-		timer = &job_update_timer;
-		break;
-	case NODE_UPDATE_TIMER:
-		timer = &node_update_timer;
-		break;
-	default:
-		return false; 
-	}
-	gettimeofday(&now, NULL);
-	val = (now.tv_sec - timer->tv_sec) * 1000000 + (now.tv_usec - timer->tv_usec) - timeout;
-	if (val >= 0) {
-		/* update timer */
-		gettimeofday(timer, NULL);
-		rc = true;
-	}
-
-	return rc;
-}
-
-/*
- * Wrapper routine to check job_update_timer.
- */
-static bool
-job_update_timeout()
-{
-	return update_timeout(JOB_UPDATE_TIMER, JOB_UPDATE_TIMEOUT);
-}
-
-/*
- * Wrapper routine to check node_update_timer.
- */
-static bool
-node_update_timeout()
-{
-	return update_timeout(NODE_UPDATE_TIMER, NODE_UPDATE_TIMEOUT);
-}
-
-/*
- * Update job/process state and send state CHANGE to ui.
- */
-static void 
-update_job_state(int slurm_jobid)
-{
-	int i;
-	int errcode;
-	bool job_find;
-	ptp_job * j;
-	job_info_msg_t * msg = NULL;
-
-	errcode = slurm_load_jobs((time_t)NULL, &msg, SHOW_ALL);
-	if (errcode) {
-		debug_log(logfp,"slurm_load_jobs error");
-		return;
-	}
-
-	for (SetList(gJobList); (j = (ptp_job *)GetListElement(gJobList)) != NULL;) {
-		if (slurm_jobid > -1) { 
-			if (j->slurm_jobid != slurm_jobid)
-				continue;
-		}
-		job_find = false;
-		for (i = 0; i < msg->record_count; i++) {
-			if (j->slurm_jobid == (msg->job_array[i]).job_id) {
-				job_find = true;
-				if (j->state != (msg->job_array[i]).job_state) { /*state change*/
-					j->state = (msg->job_array[i]).job_state;
-					/* 
-					 * SLURM doesn't provide process state.
-					 * Force process state changs with job state. 
-					 */
-					sendProcessStateChangeEvent(gTransID, j, jobstate_to_string(j->state));
-					sendJobStateChangeEvent(gTransID, j->ptp_jobid, jobstate_to_string(j->state));
-				}
-				break;
-			}	
-		}
-		if (!job_find) { 
-			/*
-			 * job not found(rarely happens).
-			 * In this case, simply mark this job removable.
-			 * SLURM keep the informatin of complete/fail jobs for MinJobAge (default to 300) seconds
-			 * MinJobAge can be set in slurm/etc/slurm.conf.
-			 */
-			j->removable = true;
-		}
-		if (slurm_jobid > -1)
-			break;
-	}
-	slurm_free_job_info_msg(msg);
-
-	return;
-}
-
-/*
- * Update ALL nodes state and send state CHANGE to ui.
- */
-void
-update_node_state()
-{
-	int i;
-	ptp_node * node;
-	int errcode;
-	node_info_msg_t * msg;
-	rangeset * unknown_set = new_rangeset();
-	rangeset * idle_set = new_rangeset();
-	rangeset * down_set = new_rangeset();
-	rangeset * allocated_set = new_rangeset();
-
-	if (unknown_set == NULL || idle_set == NULL || down_set == NULL || allocated_set == NULL)
-		goto cleanup;
-
-	errcode = slurm_load_node((time_t)NULL, &msg, SHOW_ALL);
-	if (errcode) {
-		debug_log(logfp,"slurm_load_node error.\n");
-		return;
-	} else {
-		for (i = 0; i < msg->record_count; i++) {
-			node = find_node_by_name(msg->node_array[i].name);
-			if (node->state == msg->node_array[i].node_state)
-				continue;
-			else { /* node state change */
-				node->state = msg->node_array[i].node_state;
-				switch (msg->node_array[i].node_state & NODE_STATE_BASE) {
-				case NODE_STATE_UNKNOWN:
-					insert_in_rangeset(unknown_set,node->id);
-					break;
-				case NODE_STATE_DOWN:
-					insert_in_rangeset(down_set,node->id);
-					break;
-				case NODE_STATE_IDLE:
-					insert_in_rangeset(idle_set,node->id);
-					break;
-				case NODE_STATE_ALLOCATED:
-					insert_in_rangeset(allocated_set,node->id);
-					break;
-				default:
-					debug_log(logfp, "unrecognized node state\n");
-					break;
-				}	
-			}
-		}	
-			
-		if (!EmptyList(unknown_set->elements)) {
-			sendNodeChangeEvent(gTransID,rangeset_to_string(unknown_set),nodestate_to_string(NODE_STATE_UNKNOWN));
-		}
-		if (!EmptyList(down_set->elements)) {
-			sendNodeChangeEvent(gTransID,rangeset_to_string(down_set),nodestate_to_string(NODE_STATE_DOWN));
-		}
-		if (!EmptyList(idle_set->elements)) {
-			sendNodeChangeEvent(gTransID,rangeset_to_string(idle_set),nodestate_to_string(NODE_STATE_IDLE));
-		}
-		if (!EmptyList(allocated_set->elements)) {
-			sendNodeChangeEvent(gTransID,rangeset_to_string(allocated_set),nodestate_to_string(NODE_STATE_ALLOCATED));
-		}
-
-		slurm_free_node_info_msg(msg);
-	}
-
-cleanup:
-	if(unknown_set)
-		free_rangeset(unknown_set);
-	if(down_set)	
-		free_rangeset(down_set);
-	if(idle_set)	
-		free_rangeset(idle_set);
-	if (allocated_set)	
-		free_rangeset(allocated_set);
-
-	return;
-}
-
-
-/*
- * signal handler of slurm proxy. 
- */
-RETSIGTYPE
-ptp_signal_handler(int sig)
-{
-	if (sig != SIGCHLD)  /* proxy doesn't exit on SIGCHLD */ 
-		ptp_signal_exit = sig;
-}
-
-/*
- * Cleanup work on proxy exiting:
- *  kill srun process, release job resource, 
- *	terminate io_thread,and free space.
- */
-static void
-destroy_global_joblist()
-{
-	ptp_job * j;
-	
-	for (SetList(gJobList); (j = (ptp_job *)GetListElement(gJobList)) != NULL; ) {
-		if (slurm_job_active(j)) {
-			kill(j->srun_pid, SIGKILL);
-			slurm_kill_job(j->slurm_jobid, SIGKILL, 0);
-		}	
-		if (j->iothread_exit == false)
-			j->iothread_exit_req = true;
-		RemoveFromList(gJobList, j);
-		free_job(j);
-	}
-	return;
-}
-
-static int
-server(char *name, char *host, int port)
-{
-	int				rc = 0;
-	struct timeval	timeout = {0, 20000};
-
-	gJobList = NewList();
-	gMachineList = NewList();
-	
-	init_job_timer();
-	init_node_timer();
-
-	if (proxy_svr_init(name, &timeout, &helper_funcs, &command_tab, &slurm_proxy) != PROXY_RES_OK) {
-		debug_log(logfp, "proxy failed to initialized\n"); 
-		return 0;
-	}
-	
-	if (proxy_svr_connect(slurm_proxy, host, port) == PROXY_RES_OK) {
-		debug_log(logfp, "proxy connected\n"); 
-		
-		while (ptp_signal_exit == 0 && proxy_state != STATE_SHUTDOWN) {
-			if (proxy_state == STATE_SHUTTING_DOWN) {
-				proxy_state = STATE_SHUTDOWN;
-			}
-			if (proxy_svr_progress(slurm_proxy) != PROXY_RES_OK)
-				break;
-			/* update job and node state */	
-			if (enable_state_update) {
-				if (job_update_timeout())  
-					update_job_state(ALL_JOBSTATE); 
-				if (node_update_timeout()) 
-					update_node_state();
-			}
-			/* delete removable job */
-			purge_global_joblist();
-		}
-		if (ptp_signal_exit != 0) {
-			if (proxy_state != STATE_SHUTTING_DOWN
-				&& proxy_state != STATE_SHUTDOWN) {
-				do_slurm_shutdown();
-			}
-			
-			destroy_global_joblist();
-
-			/* our return code = the signal that fired */
-			rc = ptp_signal_exit;
-			debug_log(logfp, "ptp_slurm_proxy terminated by signal [%d]\n", ptp_signal_exit);
-		}
-	} else 
-		debug_log(logfp, "proxy connection failed\n"); 
-	
-	proxy_svr_finish(slurm_proxy);
-	
-	return rc;
-}
-
-
-/*
- * Entry routine
- */
-int
-main(int argc, char *argv[])
-{
-	int 	ch;
-	int		port = PROXY_TCP_PORT;
-	char *	host = DEFAULT_HOST;
-	char *	proxy_str = DEFAULT_PROXY;
-	int		rc;
-	
-	while ((ch = getopt_long(argc, argv, "P:p:h:", longopts, NULL)) != -1){ 
-		switch (ch) {
-		case 'P':
-			proxy_str = optarg;
-			break;
-		case 'p':
-			port = (int)strtol(optarg, NULL, 10);
-			break;
-		case 'h':
-			host = optarg;
-			break;
-		default:
-			fprintf(stderr, "%s [--proxy=proxy] [--host=host_name] [--port=port] \n", argv[0]);
-			return 1;
-		}
-	}	
-
-	//putenv("PTP_SLURM_PROXY_LOGDIR=$HOME/log");
-	logfp = init_logfp();
-
-	/* 
-	 * signal can happen any time after handlers are installed, so
-	 * make sure we catch it.
-	 */
-	ptp_signal_exit = 0;
-	
-	/* setup signal handlers */
-	xsignal(SIGINT, ptp_signal_handler);
-	xsignal(SIGHUP, ptp_signal_handler);
-	xsignal(SIGILL, ptp_signal_handler);
-	xsignal(SIGSEGV, ptp_signal_handler);
-	xsignal(SIGTERM, ptp_signal_handler);
-	xsignal(SIGQUIT, ptp_signal_handler);
-	xsignal(SIGABRT, ptp_signal_handler);
-	xsignal(SIGCHLD, ptp_signal_handler);
-	
-	rc = server(proxy_str, host, port);
-	
-	return rc;
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/.classpath b/rms/org.eclipse.ptp.rm.slurm.ui/.classpath
deleted file mode 100644
index 941814f..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/ptp/rm/remote/core/*"/>
-			<accessrule kind="accessible" pattern="org/eclipse/rm/remote/ui/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/.project b/rms/org.eclipse.ptp.rm.slurm.ui/.project
deleted file mode 100644
index 8512bed..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.ptp.rm.slurm.ui</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.slurm.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 6864ccc..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.ptp.rm.slurm.ui;singleton:=true

-Bundle-Version: 2.1.0.qualifier

-Bundle-Activator: org.eclipse.ptp.rm.slurm.ui.Activator

-Bundle-Vendor: %pluginProvider

-Bundle-Localization: plugin

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.debug.core,

- org.eclipse.ptp.core,

- org.eclipse.ptp.remote.ui,

- org.eclipse.ptp.utils.ui;bundle-version="1.0.0",

- org.eclipse.ptp.rm.slurm.core

-Eclipse-LazyStart: true

-Export-Package: org.eclipse.ptp.rm.slurm.ui,

- org.eclipse.ptp.rm.slurm.ui.preferences

-Import-Package: org.eclipse.ptp.core.attributes,

- org.eclipse.ptp.core.elements,

- org.eclipse.ptp.core.elements.attributes,

- org.eclipse.ptp.launch.ui.extensions,

- org.eclipse.ptp.remote.core,

- org.eclipse.ptp.remote.core.exception,

- org.eclipse.ptp.rm.remote.ui.preferences,

- org.eclipse.ptp.rm.remote.ui.wizards,

- org.eclipse.ptp.ui.wizards

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/about.html b/rms/org.eclipse.ptp.rm.slurm.ui/about.html
deleted file mode 100644
index 3106f3a..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<title>About</title>

-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>Apri 14, 2009</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation 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

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>

-

-</body>

-</html>
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/build.properties b/rms/org.eclipse.ptp.rm.slurm.ui/build.properties
deleted file mode 100644
index ce5cf86..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/

-output.. = bin/

-bin.includes = plugin.xml,\

-               META-INF/,\

-               .,\

-               bin/,\

-               plugin.properties,\

-               build.properties

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/plugin.properties b/rms/org.eclipse.ptp.rm.slurm.ui/plugin.properties
deleted file mode 100644
index 8886332..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################

- # Copyright (c) 2008,2009 School of Computer,National University 

- # of Defense Technology,P.R.China. All rights reserved. This program

- # and the accompanying materials are made available under the terms of 

- # the Eclipse Public License v1.0 which accompanies this distribution,

- # and is available at http://www.eclipse.org/legal/epl-v10.html

- # Contributors:

- # School of Computer - 605 staff room

-###############################################################################

-

-pluginName=PTP Slurm UI

-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/plugin.xml b/rms/org.eclipse.ptp.rm.slurm.ui/plugin.xml
deleted file mode 100644
index beadd52..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

-

-   <extension

-         point="org.eclipse.ui.preferencePages">

-      <page

-            category="org.eclipse.ptp.ui.preferences.rmPreferencesPage"

-            class="org.eclipse.ptp.rm.slurm.ui.preferences.SLURMPreferencePage"

-            id="org.eclipse.ptp.slurm.ui.preferences.OMPIPreferencePage"

-            name="SLURM">

-      </page>

-   </extension>

-   <extension

-         point="org.eclipse.ptp.ui.rmConfigurationWizards">

-      <configurationWizard

-            class="org.eclipse.ptp.rm.slurm.ui.wizards.SLURMResourceManagerConfigurationWizardPageFactory"

-            id="org.eclipse.ptp.slurm.ui.configurationWizard"/>

-   </extension>

-   <extension

-         point="org.eclipse.ptp.launch.rmLaunchConfigurations">

-      <launchConfiguration

-            class="org.eclipse.ptp.rm.slurm.ui.rmLaunchConfiguration.SLURMRMLaunchConfigurationFactory"

-            id="org.eclipse.ptp.slurm.ui.launchConfiguration"/>

-   </extension>

-

-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/Activator.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/Activator.java
deleted file mode 100644
index a357da9..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/Activator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.ptp.rm.slurm.ui;

-

-import org.eclipse.jface.resource.ImageDescriptor;

-import org.eclipse.ptp.rm.slurm.core.SLURMPreferenceManager;

-import org.eclipse.ui.plugin.AbstractUIPlugin;

-import org.osgi.framework.BundleContext;

-

-/**

- * The activator class controls the plug-in life cycle

- */

-public class Activator extends AbstractUIPlugin {

-

-	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.slurm.ui"; //$NON-NLS-1$

-

-	// The shared instance

-	private static Activator plugin;

-	

-	/**

-	 * The constructor

-	 */

-	public Activator() {

-		plugin = this;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

-	 */

-	public void start(BundleContext context) throws Exception {

-		super.start(context);

-		SLURMPreferenceManager.initializePreferences();

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

-	 */

-	public void stop(BundleContext context) throws Exception {

-		plugin = null;

-		super.stop(context);

-	}

-

-	/**

-	 * Returns the shared instance

-	 *

-	 * @return the shared instance

-	 */

-	public static Activator getDefault() {

-		return plugin;

-	}

-

-	/**

-	 * Returns an image descriptor for the image file at the given

-	 * plug-in relative path

-	 *

-	 * @param path the path

-	 * @return the image descriptor

-	 */

-	public static ImageDescriptor getImageDescriptor(String path) {

-		return imageDescriptorFromPlugin(PLUGIN_ID, path);

-	}

-}

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/Messages.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/Messages.java
deleted file mode 100644
index 50d5c01..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/Messages.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.ui.messages;

-

-import org.eclipse.osgi.util.NLS;

-

-public class Messages extends NLS {

-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.slurm.ui.messages.messages"; //$NON-NLS-1$

-

-	public static String SLURMResourceManagerConfigurationWizardPage_name;

-	public static String SLURMResourceManagerConfigurationWizardPage_title;

-	public static String SLURMResourceManagerConfigurationWizardPage_description;

-

-	public static String SLURMRMLaunchConfigurationDynamicTab_0;

-	public static String SLURMRMLaunchConfigurationDynamicTab_1;

-	public static String SLURMRMLaunchConfigurationDynamicTab_2;

-	public static String SLURMRMLaunchConfigurationDynamicTab_3;

-	public static String SLURMRMLaunchConfigurationDynamicTab_4;

-	public static String SLURMRMLaunchConfigurationDynamicTab_5;

-	public static String SLURMRMLaunchConfigurationDynamicTab_6;

-	public static String SLURMRMLaunchConfigurationDynamicTab_7;

-	public static String SLURMRMLaunchConfigurationDynamicTab_8;

-	public static String SLURMRMLaunchConfigurationDynamicTab_9;

-	public static String SLURMRMLaunchConfigurationDynamicTab_10;

-

-	public static String SLURMConfigurationWizardPage_name;

-	public static String SLURMConfigurationWizardPage_title;

-	public static String SLURMConfigurationWizardPage_description;

-	public static String SLURMConfigurationWizardPage_defaultButton;

-	public static String SLURMConfigurationWizardPage_browseButton;

-	public static String SLURMConfigurationWizardPage_path;

-	public static String SLURMConfigurationWizardPage_arguments;

-	public static String SLURMConfigurationWizardPage_invalid;

-	public static String SLURMConfigurationWizardPage_select;

-	public static String SLURMConfigurationWizardPage_connection_error;

-	public static String SLURMConfigurationWizardPage_connection_error_msg;

-	public static String SLURMConfigurationWizardPage_numProcsInvalid;

-	public static String SLURMConfigurationWizardPage_timeLimitInvalid;

-

-	public static String SLURMPreferencesPage_group_slurmd;

-	public static String SLURMPreferencesPage_slurmdFile_text;

-	public static String SLURMPreferencesPage_Select_SLURMd_FILE;

-	public static String SLURMPreferencesPage_Incorrect_SLURMd_file;

-	public static String SLURMPreferencesPage_slurmdArgs_text;

-	public static String SLURMPreferencesPage_slurmdFull_text;

-	public static String SLURMPreferencesPage_group_proxy;

-	public static String SLURMPreferencesPage_slurmServer_text;

-	public static String SLURMPreferencesPage_Select_SLURM_PROXY_FILE;

-	public static String SLURMPreferencesPage_Incorrect_server_file;

-	public static String SLURMPreferencesPage_manual;

-	public static String SLURMPreferencesPage_browseButton;

-	

-	static {

-		// initialize resource bundle

-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

-	}

-

-	private Messages() {

-		// Prevent instances.

-	}

-}

-

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/messages.properties b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/messages.properties
deleted file mode 100644
index 41d5a82..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/messages.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-SLURMResourceManagerConfigurationWizardPage_name=SLURM Proxy Configuration

-SLURMResourceManagerConfigurationWizardPage_title=SLURM Proxy Configuration

-SLURMResourceManagerConfigurationWizardPage_description=Enter information to connect to an SLURM proxy server

-SLURMRMLaunchConfigurationDynamicTab_0=Number of Processes(-n): 

-SLURMRMLaunchConfigurationDynamicTab_1=Time Limit(-t):

-SLURMRMLaunchConfigurationDynamicTab_10=Please input the limit(>=1) of running time(minutes)\!

-SLURMRMLaunchConfigurationDynamicTab_2=Partation Requested(-p):

-SLURMRMLaunchConfigurationDynamicTab_3=Job Type(--jobtype):

-SLURMRMLaunchConfigurationDynamicTab_4=true

-SLURMRMLaunchConfigurationDynamicTab_5=Job Io Label(-l):

-SLURMRMLaunchConfigurationDynamicTab_6=true

-SLURMRMLaunchConfigurationDynamicTab_7=Job Verbose Mode(-v):

-SLURMRMLaunchConfigurationDynamicTab_8=Job Nodelist(-w):

-SLURMRMLaunchConfigurationDynamicTab_9=Please input the integer number(>=1) of processes\!

-

-SLURMConfigurationWizardPage_name=SLURMD Configuration

-SLURMConfigurationWizardPage_title=SLURMD Configuration

-SLURMConfigurationWizardPage_description=Enter information to configure SLURMD

-SLURMConfigurationWizardPage_defaultButton=Use default settings

-SLURMConfigurationWizardPage_browseButton=Browse

-SLURMConfigurationWizardPage_path=Path to SLURMD:

-SLURMConfigurationWizardPage_arguments=Extra SLURMD arguments:

-SLURMConfigurationWizardPage_invalid=Invalid SLURMD path

-SLURMConfigurationWizardPage_select=Select SLURMD executable

-SLURMConfigurationWizardPage_connection_error=Connection Error

-SLURMConfigurationWizardPage_connection_error_msg=Could not open connection

-SLURMConfigurationWizardPage_numProcsInvalid=

-SLURMConfigurationWizardPage_timeLimitInvalid=

-SLURMPreferencesPage_group_slurmd=Open Runtime Environment Daemon

-SLURMPreferencesPage_slurmdFile_text=SLURMd file:

-SLURMPreferencesPage_Select_SLURMd_FILE=Select SLURMd file

-SLURMPreferencesPage_Incorrect_SLURMd_file=Invalid SLURM daemon file

-SLURMPreferencesPage_slurmdArgs_text=SLURMd arguments:

-SLURMPreferencesPage_slurmdFull_text=SLURMd run command:

-SLURMPreferencesPage_group_proxy=Slurm PTP Proxy Server

-SLURMPreferencesPage_slurmServer_text=SLURM|PTP proxy server file:

-SLURMPreferencesPage_Select_SLURM_PROXY_FILE=Select SLURM|PTP Proxy server file

-SLURMPreferencesPage_Incorrect_server_file=Invalid SLURM|PTP proxy server file

-SLURMPreferencesPage_manual=Launch SLURM server manually

-SLURMPreferencesPage_browseButton=Browse

-

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/preferences/SLURMPreferencePage.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/preferences/SLURMPreferencePage.java
deleted file mode 100644
index 6e8a01b..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/preferences/SLURMPreferencePage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.ui.preferences;

-

-import org.eclipse.core.runtime.Preferences;

-import org.eclipse.ptp.rm.slurm.core.SLURMPreferenceManager;

-import org.eclipse.ptp.rm.remote.ui.preferences.AbstractRemotePreferencePage;

-

-public class SLURMPreferencePage extends AbstractRemotePreferencePage {

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.remote.ui.preferences.AbstractRemotePreferencePage#getPreferences()

-	 */

-	public Preferences getPreferences() {

-		return SLURMPreferenceManager.getPreferences();

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.remote.ui.preferences.AbstractRemotePreferencePage#savePreferences()

-	 */

-	public void savePreferences() {

-		SLURMPreferenceManager.savePreferences();

-	}

-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 05f5862..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.ui.rmLaunchConfiguration;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.debug.core.ILaunchConfiguration;

-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;

-import org.eclipse.ptp.core.attributes.IAttribute;

-import org.eclipse.ptp.core.attributes.IllegalValueException;

-import org.eclipse.ptp.core.attributes.IntegerAttribute;

-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;

-import org.eclipse.ptp.core.elements.IPQueue;

-import org.eclipse.ptp.core.elements.IResourceManager;

-import org.eclipse.ptp.core.elements.attributes.JobAttributes;

-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationDynamicTab;

-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;

-import org.eclipse.ptp.rm.slurm.core.SLURMJobAttributes;

-import org.eclipse.ptp.rm.slurm.ui.Activator;

-import org.eclipse.ptp.rm.slurm.ui.messages.Messages;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Control;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Text;

-

-public class SLURMRMLaunchConfigurationDynamicTab extends

-		AbstractRMLaunchConfigurationDynamicTab {

-	

-	//jobNumProces

-	private Text numProcsText;

-	private String numProcsString = "1"; //$NON-NLS-1$

-	private static final String NUMBER_OF_PROCESSES_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_0;

-	//jobNumNodes

-	/*

-	private Text NumNodesText;

-	private String numbernodesString = "2";

-	private static final String JOB_NUMBER_OF_NODES_LABEL = "Number of Nodes(-N): ";

-	*/

-	//jobTimeLimit

-	private Text TimeLimitText;

-	private String timeLimitString = "2"; //$NON-NLS-1$

-	private static final String JOB_TIME_LIMIT_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_1;

-	//jobPartition

-	private String partationRequestedString = "3"; //$NON-NLS-1$

-	private static final String JOB_PARTATION_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_2;

-	//jobType

-	private String jobTypeComboString = "mpi"; //$NON-NLS-1$

-	private static final String JOB_TYPE_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_3;

-	//jobIoLabel

-	private String jobIoString = Messages.SLURMRMLaunchConfigurationDynamicTab_4;

-	private static final String JOB_IO_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_5;

-	//jobVerbose

-	private String jobVerboseModString = Messages.SLURMRMLaunchConfigurationDynamicTab_6;

-	private static final String JOB_VERBOSE_MODE_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_7;

-	//jobNodeList

-	private String jobNodeListString = "node0,node1"; //$NON-NLS-1$

-	private static final String JOB_NODE_LIST_LABEL =Messages.SLURMRMLaunchConfigurationDynamicTab_8;

-	

-	private static final String ATTR_PREFIX = Activator.PLUGIN_ID + ".launchAttributes"; //$NON-NLS-1$

-	private static final String ATTR_NUMPROCS = ATTR_PREFIX + ".numProcs";	 //$NON-NLS-1$

-	private static final String ATTR_NUMNODES = ATTR_PREFIX + ".numNodes"; //$NON-NLS-1$

-	private static final String ATTR_TIMELIMIT = ATTR_PREFIX + ".timeLimit"; //$NON-NLS-1$

-	private static final String ATTR_JOBPARTATION = ATTR_PREFIX + ".jobpartation"; //$NON-NLS-1$

-	private static final String ATTR_JOBTYPE = ATTR_PREFIX + ".jobtype"; //$NON-NLS-1$

-	private static final String ATTR_JOBIO = ATTR_PREFIX + ".jobio"; //$NON-NLS-1$

-	private static final String ATTR_JOBVERBOSEMODE = ATTR_PREFIX + ".jobverbosemode";	 //$NON-NLS-1$

-	private static final RMLaunchValidation success = new RMLaunchValidation(true, ""); //$NON-NLS-1$

-	

-	private Composite control;

-

-	public SLURMRMLaunchConfigurationDynamicTab(IResourceManager rm) {

-		// TODO Auto-generated constructor stub

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#canSave(org.eclipse.swt.widgets.Control, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)

-	 */

-	public RMLaunchValidation canSave(Control control, IResourceManager rm, IPQueue queue) {

-		try {

-			IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(numProcsAttrDef, numProcsString);

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL + e.getMessage());

-		}

-		

-		/*

-		try {

-			IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(jobNumNodesAttrDef, numbernodesString);

-			//System.out.println("the iattr value is:"+iattr+"the numprocsString value is:"+numProcsString);

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL + e.getMessage());

-		}

-		*/

-		

-		try {

-			IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(jobTimeLimitAttrDef, timeLimitString);		

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL + e.getMessage());

-		}

-		/*

-		

-		try {

-			IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(jobPartationAttrDef, partationRequestedString);

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_PARTATION_LABEL + e.getMessage());

-		}

-		

-		

-		try {

-			IntegerAttributeDefinition jobTypeComboAttrDef = getJobTypeComboAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(jobTypeComboAttrDef, jobTypeComboString);		

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_TYPE_LABEL + e.getMessage());

-		}

-		

-		

-		try {

-			IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(jobIoAttrDef, jobIoString);		

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_IO_LABEL + e.getMessage());

-		}		

-		*/

-				

-		return new RMLaunchValidation(true, ""); //$NON-NLS-1$

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#createControl(org.eclipse.swt.widgets.Composite, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)

-	 */

-	public void createControl(Composite parent,	IResourceManager rm, IPQueue queue) {

-		control = new Composite(parent, SWT.NONE);

-		control.setLayout(new GridLayout(1, true));

-		GridData gd;

-		

-		final int numColumns = 2;

-		

-		final Composite comp = new Composite(control, SWT.BORDER);

-		GridLayout launchConfigLayout = new GridLayout(numColumns, true);

-		launchConfigLayout.marginHeight = 0;

-		launchConfigLayout.marginWidth = 0;

-		launchConfigLayout.numColumns = numColumns;

-		comp.setLayout(launchConfigLayout);

-		gd = new GridData(GridData.FILL_BOTH);

-		gd.horizontalSpan = numColumns;

-		comp.setLayoutData(gd);

-		

-		

-		Label numberOfProcessesnLabel = new Label(comp, SWT.NONE);

-		numberOfProcessesnLabel.setText(NUMBER_OF_PROCESSES_LABEL);

-		final GridData gd_numberOfProcessesnLabel = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);

-		gd_numberOfProcessesnLabel.minimumWidth = numberOfProcessesnLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;

-		numberOfProcessesnLabel.setLayoutData(gd_numberOfProcessesnLabel);

-		

-		

-		numProcsText = new Text(comp, SWT.BORDER | SWT.WRAP);

-		numProcsText.setTextLimit(10);

-		numProcsText.setToolTipText(Messages.SLURMRMLaunchConfigurationDynamicTab_9);

-		gd = new GridData(SWT.FILL, SWT.FILL, true, false, numColumns-1, 1);

-		gd.minimumWidth = numProcsText.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;

-		numProcsText.setLayoutData(gd);

-

-		// Tell the client of this dynamic tab that the

-		// contents of this tab are affected by the contents

-		// of this widget.

-		numProcsText.addModifyListener(new ModifyListener(){

-

-			public void modifyText(ModifyEvent e) {

-				//System.out.println("The value of numProcsString:"+numProcsString);

-				numProcsString = numProcsText.getText();

-				//System.out.println("The value of numProcsString1:"+numProcsString);

-				fireContentsChanged();

-			}});

-        /*

-		final Label numberOfNodesLabel = new Label(comp, SWT.NONE);

-		numberOfNodesLabel.setText(JOB_NUMBER_OF_NODES_LABEL);

-

-		NumNodesText = new Text(comp, SWT.BORDER | SWT.WRAP);

-		NumNodesText.setTextLimit(10);

-		NumNodesText.setToolTipText("Please input the number of nodes!");

-		final GridData gd_numNodesText = new GridData(SWT.FILL, SWT.CENTER, true, false);

-		NumNodesText.setLayoutData(gd_numNodesText);

-		//NumNodesText   value

-		NumNodesText.addModifyListener(new ModifyListener(){

-

-			public void modifyText(ModifyEvent e) {

-				//System.out.println("The value of numbernodesString:"+numbernodesString);

-				numbernodesString = NumNodesText.getText();

-				//System.out.println("The value of numbernodesString1:"+numbernodesString);

-				fireContentsChanged();

-			}});

-		

-        */

-		final Label timeLimitLabel = new Label(comp, SWT.NONE);

-		timeLimitLabel.setText(JOB_TIME_LIMIT_LABEL);

-

-		TimeLimitText = new Text(comp, SWT.BORDER | SWT.WRAP);

-		TimeLimitText.setTextLimit(10);

-		TimeLimitText.setToolTipText(Messages.SLURMRMLaunchConfigurationDynamicTab_10);

-		final GridData gd_timeLimitText = new GridData(SWT.FILL, SWT.CENTER, true, false);

-		TimeLimitText.setLayoutData(gd_timeLimitText);

-		//TimeLimitText   value

-		TimeLimitText.addModifyListener(new ModifyListener(){

-

-			public void modifyText(ModifyEvent e) {

-				//System.out.println("The value of timeLimitString:"+timeLimitString);

-				timeLimitString = TimeLimitText.getText();

-				//System.out.println("The value of timeLimitString1:"+timeLimitString);

-				fireContentsChanged();

-			}});

-		//partationRequestedCombo   value

-		//JobIdText   value

-		//jobTypeCombo   value

-		//JobIOLableText   value

-		//JobVerboseModeText  value

-		//JobNodelistText  value

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#getAttributes(org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue, org.eclipse.debug.core.ILaunchConfiguration)

-	 */

-	public IAttribute<?,?,?>[] getAttributes(IResourceManager rm, IPQueue queue,

-			ILaunchConfiguration configuration, String mode) throws CoreException {

-		

-		int numProcs = configuration.getAttribute(ATTR_NUMPROCS, -1);

-		IntegerAttribute iattr = null;

-		try {

-			IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);

-			iattr = new IntegerAttribute(numProcsAttrDef, numProcs);

-		} catch (IllegalValueException e) {

-			return new IAttribute[0];

-		}

-		

-		/*				

-		int jobNumNodes = configuration.getAttribute(ATTR_NUMNODES, -1);

-		//System.out.println("The value of jobNumNodes is: "+jobNumNodes);

-	

-		IntegerAttribute iattr1 = null;

-		try {

-			IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);

-			iattr1 = new IntegerAttribute(jobNumNodesAttrDef, jobNumNodes);

-			//System.out.println("The value of NumNodes is: "+iattr1);

-		} catch (IllegalValueException e) {

-			return new IAttribute[1];

-		}

-		*/			

-		int jobTimeLimit = configuration.getAttribute(ATTR_TIMELIMIT, -1);

-		IntegerAttribute iattr2 = null;

-		try {

-			IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);

-			iattr2 = new IntegerAttribute(jobTimeLimitAttrDef, jobTimeLimit);

-			//System.out.println("The value of TimeLimit is: "+iattr2);

-		} catch (IllegalValueException e) {

-			return new IAttribute[2];

-		}

-		

-		/*			

-		int jobPartation = configuration.getAttribute(ATTR_JOBPARTATION, -1);

-		IntegerAttribute iattr3 = null;

-		try {

-			IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);

-			iattr2 = new IntegerAttribute(jobPartationAttrDef, jobPartation);

-		} catch (IllegalValueException e) {

-			return new IAttribute[3];

-		}

-					

-		int jobTypeCombo = configuration.getAttribute(ATTR_JOBTYPE, -1);

-		IntegerAttribute iattr3 = null;

-		try {

-			IntegerAttributeDefinition jobTypeComboAttrDef = getJobTimeLimitAttrDef(rm, queue);

-			iattr2 = new IntegerAttribute(jobTypeComboAttrDef, jobTypeCombo);

-		} catch (IllegalValueException e) {

-			return new IAttribute[3];

-		}			

-			

-		int jobIo = configuration.getAttribute(ATTR_JOBIO, -1);

-		IntegerAttribute iattr3 = null;

-		try {

-			IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);

-			iattr3 = new IntegerAttribute(jobIoAttrDef, jobIo);

-		} catch (IllegalValueException e) {

-			return new IAttribute[3];

-		}

-		*/

-		

-		

-		

-		return new IAttribute[]{iattr,iattr2};

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#getControl()

-	 */

-	public Control getControl() {

-		return control;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#initializeFrom(org.eclipse.swt.widgets.Control, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue, org.eclipse.debug.core.ILaunchConfiguration)

-	 */

-	public RMLaunchValidation initializeFrom(Control control, IResourceManager rm,

-			IPQueue queue, ILaunchConfiguration configuration) {

-		

-		int numProcs;

-		try {

-			numProcs = configuration.getAttribute(ATTR_NUMPROCS, 1);

-		} catch (CoreException e) {

-			try {

-				IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);

-				numProcsText.setText(numProcsAttrDef.create().getValueAsString());

-			} catch (IllegalValueException e1) {

-				return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL +

-						e.getMessage() + " : " + e1.getMessage()); //$NON-NLS-1$

-			}

-			return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL + e.getMessage());

-		}

-		numProcsText.setText(Integer.toString(numProcs));

-		/*

-		int jobNumNodes;

-		try {

-			jobNumNodes = configuration.getAttribute(ATTR_NUMNODES, 1);

-		} catch (CoreException e) {

-			try {

-				IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);

-				NumNodesText.setText(jobNumNodesAttrDef.create().getValueAsString());

-			} catch (IllegalValueException e1) {

-				return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL +

-						e.getMessage() + " : " + e1.getMessage());

-			}

-			return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL + e.getMessage());

-		}

-		NumNodesText.setText(Integer.toString(jobNumNodes));

-		*/		

-		int jobTimeLimit;

-		try {

-			jobTimeLimit = configuration.getAttribute(ATTR_TIMELIMIT, 1);

-		} catch (CoreException e) {

-			try {

-				IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);

-				TimeLimitText.setText(jobTimeLimitAttrDef.create().getValueAsString());

-			} catch (IllegalValueException e1) {

-				return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL +

-						e.getMessage() + " : " + e1.getMessage()); //$NON-NLS-1$

-			}

-			return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL + e.getMessage());

-		}

-		TimeLimitText.setText(Integer.toString(jobTimeLimit));

-		/*		

-		int jobPartation;

-		try {

-			jobPartation = configuration.getAttribute(ATTR_JOBPARTATION, 1);

-		} catch (CoreException e) {

-			try {

-				IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);

-				partationRequestedCombo.setText(jobPartationAttrDef.create().getValueAsString());

-			} catch (IllegalValueException e1) {

-				return new RMLaunchValidation(false, JOB_PARTATION_LABEL +

-						e.getMessage() + " : " + e1.getMessage());

-			}

-			return new RMLaunchValidation(false, JOB_PARTATION_LABEL + e.getMessage());

-		}

-		partationRequestedCombo.setText(Integer.toString(jobPartation));

-		int jobTypeCom;

-		try {

-			jobTypeCom = configuration.getAttribute(ATTR_JOBTYPE, 1);

-		} catch (CoreException e) {

-			try {

-				IntegerAttributeDefinition jobTypeComboAttrDef = getJobTypeComboAttrDef(rm, queue);

-				jobTypeCombo.setText(jobTypeComboAttrDef.create().getValueAsString());

-			} catch (IllegalValueException e1) {

-				return new RMLaunchValidation(false, JOB_TYPE_LABEL +

-						e.getMessage() + " : " + e1.getMessage());

-			}

-			return new RMLaunchValidation(false, JOB_TYPE_LABEL + e.getMessage());

-		}

-		jobTypeCombo.setText(Integer.toString(jobTypeCom));	

-		int jobIo;

-		try {

-			jobIo = configuration.getAttribute(ATTR_JOBIO, 1);

-		} catch (CoreException e) {

-			try {

-				IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);

-				JobIOLableText.setText(jobIoAttrDef.create().getValueAsString());

-			} catch (IllegalValueException e1) {

-				return new RMLaunchValidation(false, JOB_IO_LABEL +

-						e.getMessage() + " : " + e1.getMessage());

-			}

-			return new RMLaunchValidation(false, JOB_IO_LABEL + e.getMessage());

-		}

-		JobIOLableText.setText(Integer.toString(jobIo));

-		*/

-		return success;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#isValid(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)

-	 */

-

-	public RMLaunchValidation isValid(ILaunchConfiguration configuration,

-			IResourceManager rm, IPQueue queue) {

-		

-		try {

-			IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(numProcsAttrDef, numProcsString);

-			if (iattr.getValue() < 1) {

-				return new RMLaunchValidation(false, Messages.SLURMConfigurationWizardPage_numProcsInvalid);

-			}

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL + e.getMessage());

-		}

-		/*

-		try {

-			IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(jobNumNodesAttrDef, numbernodesString);

-			if (iattr.getValue() < 1) {

-				return new RMLaunchValidation(false, Messages.getString("SLURMConfigurationWizardPage.numbernodesInvalid")); //$NON-NLS-1$

-			}

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL + e.getMessage());

-		}

-		*/

-		try {

-			IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(jobTimeLimitAttrDef, timeLimitString);

-			if (iattr.getValue() < 1) {

-				return new RMLaunchValidation(false, Messages.SLURMConfigurationWizardPage_timeLimitInvalid);

-			}

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL + e.getMessage());

-		}

-		/*

-		try {

-			IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(jobPartationAttrDef, partationRequestedString);

-			if (iattr.getValue() < 1) {

-				return new RMLaunchValidation(false, Messages.getString("SLURMConfigurationWizardPage.numProcsInvalid")); //$NON-NLS-1$

-			}

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_PARTATION_LABEL + e.getMessage());

-		}

-		try {

-			IntegerAttributeDefinition jobTypeComboAttrDef = getJobTypeComboAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(jobTypeComboAttrDef, jobTypeComboString);

-			if (iattr.getValue() < 1) {

-				return new RMLaunchValidation(false, Messages.getString("SLURMConfigurationWizardPage.numProcsInvalid")); //$NON-NLS-1$

-			}

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_TYPE_LABEL + e.getMessage());

-		}

-		try {

-			IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);

-			@SuppressWarnings("unused")

-			IntegerAttribute iattr = new IntegerAttribute(jobIoAttrDef, jobIoString);

-			if (iattr.getValue() < 1) {

-				return new RMLaunchValidation(false, Messages.getString("SLURMConfigurationWizardPage.numProcsInvalid")); //$NON-NLS-1$

-			}

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_IO_LABEL + e.getMessage());

-		}

-		*/

-		return new RMLaunchValidation(true, ""); //$NON-NLS-1$

-	}

-

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)

-	 */

-	public RMLaunchValidation performApply(ILaunchConfigurationWorkingCopy configuration,

-			IResourceManager rm, IPQueue queue) {

-		IntegerAttribute iattr = null;

-		try {

-			IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);

-			iattr = new IntegerAttribute(numProcsAttrDef, numProcsString);

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL + e.getMessage());

-		}

-		configuration.setAttribute(ATTR_NUMPROCS, iattr.getValue());

-		/*

-		IntegerAttribute iattr1 = null;

-		try {

-			IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);

-			iattr1 = new IntegerAttribute(jobNumNodesAttrDef, numbernodesString);

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL + e.getMessage());

-		}

-		configuration.setAttribute(ATTR_NUMNODES, iattr1.getValue());

-		*/

-		IntegerAttribute iattr2 = null;

-		try {

-			IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);

-			iattr2 = new IntegerAttribute(jobTimeLimitAttrDef, timeLimitString);

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL + e.getMessage());

-		}

-		configuration.setAttribute(ATTR_TIMELIMIT, iattr2.getValue());

-		/*

-		try {

-			IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);

-			iattr = new IntegerAttribute(jobPartationAttrDef, partationRequestedString);

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_PARTATION_LABEL + e.getMessage());

-		}

-		configuration.setAttribute(ATTR_JOBPARTATION, iattr.getValue());

-		try {

-			IntegerAttributeDefinition jobTypeComboAttrDef = getJobTypeComboAttrDef(rm, queue);

-			iattr = new IntegerAttribute(jobTypeComboAttrDef, jobTypeComboString);

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_TYPE_LABEL + e.getMessage());

-		}

-		configuration.setAttribute(ATTR_TIMELIMIT, iattr.getValue());

-		try {

-			IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);

-			iattr = new IntegerAttribute(jobIoAttrDef, jobIoString);

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_IO_LABEL + e.getMessage());

-		}

-		configuration.setAttribute(ATTR_JOBIO, iattr.getValue());

-		*/

-		//System.out.println(ATTR_NUMNODES);

-		

-		return new RMLaunchValidation(true, ""); //$NON-NLS-1$

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)

-	 */

-	public RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy configuration,

-			IResourceManager rm, IPQueue queue) {

-		try {

-			IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);

-			configuration.setAttribute(ATTR_NUMPROCS, numProcsAttrDef.create().getValue());

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL + e.getMessage());

-		}

-		/*

-		try {

-			IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);

-			configuration.setAttribute(ATTR_NUMNODES, jobNumNodesAttrDef.create().getValue());

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL + e.getMessage());

-		}

-		*/

-		try {

-			IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);

-			configuration.setAttribute(ATTR_TIMELIMIT, jobTimeLimitAttrDef.create().getValue());

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL + e.getMessage());

-		}

-		/*

-		try {

-			IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);

-			configuration.setAttribute(ATTR_JOBPARTATION, jobPartationAttrDef.create().getValue());

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_PARTATION_LABEL + e.getMessage());

-		}

-		try {

-			IntegerAttributeDefinition jobTypeComboAttrDef = getJobTypeComboAttrDef(rm, queue);

-			configuration.setAttribute(ATTR_JOBTYPE, jobTypeComboAttrDef.create().getValue());

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_TYPE_LABEL + e.getMessage());

-		}	

-		try {

-			IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);

-			configuration.setAttribute(ATTR_JOBIO, jobIoAttrDef.create().getValue());

-		} catch (IllegalValueException e) {

-			return new RMLaunchValidation(false, JOB_IO_LABEL + e.getMessage());

-		}	

-		*/

-		return success;

-	}

-

-	/**

-	 * Get the attribute definition for the number of processes job launch attribute

-	 * 

-	 * @param rm

-	 * @param queue

-	 * @return

-	 */

-	private IntegerAttributeDefinition getNumProcsAttrDef(IResourceManager rm, IPQueue queue) {

-		return JobAttributes.getNumberOfProcessesAttributeDefinition();

-	}

-	private IntegerAttributeDefinition getJobNumNodesAttrDef(IResourceManager rm, IPQueue queue) {

-		return SLURMJobAttributes.getNumberOfNodesAttributeDefinition();

-	}

-	private IntegerAttributeDefinition getJobTimeLimitAttrDef(IResourceManager rm, IPQueue queue) {

-		return SLURMJobAttributes.getTimeLimitAttributeDefinition();

-	}

-	/*

-	private IntegerAttributeDefinition getJobPartationAttrDef(IResourceManager rm, IPQueue queue) {

-		return JobAttributes.getJobPartationAttributeDefinition();

-	}

-	private IntegerAttributeDefinition getJobTypeComboAttrDef(IResourceManager rm, IPQueue queue) {

-		return JobAttributes.getJobTypeComboAttributeDefinition();

-	}

-	private IntegerAttributeDefinition getJobIoAttrDef(IResourceManager rm, IPQueue queue) {

-		return JobAttributes.getJobIoAttributeDefinition();

-	}

-	*/

-	//need to modify JobAttributes.java

-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationFactory.java
deleted file mode 100644
index 401bc3e..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.ui.rmLaunchConfiguration;

-

-import org.eclipse.core.runtime.CoreException;

-import org.eclipse.ptp.core.elements.IResourceManager;

-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;

-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;

-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManager;

-

-public class SLURMRMLaunchConfigurationFactory extends

-		AbstractRMLaunchConfigurationFactory {

-

-	@Override

-	protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm) throws CoreException {

-		return new SLURMRMLaunchConfigurationDynamicTab(rm);

-	}

-

-	@Override

-	public Class<? extends IResourceManager> getResourceManagerClass() {

-		return SLURMResourceManager.class;

-	}

-

-}

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMConfigurationWizardPage.java
deleted file mode 100644
index 3f2ff8f..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMConfigurationWizardPage.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.ui.wizards;

-

-import java.lang.reflect.InvocationTargetException;

-

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.IProgressMonitor;

-import org.eclipse.core.runtime.IStatus;

-import org.eclipse.core.runtime.Status;

-import org.eclipse.jface.dialogs.ErrorDialog;

-import org.eclipse.jface.dialogs.ProgressMonitorDialog;

-import org.eclipse.jface.operation.IRunnableWithProgress;

-import org.eclipse.jface.preference.FieldEditor;

-import org.eclipse.jface.util.IPropertyChangeListener;

-import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.ptp.remote.core.IRemoteConnection;

-import org.eclipse.ptp.remote.core.IRemoteServices;

-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;

-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;

-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;

-import org.eclipse.ptp.remote.ui.IRemoteUIServices;

-import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;

-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManagerConfiguration;

-import org.eclipse.ptp.rm.slurm.ui.Activator;

-import org.eclipse.ptp.rm.slurm.ui.messages.Messages;

-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;

-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;

-import org.eclipse.ptp.utils.ui.swt.SWTUtil;

-import org.eclipse.swt.SWT;

-import org.eclipse.swt.events.ModifyEvent;

-import org.eclipse.swt.events.ModifyListener;

-import org.eclipse.swt.events.SelectionAdapter;

-import org.eclipse.swt.events.SelectionEvent;

-import org.eclipse.swt.events.SelectionListener;

-import org.eclipse.swt.layout.GridData;

-import org.eclipse.swt.layout.GridLayout;

-import org.eclipse.swt.widgets.Button;

-import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.widgets.Label;

-import org.eclipse.swt.widgets.Text;

-

-public class SLURMConfigurationWizardPage extends RMConfigurationWizardPage {

-	

-	protected class WidgetListener extends SelectionAdapter implements ModifyListener, IPropertyChangeListener 

-	{

-		public void modifyText(ModifyEvent evt) {

-			Object source = evt.getSource();

-			if(!loading && (source == pathText || source == argsText)) {

-				updatePage();

-			}

-		}

-	

-		public void propertyChange(PropertyChangeEvent event) {

-			if (event.getProperty().equals(FieldEditor.IS_VALID)) {

-				updatePage();

-			}

-		}

-	

-		public void widgetSelected(SelectionEvent e) {

-			Object source = e.getSource();

-			if (source == browseButton) {

-				handlePathBrowseButtonSelected();

-			} else {

-				updateSettings();

-				updatePage();

-			}

-		}

-	}

-

-	public static final String EMPTY_STRING = ""; //$NON-NLS-1$

-

-	private SLURMResourceManagerConfiguration config;

-	private String slurmdPath = EMPTY_STRING;

-	private String slurmdArgs = EMPTY_STRING;

-	private IRemoteServices remoteServices = null;

-	private IRemoteConnection connection = null;

-	private boolean loading = true;

-	private boolean isValid;

-	private boolean useDefaults;

-	private Text pathText = null;

-

-	private Text argsText = null;

-	private Button browseButton = null;

-	private Button defaultButton = null;

-	private WidgetListener listener = new WidgetListener();

-	

-	public SLURMConfigurationWizardPage(IRMConfigurationWizard wizard) {

-		super(wizard, Messages.SLURMConfigurationWizardPage_name);

-		setTitle(Messages.SLURMConfigurationWizardPage_title);

-		setDescription(Messages.SLURMConfigurationWizardPage_description);

-		setPageComplete(true);

-		isValid = true;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage#createControl(org.eclipse.swt.widgets.Composite)

-	 */

-	public void createControl(Composite parent) {

-		Composite composite = new Composite(parent, SWT.NONE);

-		GridLayout topLayout = new GridLayout();

-	    composite.setLayout(topLayout);

-		createContents(composite);

-		setControl(composite);

-	}

-

-	/**

-	 * Save the current state in the RM configuration. This is called whenever

-	 * anything is changed.

-	 * 

-	 * @return

-	 */

-	public boolean performOk() 

-	{

-		store();

-		config.setUseDefaults(useDefaults);

-		if (!useDefaults) {

-			config.setSlurmdPath(slurmdPath);

-			config.setSlurmdArgs(slurmdArgs);

-		}

-		return true;

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)

-	 */

-	@Override

-	public void setVisible(boolean visible) {

-		if (visible) {

-			initContents();

-		}

-		super.setVisible(visible);

-	}

-	

-	/**

-	 * Create the contents of the wizard page.

-	 * 

-	 * @param parent

-	 * @param colSpan

-	 */

-	private void createContents(Composite parent) {

-		/*

-		 * Composite for remote provider and proxy location combo's

-		 */

-		Composite contents = new Composite(parent, SWT.NONE);

-		GridLayout layout = new GridLayout();

-		layout.numColumns = 3;

-		layout.marginWidth = 0;

-		contents.setLayout(layout);

-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);

-		gd.horizontalSpan = 3;

-		contents.setLayoutData(gd);

-

-		/*

-		 * Default

-		 */

-		defaultButton = createCheckButton(contents, Messages.SLURMConfigurationWizardPage_defaultButton);

-		defaultButton.addSelectionListener(listener);

-		gd = new GridData(GridData.FILL_HORIZONTAL);

-		gd.horizontalSpan = 3;

-		defaultButton.setLayoutData(gd);

-

-		/*

-		 * SLURMD path

-		 */

-		Label label = new Label(contents, SWT.NONE);

-		label.setText(Messages.SLURMConfigurationWizardPage_path);

-

-		pathText = new Text(contents, SWT.SINGLE | SWT.BORDER);

-		gd = new GridData(GridData.FILL_HORIZONTAL);

-		gd.horizontalSpan = 1;

-		gd.widthHint = 60;

-		pathText.setLayoutData(gd);

-		pathText.addModifyListener(listener);

-		

-		browseButton = SWTUtil.createPushButton(contents, Messages.SLURMConfigurationWizardPage_browseButton, null);

-		browseButton.addSelectionListener(listener);

-		

-		/*

-		 * SLURMD args

-		 */

-		label = new Label(contents, SWT.NONE);

-		label.setText(Messages.SLURMConfigurationWizardPage_arguments);

-		

-		argsText = new Text(contents, SWT.SINGLE | SWT.BORDER);

-		gd = new GridData(GridData.FILL_HORIZONTAL);

-		gd.horizontalSpan = 2;

-		argsText.setLayoutData(gd);

-		argsText.addModifyListener(listener);

-	}

-

-	/**

-	 * Initialize the contents of the controls.

-	 */

-	private void initContents() {

-		loading = true;

-		config = (SLURMResourceManagerConfiguration)getConfigurationWizard().getConfiguration();

-		loadSaved();

-		updateSettings();

-		defaultSetting();

-		loading = false;

-		updatePage();	

-	}

-	

-	/**

-	 * Load the initial wizard state from the configuration settings.

-	 */

-	private void loadSaved()

-	{

-		useDefaults = config.useDefaults();

-		slurmdPath = config.getSlurmdPath();

-		slurmdArgs = config.getSlurmdArgs();

-	}

-	

-	/**

-	 * @param b

-	 */

-	private void setValid(boolean b) {

-		isValid = b;

-		setPageComplete(isValid);

-	}

-	

-	/**

-	 * 

-	 */

-	private void store() 

-	{

-		if (!loading) {

-			if (defaultButton != null) {

-				useDefaults = defaultButton.getSelection();

-			}

-			if (pathText != null) {

-				slurmdPath = pathText.getText();

-			}

-			if (argsText != null) {

-				slurmdArgs = argsText.getText();

-			}

-		}

-	}

-	

-	/**

-	 * Update wizard UI selections from settings. This should be called whenever any

-	 * settings are changed.

-	 */

-	private void updateSettings() {

-		store();

-		pathText.setEnabled(!useDefaults);

-		argsText.setEnabled(!useDefaults);

-		browseButton.setEnabled(!useDefaults);

-	}

-

-	/**

-	 * Convenience method for creating a button widget.

-	 * 

-	 * @param parent

-	 * @param label

-	 * @param type

-	 * @return the button widget

-	 */

-	protected Button createButton(Composite parent, String label, int type) {

-		Button button = new Button(parent, type);

-		button.setText(label);

-		GridData data = new GridData();

-		button.setLayoutData(data);

-		return button;

-	}

-	

-	/**

-	 * Convenience method for creating a check button widget.

-	 * 

-	 * @param parent

-	 * @param label

-	 * @return the check button widget

-	 */

-	protected Button createCheckButton(Composite parent, String label) {

-		return createButton(parent, label, SWT.CHECK | SWT.LEFT);

-	}

-

-	/**

-	 * Convenience method for creating a grid layout.

-	 * 

-	 * @param columns

-	 * @param isEqual

-	 * @param mh

-	 * @param mw

-	 * @return the new grid layout

-	 */

-	protected GridLayout createGridLayout(int columns, boolean isEqual, int mh, int mw)  {

-		GridLayout gridLayout = new GridLayout();

-		gridLayout.numColumns = columns;

-		gridLayout.makeColumnsEqualWidth = isEqual;

-		gridLayout.marginHeight = mh;

-		gridLayout.marginWidth = mw;

-		return gridLayout;

-	}

-	

-	/**

-	 * Creates an new radio button instance and sets the default

-	 * layout data.

-	 *

-	 * @param group  the composite in which to create the radio button

-	 * @param label  the string to set into the radio button

-	 * @param value  the string to identify radio button

-	 * @return the new radio button

-	 */ 

-	protected Button createRadioButton(Composite parent, String label, String value, SelectionListener listener) {

-		Button button = createButton(parent, label, SWT.RADIO | SWT.LEFT);

-		button.setData((null == value) ? label : value);

-		GridData data = new GridData(GridData.FILL_HORIZONTAL);

-		data.horizontalAlignment = GridData.FILL;

-		data.verticalAlignment = GridData.BEGINNING;

-		button.setLayoutData(data);

-		if(null != listener) {

-			button.addSelectionListener(listener);

-		}

-		return button;

-	}

-	

-	/**

-	 * 

-	 */

-	protected void defaultSetting() 

-	{

-		defaultButton.setSelection(useDefaults);

-		pathText.setText(slurmdPath);

-		argsText.setText(slurmdArgs);

-	}

-

-	/**

-	 * Clean up the content of a text field.

-	 * 

-	 * @param text

-	 * @return cleaned up text.

-	 */

-	protected String getFieldContent(String text) 

-	{

-		if (text.trim().length() == 0 || text.equals(EMPTY_STRING))

-			return null;

-	

-		return text;

-	}

-

-	/**

-	 * Show a dialog that lets the user select a file.

-	 */

-	protected void handlePathBrowseButtonSelected() 

-	{

-		/*

-		 * Need to do this here because the connection may have been changed 

-		 * by the previous wizard page

-		 */

-		String rmID = config.getRemoteServicesId();

-		if (rmID != null) {

-			remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(rmID);

-			String conn = config.getConnectionName();

-			if (remoteServices != null && conn != null) {

-				connection = remoteServices.getConnectionManager().getConnection(conn);

-			}

-		}

-		

-		if (connection != null) {

-			if (!connection.isOpen()) {

-				IRunnableWithProgress op = new IRunnableWithProgress() {

-					public void run(IProgressMonitor monitor)

-							throws InvocationTargetException,

-							InterruptedException {

-						try {

-							connection.open(monitor);

-						} catch (RemoteConnectionException e) {

-							ErrorDialog.openError(getShell(), Messages.SLURMConfigurationWizardPage_connection_error,

-									Messages.SLURMConfigurationWizardPage_connection_error_msg,

-									new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage()));

-						}

-					}

-					

-				};

-				try {

-					new ProgressMonitorDialog(getShell()).run(true, true, op);

-				} catch (InvocationTargetException e) {

-					ErrorDialog.openError(getShell(), Messages.SLURMConfigurationWizardPage_connection_error,

-							Messages.SLURMConfigurationWizardPage_connection_error_msg,

-							new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage()));

-				} catch (InterruptedException e) {

-					ErrorDialog.openError(getShell(), Messages.SLURMConfigurationWizardPage_connection_error,

-							Messages.SLURMConfigurationWizardPage_connection_error_msg,

-							new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage()));

-				}

-			}

-			IRemoteUIServices remoteUIServices = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(remoteServices);

-			IRemoteUIFileManager fileMgr = remoteUIServices.getUIFileManager();

-			

-			String initialPath = "//"; // Start at root since SLURMD is probably installed in the system somewhere //$NON-NLS-1$

-			IPath selectedPath = fileMgr.browseFile(getControl().getShell(), Messages.SLURMConfigurationWizardPage_select, initialPath);

-			if (selectedPath != null) {

-				pathText.setText(selectedPath.toString());

-			}

-		}

-	}

-

-	/**

-	 * @return

-	 */

-	protected boolean isValidSetting() 

-	{

-		if (defaultButton != null && defaultButton.getSelection()) {

-			return true;

-		}

-		

-		if (pathText != null) {

-			String name = getFieldContent(pathText.getText());

-			if (name == null) {

-				setErrorMessage(Messages.SLURMConfigurationWizardPage_invalid); 

-				return false;

-			}

-		}

-	

-		return true;

-	}

-

-	/**

-	 * @param style

-	 * @param space

-	 * @return

-	 */

-	protected GridData spanGridData(int style, int space) 

-	{

-		GridData gd = null;

-		if (style == -1)

-			gd = new GridData();

-		else

-			gd = new GridData(style);

-		gd.horizontalSpan = space;

-		return gd;

-	}

-

-	/**

-	 * 

-	 */

-	protected void updatePage() 

-	{

-		setErrorMessage(null);

-		setMessage(null);

-	

-		if (!isValidSetting()) {

-			setValid(false);

-		} else {	

-			performOk();

-			setValid(true);

-		}

-	}

-}

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPage.java
deleted file mode 100644
index 3b9b375..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPage.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.ui.wizards;

-

-import org.eclipse.ptp.rm.remote.ui.wizards.AbstractRemoteProxyResourceManagerConfigurationWizardPage;

-import org.eclipse.ptp.rm.slurm.ui.messages.Messages;

-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;

-

-public final class SLURMResourceManagerConfigurationWizardPage extends

-	AbstractRemoteProxyResourceManagerConfigurationWizardPage {

-	

-	public SLURMResourceManagerConfigurationWizardPage(IRMConfigurationWizard wizard) {

-		super(wizard, Messages.SLURMResourceManagerConfigurationWizardPage_name);

-		setTitle(Messages.SLURMResourceManagerConfigurationWizardPage_title);

-		setDescription(Messages.SLURMResourceManagerConfigurationWizardPage_description);

-	}

-}

diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPageFactory.java
deleted file mode 100644
index 90ca8f0..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPageFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008,2009 

- * School of Computer, National University of Defense Technology, P.R.China

- *

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * 			Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>

- *******************************************************************************/

-package org.eclipse.ptp.rm.slurm.ui.wizards;

-

-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManagerFactory;

-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;

-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;

-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;

-

-public class SLURMResourceManagerConfigurationWizardPageFactory extends

-		RMConfigurationWizardPageFactory {

-

-	public SLURMResourceManagerConfigurationWizardPageFactory() {

-		// no-op

-	}

-

-	public RMConfigurationWizardPage[] getPages(IRMConfigurationWizard wizard) {

-		return new RMConfigurationWizardPage[]{

-				new SLURMResourceManagerConfigurationWizardPage(wizard),

-				//new SLURMConfigurationWizardPage(wizard)

-		};

-	}

-

-	public Class<SLURMResourceManagerFactory> getRMFactoryClass() {

-		return SLURMResourceManagerFactory.class;

-	}

-}

diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/.classpath b/tools/pldt/org.eclipse.ptp.pldt.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/.project b/tools/pldt/org.eclipse.ptp.pldt.tests/.project
deleted file mode 100644
index edd88d3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9fda8be..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Jun 19 09:17:08 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 5206e5c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests Plug-in
-Bundle-SymbolicName: org.eclipse.ptp.pldt.tests
-Bundle-Version: 1.0.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit;bundle-version="3.8.2",
- org.eclipse.cdt.core.tests;bundle-version="5.0.0",
- org.eclipse.core.resources;bundle-version="3.4.0",
- org.eclipse.cdt.core,
- org.eclipse.ptp.pldt.common;bundle-version="2.1.0",
- org.eclipse.ptp.pldt.mpi.core;bundle-version="2.0.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/build.properties b/tools/pldt/org.eclipse.ptp.pldt.tests/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/includes/mpi.h b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/includes/mpi.h
deleted file mode 100644
index ff71cd3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/includes/mpi.h
+++ /dev/null
@@ -1,1787 +0,0 @@
-/* ompi/include/mpi.h.  Generated by configure.  */
-/*
- * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2006 The University of Tennessee and The University
- *                         of Tennessee Research Foundation.  All rights
- *                         reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
- *                         University of Stuttgart.  All rights reserved.
- * Copyright (c) 2004-2005 The Regents of the University of California.
- *                         All rights reserved.
- * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#ifndef OMPI_MPI_H
-#define OMPI_MPI_H
-
-/* The comment below (and the ending partner) are for building fat
-   distributions on platforms that support it.  Please do not remove */
-
-/* @OMPI_BEGIN_CONFIGURE_SECTION@ */
-
-#ifndef OMPI_CONFIG_H
-
-/* Only include these if OMPI_CONFIG_H isn't defined (meaning if
-   ompi_config.h hasn't already been included).  Otherwise, we'll
-   duplicate all those symbols.  OMPI coding standards say that
-   ompi_config.h must be included before all other files, so this
-   should be good enough */
-
-/* Whether we have FORTRAN INTEGER*1 or not */
-#define OMPI_HAVE_FORTRAN_INTEGER1 0
-
-/* Whether we have FORTRAN INTEGER*16 or not */
-#define OMPI_HAVE_FORTRAN_INTEGER16 0
-
-/* Whether we have FORTRAN INTEGER*2 or not */
-#define OMPI_HAVE_FORTRAN_INTEGER2 0
-
-/* Whether we have FORTRAN INTEGER*4 or not */
-#define OMPI_HAVE_FORTRAN_INTEGER4 0
-
-/* Whether we have FORTRAN INTEGER*8 or not */
-#define OMPI_HAVE_FORTRAN_INTEGER8 0
-
-/* Whether we have FORTRAN REAL*16 or not */
-#define OMPI_HAVE_FORTRAN_REAL16 0
-
-/* Whether we have FORTRAN REAL*4 or not */
-#define OMPI_HAVE_FORTRAN_REAL4 0
-
-/* Whether we have FORTRAN REAL*8 or not */
-#define OMPI_HAVE_FORTRAN_REAL8 0
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if the system has the type `long long'. */
-#define HAVE_LONG_LONG 1
-
-/* The size of a `bool', as computed by sizeof. */
-#define SIZEOF_BOOL 1
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* Type of MPI_Offset -- has to be defined here and typedef'ed later because mpi.h does not get AC SUBST's */
-#define OMPI_MPI_OFFSET_TYPE long long
-
-/* type to use for ptrdiff_t, if it does not exist, set to ptrdiff_t if it does exist */
-#define OMPI_PTRDIFF_TYPE ptrdiff_t
-
-/* Whether we want MPI cxx support or not */
-#define OMPI_WANT_CXX_BINDINGS 1
-
-/* do we want to try to work around C++ bindings SEEK_* issue? */
-#define OMPI_WANT_MPI_CXX_SEEK 1
-
-/* Whether a const_cast on a 2-d array will work with the C++ compiler */
-#define OMPI_CXX_SUPPORTS_2D_CONST_CAST 1
-
-/* Whether we want the MPI f77 bindings or not */
-#define OMPI_WANT_F77_BINDINGS 0
-
-/* Whether we want the MPI f90 bindings or not */
-#define OMPI_WANT_F90_BINDINGS 0
-
-/* Whether or not we have compiled with C++ exceptions support */
-#define OMPI_HAVE_CXX_EXCEPTION_SUPPORT 0
-
-/* MPI datatype corresponding to MPI_Offset */
-#define OMPI_OFFSET_DATATYPE MPI_LONG_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Major, minor, and release version of Open MPI */
-#define OMPI_MAJOR_VERSION 1
-#define OMPI_MINOR_VERSION 2
-#define OMPI_RELEASE_VERSION 3
-
-/* A  type that allows us to have sentinel type values that are still
-   valid */
-#define ompi_fortran_bogus_type_t int
-
-/* C type corresponding to FORTRAN INTEGER */
-#define ompi_fortran_integer_t ompi_fortran_bogus_type_t
-
-#ifndef OMPI_DECLSPEC
-#if defined(WIN32) || defined(_WIN32)
-#define OMPI_DECLSPEC __declspec(dllimport)
-#else
-#define OMPI_DECLSPEC
-#endif
-#endif
-
-#ifndef MPI_Fint
-/* MPI_Fint is the same as ompi_fortran_INTEGER_t */
-#define MPI_Fint ompi_fortran_integer_t
-#endif
-
-#endif /* #ifndef OMPI_CONFIG_H */
-
-/* @OMPI_END_CONFIGURE_SECTION@ */
-
-/* include for ptrdiff_t */
-#ifdef STDC_HEADERS
-#include <stddef.h>
-#endif
-
-#ifndef OMPI_BUILDING
-#define OMPI_BUILDING 0
-#endif
-
-
-/*
- * Just in case you need it.  :-)
- */
-#define OPEN_MPI 1
-
-/*
- * MPI version
- */
-#define MPI_VERSION 2
-#define MPI_SUBVERSION 0
-
-/*
- * To accomodate programs written for MPI implementations that use a
- * straight ROMIO import
- */
-#if !OMPI_BUILDING
-#define MPIO_Request MPI_Request
-#define MPIO_Test MPI_Test
-#define MPIO_Wait MPI_Wait
-#endif
-
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
-/*
- * Typedefs
- */
-
-typedef OMPI_PTRDIFF_TYPE MPI_Aint;
-typedef OMPI_MPI_OFFSET_TYPE MPI_Offset;
-typedef struct ompi_communicator_t *MPI_Comm;
-typedef struct ompi_datatype_t *MPI_Datatype;
-typedef struct ompi_errhandler_t *MPI_Errhandler;
-typedef struct ompi_file_t *MPI_File;
-typedef struct ompi_group_t *MPI_Group;
-typedef struct ompi_info_t *MPI_Info;
-typedef struct ompi_op_t *MPI_Op;
-typedef struct ompi_request_t *MPI_Request;
-typedef struct ompi_status_public_t MPI_Status;
-typedef struct ompi_win_t *MPI_Win;
-
-/*
- * MPI_Status
- */
-struct ompi_status_public_t {
-  int MPI_SOURCE;
-  int MPI_TAG;
-  int MPI_ERROR;
-  int _count;
-  int _cancelled;
-};
-typedef struct ompi_status_public_t ompi_status_public_t;
-
-/*
- * User typedefs
- */
-typedef int (MPI_Copy_function)(MPI_Comm, int, void *,
-                                void *, void *, int *);
-typedef int (MPI_Delete_function)(MPI_Comm, int, void *, void *);
-typedef int (MPI_Datarep_extent_function)(MPI_Datatype, MPI_Aint *, void *);
-typedef int (MPI_Datarep_conversion_function)(void *, MPI_Datatype,
-                                              int, void *, MPI_Offset, void *);
-typedef void (MPI_Comm_errhandler_fn)(MPI_Comm *, int *, ...);
-typedef void (MPI_File_errhandler_fn)(MPI_File *, int *, ...);
-typedef void (MPI_Win_errhandler_fn)(MPI_Win *, int *, ...);
-typedef void (MPI_Handler_function)(MPI_Comm *, int *, ...);
-typedef void (MPI_User_function)(void *, void *, int *, MPI_Datatype *);
-typedef int (MPI_Comm_copy_attr_function)(MPI_Comm, int, void *,
-                                            void *, void *, int *);
-typedef int (MPI_Comm_delete_attr_function)(MPI_Comm, int, void *, void *);
-typedef int (MPI_Type_copy_attr_function)(MPI_Datatype, int, void *,
-                                            void *, void *, int *);
-typedef int (MPI_Type_delete_attr_function)(MPI_Datatype, int,
-                                              void *, void *);
-typedef int (MPI_Win_copy_attr_function)(MPI_Win, int, void *,
-                                           void *, void *, int *);
-typedef int (MPI_Win_delete_attr_function)(MPI_Win, int, void *, void *);
-typedef int (MPI_Grequest_query_function)(void *, MPI_Status *);
-typedef int (MPI_Grequest_free_function)(void *);
-typedef int (MPI_Grequest_cancel_function)(void *, int);
-
-/*
- * Miscellaneous constants
- */
-#define MPI_ANY_SOURCE         -1      /* match any source rank */
-#define MPI_PROC_NULL          -2      /* rank of null process */
-#define MPI_ROOT               -4
-#define MPI_ANY_TAG            -1      /* match any message tag */
-#define MPI_MAX_PROCESSOR_NAME 256     /* max proc. name length */
-#define MPI_MAX_ERROR_STRING   256     /* max error message length */
-#define MPI_MAX_OBJECT_NAME    64      /* max object name length */
-#define MPI_UNDEFINED          -32766  /* undefined stuff */
-#define MPI_CART               1       /* cartesian topology */
-#define MPI_GRAPH              2       /* graph topology */
-#define MPI_KEYVAL_INVALID     -1      /* invalid key value */
-
-/*
- * More constants
- */
-#define MPI_BOTTOM               ((void *) 0)    /* base reference address */
-#define MPI_IN_PLACE             ((void *) 1)    /* in place buffer */
-#define MPI_BSEND_OVERHEAD       128     /* size of bsend header + ptr */
-#define MPI_MAX_INFO_KEY         36      /* max info key length */
-#define MPI_MAX_INFO_VAL         256     /* max info value length */
-#define MPI_ARGV_NULL            ((char **) 0)   /* NULL argument vector */
-#define MPI_ARGVS_NULL           ((char ***) 0)  /* NULL argument vectors */
-#define MPI_ERRCODES_IGNORE      ((int *) 0)    /* don't return error codes */
-#define MPI_MAX_PORT_NAME        36      /* max port name length */
-#define MPI_MAX_NAME_LEN         MPI_MAX_PORT_NAME /* max port name length */
-#define MPI_ORDER_C              0       /* C row major order */
-#define MPI_ORDER_FORTRAN        1       /* Fortran column major order */
-#define MPI_DISTRIBUTE_BLOCK     0       /* block distribution */
-#define MPI_DISTRIBUTE_CYCLIC    1       /* cyclic distribution */
-#define MPI_DISTRIBUTE_NONE      2       /* not distributed */
-#define MPI_DISTRIBUTE_DFLT_DARG (-1)    /* default distribution arg */
-
-/*
- * Since these values are arbitrary to Open MPI, we might as well make
- * them the same as ROMIO for ease of mapping.  These values taken
- * from ROMIO's mpio.h file.
- */
-#define MPI_MODE_CREATE              1  /* ADIO_CREATE */
-#define MPI_MODE_RDONLY              2  /* ADIO_RDONLY */
-#define MPI_MODE_WRONLY              4  /* ADIO_WRONLY  */
-#define MPI_MODE_RDWR                8  /* ADIO_RDWR  */
-#define MPI_MODE_DELETE_ON_CLOSE    16  /* ADIO_DELETE_ON_CLOSE */
-#define MPI_MODE_UNIQUE_OPEN        32  /* ADIO_UNIQUE_OPEN */
-#define MPI_MODE_EXCL               64  /* ADIO_EXCL */
-#define MPI_MODE_APPEND            128  /* ADIO_APPEND */
-#define MPI_MODE_SEQUENTIAL        256  /* ADIO_SEQUENTIAL */
-
-#define MPI_DISPLACEMENT_CURRENT   -54278278
-
-#define MPI_SEEK_SET            600
-#define MPI_SEEK_CUR            602
-#define MPI_SEEK_END            604
-
-#define MPI_MAX_DATAREP_STRING  128
-
-/*
- * MPI-2 One-Sided Communications asserts
- */
-#define MPI_MODE_NOCHECK             1
-#define MPI_MODE_NOPRECEDE           2
-#define MPI_MODE_NOPUT               4
-#define MPI_MODE_NOSTORE             8
-#define MPI_MODE_NOSUCCEED          16
-
-#define MPI_LOCK_EXCLUSIVE           1
-#define MPI_LOCK_SHARED              2
-
-
-/*
- * Predefined attribute keyvals
- *
- * DO NOT CHANGE THE ORDER WITHOUT ALSO CHANGING THE ORDER IN
- * src/attribute/attribute_predefined.c and mpif.h.in.
- */
-enum {
-    /* MPI-1 */
-    MPI_TAG_UB,
-    MPI_HOST,
-    MPI_IO,
-    MPI_WTIME_IS_GLOBAL,
-
-    /* MPI-2 */
-    MPI_APPNUM,
-    MPI_LASTUSEDCODE,
-    MPI_UNIVERSE_SIZE,
-    MPI_WIN_BASE,
-    MPI_WIN_SIZE,
-    MPI_WIN_DISP_UNIT,
-
-    /* Even though these four are IMPI attributes, they need to be there
-       for all MPI jobs */
-    IMPI_CLIENT_SIZE,
-    IMPI_CLIENT_COLOR,
-    IMPI_HOST_SIZE,
-    IMPI_HOST_COLOR
-};
-
-/*
- * Error classes and codes
- * Do not change the values of these without also modifying mpif.h.in.
- */
-#define MPI_SUCCESS                   0
-#define MPI_ERR_BUFFER                1
-#define MPI_ERR_COUNT                 2
-#define MPI_ERR_TYPE                  3
-#define MPI_ERR_TAG                   4
-#define MPI_ERR_COMM                  5
-#define MPI_ERR_RANK                  6
-#define MPI_ERR_REQUEST               7
-#define MPI_ERR_ROOT                  8
-#define MPI_ERR_GROUP                 9
-#define MPI_ERR_OP                    10
-#define MPI_ERR_TOPOLOGY              11
-#define MPI_ERR_DIMS                  12
-#define MPI_ERR_ARG                   13
-#define MPI_ERR_UNKNOWN               14
-#define MPI_ERR_TRUNCATE              15
-#define MPI_ERR_OTHER                 16
-#define MPI_ERR_INTERN                17
-#define MPI_ERR_IN_STATUS             18
-#define MPI_ERR_PENDING               19
-#define MPI_ERR_ACCESS                20
-#define MPI_ERR_AMODE                 21
-#define MPI_ERR_ASSERT                22
-#define MPI_ERR_BAD_FILE              23
-#define MPI_ERR_BASE                  24
-#define MPI_ERR_CONVERSION            25
-#define MPI_ERR_DISP                  26
-#define MPI_ERR_DUP_DATAREP           27
-#define MPI_ERR_FILE_EXISTS           28
-#define MPI_ERR_FILE_IN_USE           29
-#define MPI_ERR_FILE                  30
-#define MPI_ERR_INFO_KEY              31
-#define MPI_ERR_INFO_NOKEY            32
-#define MPI_ERR_INFO_VALUE            33
-#define MPI_ERR_INFO                  34
-#define MPI_ERR_IO                    35
-#define MPI_ERR_KEYVAL                36
-#define MPI_ERR_LOCKTYPE              37
-#define MPI_ERR_NAME                  38
-#define MPI_ERR_NO_MEM                39
-#define MPI_ERR_NOT_SAME              40
-#define MPI_ERR_NO_SPACE              41
-#define MPI_ERR_NO_SUCH_FILE          42
-#define MPI_ERR_PORT                  43
-#define MPI_ERR_QUOTA                 44
-#define MPI_ERR_READ_ONLY             45
-#define MPI_ERR_RMA_CONFLICT          46
-#define MPI_ERR_RMA_SYNC              47
-#define MPI_ERR_SERVICE               48
-#define MPI_ERR_SIZE                  49
-#define MPI_ERR_SPAWN                 50
-#define MPI_ERR_UNSUPPORTED_DATAREP   51
-#define MPI_ERR_UNSUPPORTED_OPERATION 52
-#define MPI_ERR_WIN                   53
-#define MPI_ERR_LASTCODE              54
-
-#define MPI_ERR_SYSRESOURCE          -2
-
-
-/*
- * Comparison results.  Don't change the order of these, the group
- * comparison functions rely on it.
- * Do not change the order of these without also modifying mpif.h.in.
- */
-enum {
-  MPI_IDENT,
-  MPI_CONGRUENT,
-  MPI_SIMILAR,
-  MPI_UNEQUAL
-};
-
-/*
- * MPI_Init_thread constants
- * Do not change the order of these without also modifying mpif.h.in.
- */
-enum {
-  MPI_THREAD_SINGLE,
-  MPI_THREAD_FUNNELED,
-  MPI_THREAD_SERIALIZED,
-  MPI_THREAD_MULTIPLE
-};
-
-/*
- * Datatype combiners.
- * Do not change the order of these without also modifying mpif.h.in.
- */
-enum {
-  MPI_COMBINER_NAMED,
-  MPI_COMBINER_DUP,
-  MPI_COMBINER_CONTIGUOUS,
-  MPI_COMBINER_VECTOR,
-  MPI_COMBINER_HVECTOR_INTEGER,
-  MPI_COMBINER_HVECTOR,
-  MPI_COMBINER_INDEXED,
-  MPI_COMBINER_HINDEXED_INTEGER,
-  MPI_COMBINER_HINDEXED,
-  MPI_COMBINER_INDEXED_BLOCK,
-  MPI_COMBINER_STRUCT_INTEGER,
-  MPI_COMBINER_STRUCT,
-  MPI_COMBINER_SUBARRAY,
-  MPI_COMBINER_DARRAY,
-  MPI_COMBINER_F90_REAL,
-  MPI_COMBINER_F90_COMPLEX,
-  MPI_COMBINER_F90_INTEGER,
-  MPI_COMBINER_RESIZED
-};
-
-/*
- * NULL handles
- */
-#define MPI_GROUP_NULL (&ompi_mpi_group_null)
-#define MPI_COMM_NULL (&ompi_mpi_comm_null)
-#define MPI_REQUEST_NULL (&ompi_request_null)
-#define MPI_OP_NULL (&ompi_mpi_op_null)
-#define MPI_ERRHANDLER_NULL (&ompi_mpi_errhandler_null)
-#define MPI_INFO_NULL (&ompi_mpi_info_null)
-#define MPI_WIN_NULL (&ompi_mpi_win_null)
-#define MPI_FILE_NULL (&ompi_mpi_file_null)
-
-#define MPI_STATUS_IGNORE ((MPI_Status *) 0)
-#define MPI_STATUSES_IGNORE ((MPI_Status *) 0)
-
-/* MPI-2 specifies that the name "MPI_TYPE_NULL_DELETE_FN" (and all
-   related friends) must be accessible in C, C++, and Fortran. This is
-   unworkable if the back-end Fortran compiler uses all caps for its
-   linker symbol convention -- it results in two functions with
-   different signatures that have the same name (i.e., both C and
-   Fortran use the symbol MPI_TYPE_NULL_DELETE_FN).  So we have to
-   #define the C names to be something else, so that they names are
-   *accessed* through MPI_TYPE_NULL_DELETE_FN, but their actual symbol
-   name is different.
-
-   However, this file is included when the fortran wrapper functions
-   are compiled in Open MPI, so we do *not* want these #defines in
-   this case (i.e., we need the Fortran wrapper function to be
-   compiled as MPI_TYPE_NULL_DELETE_FN).  So add some #if kinds of
-   protection for this case. */
-
-#if !defined(OMPI_COMPILING_F77_WRAPPERS)
-#define MPI_NULL_DELETE_FN OMPI_C_MPI_NULL_DELETE_FN
-#define MPI_NULL_COPY_FN OMPI_C_MPI_NULL_COPY_FN
-#define MPI_DUP_FN OMPI_C_MPI_DUP_FN
-
-#define MPI_TYPE_NULL_DELETE_FN OMPI_C_MPI_TYPE_NULL_DELETE_FN
-#define MPI_TYPE_NULL_COPY_FN OMPI_C_MPI_TYPE_NULL_COPY_FN
-#define MPI_TYPE_DUP_FN OMPI_C_MPI_TYPE_DUP_FN
-
-#define MPI_COMM_NULL_DELETE_FN OMPI_C_MPI_COMM_NULL_DELETE_FN
-#define MPI_COMM_NULL_COPY_FN OMPI_C_MPI_COMM_NULL_COPY_FN
-#define MPI_COMM_DUP_FN OMPI_C_MPI_COMM_DUP_FN
-
-#define MPI_WIN_NULL_DELETE_FN OMPI_C_MPI_WIN_NULL_DELETE_FN
-#define MPI_WIN_NULL_COPY_FN OMPI_C_MPI_WIN_NULL_COPY_FN
-#define MPI_WIN_DUP_FN OMPI_C_MPI_WIN_DUP_FN
-#endif
-
-OMPI_DECLSPEC int OMPI_C_MPI_TYPE_NULL_DELETE_FN( MPI_Datatype datatype,
-                                                  int type_keyval,
-                                                  void* attribute_val_out,
-                                                  void* extra_state );
-OMPI_DECLSPEC int OMPI_C_MPI_TYPE_NULL_COPY_FN( MPI_Datatype datatype,
-                                                int type_keyval,
-                                                void* extra_state,
-                                                void* attribute_val_in,
-                                                void* attribute_val_out,
-                                                int* flag );
-OMPI_DECLSPEC int OMPI_C_MPI_TYPE_DUP_FN( MPI_Datatype datatype,
-                                          int type_keyval,
-                                          void* extra_state,
-                                          void* attribute_val_in,
-                                          void* attribute_val_out,
-                                          int* flag );
-OMPI_DECLSPEC int OMPI_C_MPI_COMM_NULL_DELETE_FN( MPI_Comm comm,
-                                                  int comm_keyval,
-                                                  void* attribute_val_out,
-                                                  void* extra_state );
-OMPI_DECLSPEC int OMPI_C_MPI_COMM_NULL_COPY_FN( MPI_Comm comm,
-                                                int comm_keyval,
-                                                void* extra_state,
-                                                void* attribute_val_in,
-                                                void* attribute_val_out,
-                                                int* flag );
-OMPI_DECLSPEC int OMPI_C_MPI_COMM_DUP_FN( MPI_Comm comm, int comm_keyval,
-                                          void* extra_state,
-                                          void* attribute_val_in,
-                                          void* attribute_val_out,
-                                          int* flag );
-OMPI_DECLSPEC int OMPI_C_MPI_NULL_DELETE_FN( MPI_Comm comm, int comm_keyval,
-                                             void* attribute_val_out,
-                                             void* extra_state );
-OMPI_DECLSPEC int OMPI_C_MPI_NULL_COPY_FN( MPI_Comm comm, int comm_keyval,
-                                           void* extra_state,
-                                           void* attribute_val_in,
-                                           void* attribute_val_out,
-                                           int* flag );
-OMPI_DECLSPEC int OMPI_C_MPI_DUP_FN( MPI_Comm comm, int comm_keyval,
-                                     void* extra_state,
-                                     void* attribute_val_in,
-                                     void* attribute_val_out,
-                                     int* flag );
-OMPI_DECLSPEC int OMPI_C_MPI_WIN_NULL_DELETE_FN( MPI_Win window,
-                                                 int win_keyval,
-                                                 void* attribute_val_out,
-                                                 void* extra_state );
-OMPI_DECLSPEC int OMPI_C_MPI_WIN_NULL_COPY_FN( MPI_Win window, int win_keyval,
-                                               void* extra_state,
-                                               void* attribute_val_in,
-                                               void* attribute_val_out,
-                                               int* flag );
-OMPI_DECLSPEC int OMPI_C_MPI_WIN_DUP_FN( MPI_Win window, int win_keyval,
-                                         void* extra_state,
-                                         void* attribute_val_in,
-                                         void* attribute_val_out,
-                                         int* flag );
-
-
-/*
- * External variables
- */
-OMPI_DECLSPEC extern struct ompi_communicator_t ompi_mpi_comm_world;
-OMPI_DECLSPEC extern struct ompi_communicator_t ompi_mpi_comm_self;
-OMPI_DECLSPEC extern struct ompi_communicator_t ompi_mpi_comm_null;
-
-OMPI_DECLSPEC extern struct ompi_group_t ompi_mpi_group_empty;
-OMPI_DECLSPEC extern struct ompi_group_t ompi_mpi_group_null;
-
-OMPI_DECLSPEC extern struct ompi_request_t ompi_request_null;
-
-OMPI_DECLSPEC extern struct ompi_op_t ompi_mpi_op_null;
-OMPI_DECLSPEC extern struct ompi_op_t ompi_mpi_op_max, ompi_mpi_op_min;
-OMPI_DECLSPEC extern struct ompi_op_t ompi_mpi_op_sum, ompi_mpi_op_prod;
-OMPI_DECLSPEC extern struct ompi_op_t ompi_mpi_op_land, ompi_mpi_op_band;
-OMPI_DECLSPEC extern struct ompi_op_t ompi_mpi_op_lor, ompi_mpi_op_bor;
-OMPI_DECLSPEC extern struct ompi_op_t ompi_mpi_op_lxor, ompi_mpi_op_bxor;
-OMPI_DECLSPEC extern struct ompi_op_t ompi_mpi_op_maxloc, ompi_mpi_op_minloc;
-OMPI_DECLSPEC extern struct ompi_op_t ompi_mpi_op_replace;
-
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_char, ompi_mpi_byte;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_int, ompi_mpi_logic;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_short, ompi_mpi_long;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_float, ompi_mpi_double;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_long_double;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_cplex, ompi_mpi_packed;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_signed_char;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_unsigned_char;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_unsigned_short;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_unsigned, ompi_mpi_datatype_null;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_unsigned_long, ompi_mpi_ldblcplex;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_ub, ompi_mpi_lb;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_float_int, ompi_mpi_double_int;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_long_int, ompi_mpi_2int;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_short_int, ompi_mpi_dblcplex;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_integer, ompi_mpi_real;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_dblprec, ompi_mpi_character;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_2real, ompi_mpi_2dblprec;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_2integer, ompi_mpi_longdbl_int;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_wchar, ompi_mpi_long_long_int;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_unsigned_long_long;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_cxx_cplex, ompi_mpi_cxx_dblcplex;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_cxx_ldblcplex;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_cxx_bool;
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_2cplex, ompi_mpi_2dblcplex;
-/* other MPI2 datatypes */
-#if OMPI_HAVE_FORTRAN_INTEGER1
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_integer1;
-#endif
-#if OMPI_HAVE_FORTRAN_INTEGER2
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_integer2;
-#endif
-#if OMPI_HAVE_FORTRAN_INTEGER4
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_integer4;
-#endif
-#if OMPI_HAVE_FORTRAN_INTEGER8
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_integer8;
-#endif
-#if OMPI_HAVE_FORTRAN_INTEGER16
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_integer16;
-#endif
-#if OMPI_HAVE_FORTRAN_REAL4
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_real4;
-#endif
-#if OMPI_HAVE_FORTRAN_REAL8
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_real8;
-#endif
-#if OMPI_HAVE_FORTRAN_REAL16
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_real16;
-#endif
-#if OMPI_HAVE_FORTRAN_REAL4
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_complex8;
-#endif
-#if OMPI_HAVE_FORTRAN_REAL8
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_complex16;
-#endif
-#if OMPI_HAVE_FORTRAN_REAL16
-OMPI_DECLSPEC extern struct ompi_datatype_t ompi_mpi_complex32;
-#endif
-
-OMPI_DECLSPEC extern struct ompi_errhandler_t ompi_mpi_errhandler_null;
-OMPI_DECLSPEC extern struct ompi_errhandler_t ompi_mpi_errors_are_fatal;
-OMPI_DECLSPEC extern struct ompi_errhandler_t ompi_mpi_errors_return;
-
-OMPI_DECLSPEC extern struct ompi_win_t ompi_mpi_win_null;
-OMPI_DECLSPEC extern struct ompi_file_t ompi_mpi_file_null;
-
-OMPI_DECLSPEC extern struct ompi_info_t ompi_mpi_info_null;
-
-OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUS_IGNORE;
-OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE;
-
-/*
- * MPI predefined handles
- */
-#define MPI_COMM_WORLD (&ompi_mpi_comm_world)
-#define MPI_COMM_SELF (&ompi_mpi_comm_self)
-
-#define MPI_GROUP_EMPTY (&ompi_mpi_group_empty)
-
-#define MPI_MAX (&ompi_mpi_op_max)
-#define MPI_MIN (&ompi_mpi_op_min)
-#define MPI_SUM (&ompi_mpi_op_sum)
-#define MPI_PROD (&ompi_mpi_op_prod)
-#define MPI_LAND (&ompi_mpi_op_land)
-#define MPI_BAND (&ompi_mpi_op_band)
-#define MPI_LOR (&ompi_mpi_op_lor)
-#define MPI_BOR (&ompi_mpi_op_bor)
-#define MPI_LXOR (&ompi_mpi_op_lxor)
-#define MPI_BXOR (&ompi_mpi_op_bxor)
-#define MPI_MAXLOC (&ompi_mpi_op_maxloc)
-#define MPI_MINLOC (&ompi_mpi_op_minloc)
-#define MPI_REPLACE (&ompi_mpi_op_replace)
-
-/* C datatypes */
-#define MPI_DATATYPE_NULL (&ompi_mpi_datatype_null)
-#define MPI_BYTE (&ompi_mpi_byte)
-#define MPI_PACKED (&ompi_mpi_packed)
-#define MPI_CHAR (&ompi_mpi_char)
-#define MPI_SHORT (&ompi_mpi_short)
-#define MPI_INT (&ompi_mpi_int)
-#define MPI_LONG (&ompi_mpi_long)
-#define MPI_FLOAT (&ompi_mpi_float)
-#define MPI_DOUBLE (&ompi_mpi_double)
-#define MPI_LONG_DOUBLE (&ompi_mpi_long_double)
-#define MPI_UNSIGNED_CHAR (&ompi_mpi_unsigned_char)
-#define MPI_SIGNED_CHAR (&ompi_mpi_signed_char)
-#define MPI_UNSIGNED_SHORT (&ompi_mpi_unsigned_short)
-#define MPI_UNSIGNED_LONG (&ompi_mpi_unsigned_long)
-#define MPI_UNSIGNED (&ompi_mpi_unsigned)
-#define MPI_FLOAT_INT (&ompi_mpi_float_int)
-#define MPI_DOUBLE_INT (&ompi_mpi_double_int)
-#define MPI_LONG_DOUBLE_INT (&ompi_mpi_longdbl_int)
-#define MPI_LONG_INT (&ompi_mpi_long_int)
-#define MPI_SHORT_INT (&ompi_mpi_short_int)
-#define MPI_2INT (&ompi_mpi_2int)
-#define MPI_UB (&ompi_mpi_ub)
-#define MPI_LB (&ompi_mpi_lb)
-#define MPI_WCHAR (&ompi_mpi_wchar)
-#if HAVE_LONG_LONG
-#define MPI_LONG_LONG_INT (&ompi_mpi_long_long_int)
-#define MPI_LONG_LONG (&ompi_mpi_long_long_int)
-#define MPI_UNSIGNED_LONG_LONG (&ompi_mpi_unsigned_long_long)
-#endif  /* HAVE_LONG_LONG */
-#define MPI_2COMPLEX (&ompi_mpi_2cplex)
-#define MPI_2DOUBLE_COMPLEX (&ompi_mpi_2dblcplex)
-
-/* Fortran datatype bindings */
-#define MPI_CHARACTER (&ompi_mpi_character)
-#define MPI_LOGICAL (&ompi_mpi_logic)
-#define MPI_INTEGER (&ompi_mpi_integer)
-#if OMPI_HAVE_FORTRAN_INTEGER1
-#define MPI_INTEGER1 (&ompi_mpi_integer1)
-#endif
-#if OMPI_HAVE_FORTRAN_INTEGER2
-#define MPI_INTEGER2 (&ompi_mpi_integer2)
-#endif
-#if OMPI_HAVE_FORTRAN_INTEGER4
-#define MPI_INTEGER4 (&ompi_mpi_integer4)
-#endif
-#if OMPI_HAVE_FORTRAN_INTEGER8
-#define MPI_INTEGER8 (&ompi_mpi_integer8)
-#endif
-#if OMPI_HAVE_FORTRAN_INTEGER16
-#define MPI_INTEGER16 (&ompi_mpi_integer16)
-#endif
-#define MPI_REAL (&ompi_mpi_real)
-#if OMPI_HAVE_FORTRAN_REAL4
-#define MPI_REAL4 (&ompi_mpi_real4)
-#endif
-#if OMPI_HAVE_FORTRAN_REAL8
-#define MPI_REAL8 (&ompi_mpi_real8)
-#endif
-#if OMPI_HAVE_FORTRAN_REAL16
-#define MPI_REAL16 (&ompi_mpi_real16)
-#endif
-#define MPI_DOUBLE_PRECISION (&ompi_mpi_dblprec)
-#define MPI_COMPLEX (&ompi_mpi_cplex)
-#if OMPI_HAVE_FORTRAN_REAL4
-#define MPI_COMPLEX8 (&ompi_mpi_complex8)
-#endif
-#if OMPI_HAVE_FORTRAN_REAL8
-#define MPI_COMPLEX16 (&ompi_mpi_complex16)
-#endif
-#if OMPI_HAVE_FORTRAN_REAL16
-#define MPI_COMPLEX32 (&ompi_mpi_complex32)
-#endif
-#define MPI_DOUBLE_COMPLEX (&ompi_mpi_dblcplex)
-#define MPI_2REAL (&ompi_mpi_2real)
-#define MPI_2DOUBLE_PRECISION (&ompi_mpi_2dblprec)
-#define MPI_2INTEGER (&ompi_mpi_2integer)
-
-#define MPI_ERRORS_ARE_FATAL (&ompi_mpi_errors_are_fatal)
-#define MPI_ERRORS_RETURN (&ompi_mpi_errors_return)
-
-/* Typeclass definition for MPI_Type_match_size */
-#define MPI_TYPECLASS_INTEGER    1
-#define MPI_TYPECLASS_REAL       2
-#define MPI_TYPECLASS_COMPLEX    3
-
-/*
- * For applications still using the old [non-standard] ROMIO conventions
- */
-#define MPIO_Request MPI_Request
-#define MPIO_Test MPI_Test
-#define MPIO_Wait MPI_Wait
-
-
-/*
- * MPI API
- */
-
-OMPI_DECLSPEC  int MPI_Abort(MPI_Comm comm, int errorcode);
-OMPI_DECLSPEC  int MPI_Accumulate(void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
-                                  int target_rank, MPI_Aint target_disp, int target_count,
-                                  MPI_Datatype target_datatype, MPI_Op op, MPI_Win win);
-OMPI_DECLSPEC  int MPI_Add_error_class(int *errorclass);
-OMPI_DECLSPEC  int MPI_Add_error_code(int errorclass, int *errorcode);
-OMPI_DECLSPEC  int MPI_Add_error_string(int errorcode, char *string);
-OMPI_DECLSPEC  int MPI_Address(void *location, MPI_Aint *address);
-OMPI_DECLSPEC  int MPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                                 void *recvbuf, int recvcount,
-                                 MPI_Datatype recvtype, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                                  void *recvbuf, int *recvcounts,
-                                  int *displs, MPI_Datatype recvtype, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Alloc_mem(MPI_Aint size, MPI_Info info,
-                                 void *baseptr);
-OMPI_DECLSPEC  int MPI_Allreduce(void *sendbuf, void *recvbuf, int count,
-                                 MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                                void *recvbuf, int recvcount,
-                                MPI_Datatype recvtype, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Alltoallv(void *sendbuf, int *sendcounts, int *sdispls,
-                                 MPI_Datatype sendtype, void *recvbuf, int *recvcounts,
-                                 int *rdispls, MPI_Datatype recvtype, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Alltoallw(void *sendbuf, int *sendcounts, int *sdispls, MPI_Datatype *sendtypes,
-                                 void *recvbuf, int *recvcounts, int *rdispls, MPI_Datatype *recvtypes,
-                                 MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Attr_delete(MPI_Comm comm, int keyval);
-OMPI_DECLSPEC  int MPI_Attr_get(MPI_Comm comm, int keyval, void *attribute_val, int *flag);
-OMPI_DECLSPEC  int MPI_Attr_put(MPI_Comm comm, int keyval, void *attribute_val);
-OMPI_DECLSPEC  int MPI_Barrier(MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Bcast(void *buffer, int count, MPI_Datatype datatype,
-                             int root, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Bsend(void *buf, int count, MPI_Datatype datatype,
-                             int dest, int tag, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Bsend_init(void *buf, int count, MPI_Datatype datatype,
-                                  int dest, int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Buffer_attach(void *buffer, int size);
-OMPI_DECLSPEC  int MPI_Buffer_detach(void *buffer, int *size);
-OMPI_DECLSPEC  int MPI_Cancel(MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords);
-OMPI_DECLSPEC  int MPI_Cart_create(MPI_Comm old_comm, int ndims, int *dims,
-                                   int *periods, int reorder, MPI_Comm *comm_cart);
-OMPI_DECLSPEC  int MPI_Cart_get(MPI_Comm comm, int maxdims, int *dims,
-                                int *periods, int *coords);
-OMPI_DECLSPEC  int MPI_Cart_map(MPI_Comm comm, int ndims, int *dims,
-                                int *periods, int *newrank);
-OMPI_DECLSPEC  int MPI_Cart_rank(MPI_Comm comm, int *coords, int *rank);
-OMPI_DECLSPEC  int MPI_Cart_shift(MPI_Comm comm, int direction, int disp,
-                                  int *rank_source, int *rank_dest);
-OMPI_DECLSPEC  int MPI_Cart_sub(MPI_Comm comm, int *remain_dims, MPI_Comm *new_comm);
-OMPI_DECLSPEC  int MPI_Cartdim_get(MPI_Comm comm, int *ndims);
-OMPI_DECLSPEC  int MPI_Close_port(char *port_name);
-OMPI_DECLSPEC  int MPI_Comm_accept(char *port_name, MPI_Info info, int root,
-                                   MPI_Comm comm, MPI_Comm *newcomm);
-OMPI_DECLSPEC  MPI_Fint MPI_Comm_c2f(MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode);
-OMPI_DECLSPEC  int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result);
-OMPI_DECLSPEC  int MPI_Comm_connect(char *port_name, MPI_Info info, int root,
-                                    MPI_Comm comm, MPI_Comm *newcomm);
-OMPI_DECLSPEC  int MPI_Comm_create_errhandler(MPI_Comm_errhandler_fn *function,
-                                              MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int MPI_Comm_create_keyval(MPI_Comm_copy_attr_function *comm_copy_attr_fn,
-                                          MPI_Comm_delete_attr_function *comm_delete_attr_fn,
-                                          int *comm_keyval, void *extra_state);
-OMPI_DECLSPEC  int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm);
-OMPI_DECLSPEC  int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval);
-OMPI_DECLSPEC  int MPI_Comm_disconnect(MPI_Comm *comm);
-OMPI_DECLSPEC  int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm);
-OMPI_DECLSPEC  MPI_Comm MPI_Comm_f2c(MPI_Fint comm);
-OMPI_DECLSPEC  int MPI_Comm_free_keyval(int *comm_keyval);
-OMPI_DECLSPEC  int MPI_Comm_free(MPI_Comm *comm);
-OMPI_DECLSPEC  int MPI_Comm_get_attr(MPI_Comm comm, int comm_keyval,
-                                     void *attribute_val, int *flag);
-OMPI_DECLSPEC  int MPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *erhandler);
-OMPI_DECLSPEC  int MPI_Comm_get_name(MPI_Comm comm, char *comm_name, int *resultlen);
-OMPI_DECLSPEC  int MPI_Comm_get_parent(MPI_Comm *parent);
-OMPI_DECLSPEC  int MPI_Comm_group(MPI_Comm comm, MPI_Group *group);
-OMPI_DECLSPEC  int MPI_Comm_join(int fd, MPI_Comm *intercomm);
-OMPI_DECLSPEC  int MPI_Comm_rank(MPI_Comm comm, int *rank);
-OMPI_DECLSPEC  int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group);
-OMPI_DECLSPEC  int MPI_Comm_remote_size(MPI_Comm comm, int *size);
-OMPI_DECLSPEC  int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val);
-OMPI_DECLSPEC  int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler);
-OMPI_DECLSPEC  int MPI_Comm_set_name(MPI_Comm comm, char *comm_name);
-OMPI_DECLSPEC  int MPI_Comm_size(MPI_Comm comm, int *size);
-OMPI_DECLSPEC  int MPI_Comm_spawn(char *command, char **argv, int maxprocs, MPI_Info info,
-                                  int root, MPI_Comm comm, MPI_Comm *intercomm,
-                                  int *array_of_errcodes);
-OMPI_DECLSPEC  int MPI_Comm_spawn_multiple(int count, char **array_of_commands, char ***array_of_argv,
-                                           int *array_of_maxprocs, MPI_Info *array_of_info,
-                                           int root, MPI_Comm comm, MPI_Comm *intercomm,
-                                           int *array_of_errcodes);
-OMPI_DECLSPEC  int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *newcomm);
-OMPI_DECLSPEC  int MPI_Comm_test_inter(MPI_Comm comm, int *flag);
-OMPI_DECLSPEC  int MPI_Dims_create(int nnodes, int ndims, int *dims);
-OMPI_DECLSPEC  MPI_Fint MPI_Errhandler_c2f(MPI_Errhandler errhandler);
-OMPI_DECLSPEC  int MPI_Errhandler_create(MPI_Handler_function *function,
-                                         MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  MPI_Errhandler MPI_Errhandler_f2c(MPI_Fint errhandler);
-OMPI_DECLSPEC  int MPI_Errhandler_free(MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler);
-OMPI_DECLSPEC  int MPI_Error_class(int errorcode, int *errorclass);
-OMPI_DECLSPEC  int MPI_Error_string(int errorcode, char *string, int *resultlen);
-OMPI_DECLSPEC  int MPI_Exscan(void *sendbuf, void *recvbuf, int count,
-                              MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
-OMPI_DECLSPEC  MPI_Fint MPI_File_c2f(MPI_File file);
-OMPI_DECLSPEC  MPI_File MPI_File_f2c(MPI_Fint file);
-OMPI_DECLSPEC  int MPI_File_call_errhandler(MPI_File fh, int errorcode);
-OMPI_DECLSPEC  int MPI_File_create_errhandler(MPI_File_errhandler_fn *function,
-                                              MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int MPI_File_set_errhandler( MPI_File file, MPI_Errhandler errhandler);
-OMPI_DECLSPEC  int MPI_File_get_errhandler( MPI_File file, MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int MPI_File_open(MPI_Comm comm, char *filename, int amode,
-                                 MPI_Info info, MPI_File *fh);
-OMPI_DECLSPEC  int MPI_File_close(MPI_File *fh);
-OMPI_DECLSPEC  int MPI_File_delete(char *filename, MPI_Info info);
-OMPI_DECLSPEC  int MPI_File_set_size(MPI_File fh, MPI_Offset size);
-OMPI_DECLSPEC  int MPI_File_preallocate(MPI_File fh, MPI_Offset size);
-OMPI_DECLSPEC  int MPI_File_get_size(MPI_File fh, MPI_Offset *size);
-OMPI_DECLSPEC  int MPI_File_get_group(MPI_File fh, MPI_Group *group);
-OMPI_DECLSPEC  int MPI_File_get_amode(MPI_File fh, int *amode);
-OMPI_DECLSPEC  int MPI_File_set_info(MPI_File fh, MPI_Info info);
-OMPI_DECLSPEC  int MPI_File_get_info(MPI_File fh, MPI_Info *info_used);
-OMPI_DECLSPEC  int MPI_File_set_view(MPI_File fh, MPI_Offset disp, MPI_Datatype etype,
-                                     MPI_Datatype filetype, char *datarep, MPI_Info info);
-OMPI_DECLSPEC  int MPI_File_get_view(MPI_File fh, MPI_Offset *disp,
-                                     MPI_Datatype *etype,
-                                     MPI_Datatype *filetype, char *datarep);
-OMPI_DECLSPEC  int MPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf,
-                                    int count, MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf,
-                                        int count, MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_write_at(MPI_File fh, MPI_Offset offset, void *buf,
-                                     int count, MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, void *buf,
-                                         int count, MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_iread_at(MPI_File fh, MPI_Offset offset, void *buf,
-                                     int count, MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_File_iwrite_at(MPI_File fh, MPI_Offset offset, void *buf,
-                                      int count, MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_File_read(MPI_File fh, void *buf, int count,
-                                 MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_read_all(MPI_File fh, void *buf, int count,
-                                     MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_write(MPI_File fh, void *buf, int count,
-                                  MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_write_all(MPI_File fh, void *buf, int count,
-                                      MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_iread(MPI_File fh, void *buf, int count,
-                                  MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_File_iwrite(MPI_File fh, void *buf, int count,
-                                   MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_File_seek(MPI_File fh, MPI_Offset offset, int whence);
-OMPI_DECLSPEC  int MPI_File_get_position(MPI_File fh, MPI_Offset *offset);
-OMPI_DECLSPEC  int MPI_File_get_byte_offset(MPI_File fh, MPI_Offset offset,
-                                            MPI_Offset *disp);
-OMPI_DECLSPEC  int MPI_File_read_shared(MPI_File fh, void *buf, int count,
-                                        MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_write_shared(MPI_File fh, void *buf, int count,
-                                         MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_iread_shared(MPI_File fh, void *buf, int count,
-                                         MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_File_iwrite_shared(MPI_File fh, void *buf, int count,
-                                          MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_File_read_ordered(MPI_File fh, void *buf, int count,
-                                         MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_write_ordered(MPI_File fh, void *buf, int count,
-                                          MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence);
-OMPI_DECLSPEC  int MPI_File_get_position_shared(MPI_File fh, MPI_Offset *offset);
-OMPI_DECLSPEC  int MPI_File_read_at_all_begin(MPI_File fh, MPI_Offset offset, void *buf,
-                                              int count, MPI_Datatype datatype);
-OMPI_DECLSPEC  int MPI_File_read_at_all_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_write_at_all_begin(MPI_File fh, MPI_Offset offset, void *buf,
-                                               int count, MPI_Datatype datatype);
-OMPI_DECLSPEC  int MPI_File_write_at_all_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_read_all_begin(MPI_File fh, void *buf, int count,
-                                           MPI_Datatype datatype);
-OMPI_DECLSPEC  int MPI_File_read_all_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_write_all_begin(MPI_File fh, void *buf, int count,
-                                            MPI_Datatype datatype);
-OMPI_DECLSPEC  int MPI_File_write_all_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_read_ordered_begin(MPI_File fh, void *buf, int count,
-                                               MPI_Datatype datatype);
-OMPI_DECLSPEC  int MPI_File_read_ordered_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_write_ordered_begin(MPI_File fh, void *buf, int count,
-                                                MPI_Datatype datatype);
-OMPI_DECLSPEC  int MPI_File_write_ordered_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_File_get_type_extent(MPI_File fh, MPI_Datatype datatype,
-                                            MPI_Aint *extent);
-OMPI_DECLSPEC  int MPI_File_set_atomicity(MPI_File fh, int flag);
-OMPI_DECLSPEC  int MPI_File_get_atomicity(MPI_File fh, int *flag);
-OMPI_DECLSPEC  int MPI_File_sync(MPI_File fh);
-/*
- * file functions end
- */
-OMPI_DECLSPEC  int MPI_Finalize(void);
-OMPI_DECLSPEC  int MPI_Finalized(int *flag);
-OMPI_DECLSPEC  int MPI_Free_mem(void *base);
-OMPI_DECLSPEC  int MPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                              void *recvbuf, int recvcount, MPI_Datatype recvtype,
-                              int root, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                               void *recvbuf, int *recvcounts, int *displs,
-                               MPI_Datatype recvtype, int root, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Get_address(void *location, MPI_Aint *address);
-OMPI_DECLSPEC  int MPI_Get_count(MPI_Status *status, MPI_Datatype datatype, int *count);
-OMPI_DECLSPEC  int MPI_Get_elements(MPI_Status *status, MPI_Datatype datatype, int *count);
-OMPI_DECLSPEC  int MPI_Get(void *origin_addr, int origin_count,
-                           MPI_Datatype origin_datatype, int target_rank,
-                           MPI_Aint target_disp, int target_count,
-                           MPI_Datatype target_datatype, MPI_Win win);
-OMPI_DECLSPEC  int MPI_Get_processor_name(char *name, int *resultlen);
-OMPI_DECLSPEC  int MPI_Get_version(int *version, int *subversion);
-OMPI_DECLSPEC  int MPI_Graph_create(MPI_Comm comm_old, int nnodes, int *index,
-                                    int *edges, int reorder, MPI_Comm *comm_graph);
-OMPI_DECLSPEC  int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges,
-                                 int *index, int *edges);
-OMPI_DECLSPEC  int MPI_Graph_map(MPI_Comm comm, int nnodes, int *index, int *edges,
-                                 int *newrank);
-OMPI_DECLSPEC  int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors);
-OMPI_DECLSPEC  int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors,
-                                       int *neighbors);
-OMPI_DECLSPEC  int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges);
-OMPI_DECLSPEC  int MPI_Grequest_complete(MPI_Request request);
-OMPI_DECLSPEC  int MPI_Grequest_start(MPI_Grequest_query_function *query_fn,
-                                      MPI_Grequest_free_function *free_fn,
-                                      MPI_Grequest_cancel_function *cancel_fn,
-                                      void *extra_state, MPI_Request *request);
-OMPI_DECLSPEC  MPI_Fint MPI_Group_c2f(MPI_Group group);
-OMPI_DECLSPEC  int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result);
-OMPI_DECLSPEC  int MPI_Group_difference(MPI_Group group1, MPI_Group group2,
-                                        MPI_Group *newgroup);
-OMPI_DECLSPEC  int MPI_Group_excl(MPI_Group group, int n, int *ranks,
-                                  MPI_Group *newgroup);
-OMPI_DECLSPEC  MPI_Group MPI_Group_f2c(MPI_Fint group);
-OMPI_DECLSPEC  int MPI_Group_free(MPI_Group *group);
-OMPI_DECLSPEC  int MPI_Group_incl(MPI_Group group, int n, int *ranks,
-                                  MPI_Group *newgroup);
-OMPI_DECLSPEC  int MPI_Group_intersection(MPI_Group group1, MPI_Group group2,
-                                          MPI_Group *newgroup);
-OMPI_DECLSPEC  int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3],
-                                        MPI_Group *newgroup);
-OMPI_DECLSPEC  int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3],
-                                        MPI_Group *newgroup);
-OMPI_DECLSPEC  int MPI_Group_rank(MPI_Group group, int *rank);
-OMPI_DECLSPEC  int MPI_Group_size(MPI_Group group, int *size);
-OMPI_DECLSPEC  int MPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1,
-                                             MPI_Group group2, int *ranks2);
-OMPI_DECLSPEC  int MPI_Group_union(MPI_Group group1, MPI_Group group2,
-                                   MPI_Group *newgroup);
-OMPI_DECLSPEC  int MPI_Ibsend(void *buf, int count, MPI_Datatype datatype, int dest,
-                              int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  MPI_Fint MPI_Info_c2f(MPI_Info info);
-OMPI_DECLSPEC  int MPI_Info_create(MPI_Info *info);
-OMPI_DECLSPEC  int MPI_Info_delete(MPI_Info info, char *key);
-OMPI_DECLSPEC  int MPI_Info_dup(MPI_Info info, MPI_Info *newinfo);
-OMPI_DECLSPEC  MPI_Info MPI_Info_f2c(MPI_Fint info);
-OMPI_DECLSPEC  int MPI_Info_free(MPI_Info *info);
-OMPI_DECLSPEC  int MPI_Info_get(MPI_Info info, char *key, int valuelen,
-                                char *value, int *flag);
-OMPI_DECLSPEC  int MPI_Info_get_nkeys(MPI_Info info, int *nkeys);
-OMPI_DECLSPEC  int MPI_Info_get_nthkey(MPI_Info info, int n, char *key);
-OMPI_DECLSPEC  int MPI_Info_get_valuelen(MPI_Info info, char *key, int *valuelen,
-                                         int *flag);
-OMPI_DECLSPEC  int MPI_Info_set(MPI_Info info, char *key, char *value);
-OMPI_DECLSPEC  int MPI_Init(int *argc, char ***argv);
-OMPI_DECLSPEC  int MPI_Initialized(int *flag);
-OMPI_DECLSPEC  int MPI_Init_thread(int *argc, char ***argv, int required,
-                                   int *provided);
-OMPI_DECLSPEC  int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader,
-                                        MPI_Comm bridge_comm, int remote_leader,
-                                        int tag, MPI_Comm *newintercomm);
-OMPI_DECLSPEC  int MPI_Intercomm_merge(MPI_Comm intercomm, int high,
-                                       MPI_Comm *newintercomm);
-OMPI_DECLSPEC  int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag,
-                              MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source,
-                             int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Irsend(void *buf, int count, MPI_Datatype datatype, int dest,
-                              int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Isend(void *buf, int count, MPI_Datatype datatype, int dest,
-                             int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Issend(void *buf, int count, MPI_Datatype datatype, int dest,
-                              int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Is_thread_main(int *flag);
-OMPI_DECLSPEC  int MPI_Keyval_create(MPI_Copy_function *copy_fn,
-                                     MPI_Delete_function *delete_fn,
-                                     int *keyval, void *extra_state);
-OMPI_DECLSPEC  int MPI_Keyval_free(int *keyval);
-OMPI_DECLSPEC  int MPI_Lookup_name(char *service_name, MPI_Info info, char *port_name);
-OMPI_DECLSPEC  MPI_Fint MPI_Op_c2f(MPI_Op op);
-OMPI_DECLSPEC  int MPI_Op_create(MPI_User_function *function, int commute, MPI_Op *op);
-OMPI_DECLSPEC  int MPI_Open_port(MPI_Info info, char *port_name);
-OMPI_DECLSPEC  MPI_Op MPI_Op_f2c(MPI_Fint op);
-OMPI_DECLSPEC  int MPI_Op_free(MPI_Op *op);
-OMPI_DECLSPEC  int MPI_Pack_external(char *datarep, void *inbuf, int incount,
-                                     MPI_Datatype datatype, void *outbuf,
-                                     MPI_Aint outsize, MPI_Aint *position);
-OMPI_DECLSPEC  int MPI_Pack_external_size(char *datarep, int incount,
-                                          MPI_Datatype datatype, MPI_Aint *size);
-OMPI_DECLSPEC  int MPI_Pack(void *inbuf, int incount, MPI_Datatype datatype,
-                            void *outbuf, int outsize, int *position, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm,
-                                 int *size);
-OMPI_DECLSPEC  int MPI_Pcontrol(const int level, ...);
-OMPI_DECLSPEC  int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Publish_name(char *service_name, MPI_Info info,
-                                    char *port_name);
-OMPI_DECLSPEC  int MPI_Put(void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
-                           int target_rank, MPI_Aint target_disp, int target_count,
-                           MPI_Datatype target_datatype, MPI_Win win);
-OMPI_DECLSPEC  int MPI_Query_thread(int *provided);
-OMPI_DECLSPEC  int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source,
-                                 int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source,
-                            int tag, MPI_Comm comm, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Reduce(void *sendbuf, void *recvbuf, int count,
-                              MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts,
-                                      MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Register_datarep(char *datarep,
-                                        MPI_Datarep_conversion_function *read_conversion_fn,
-                                        MPI_Datarep_conversion_function *write_conversion_fn,
-                                        MPI_Datarep_extent_function *dtype_file_extent_fn,
-                                        void *extra_state);
-OMPI_DECLSPEC  MPI_Fint MPI_Request_c2f(MPI_Request request);
-OMPI_DECLSPEC  MPI_Request MPI_Request_f2c(MPI_Fint request);
-OMPI_DECLSPEC  int MPI_Request_free(MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Request_get_status(MPI_Request request, int *flag,
-                                          MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Rsend(void *ibuf, int count, MPI_Datatype datatype, int dest,
-                             int tag, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Rsend_init(void *buf, int count, MPI_Datatype datatype,
-                                  int dest, int tag, MPI_Comm comm,
-                                  MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Scan(void *sendbuf, void *recvbuf, int count,
-                            MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                               void *recvbuf, int recvcount, MPI_Datatype recvtype,
-                               int root, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Scatterv(void *sendbuf, int *sendcounts, int *displs,
-                                MPI_Datatype sendtype, void *recvbuf, int recvcount,
-                                MPI_Datatype recvtype, int root, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Send_init(void *buf, int count, MPI_Datatype datatype,
-                                 int dest, int tag, MPI_Comm comm,
-                                 MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dest,
-                            int tag, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                                int dest, int sendtag, void *recvbuf, int recvcount,
-                                MPI_Datatype recvtype, int source, int recvtag,
-                                MPI_Comm comm,  MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype,
-                                        int dest, int sendtag, int source, int recvtag,
-                                        MPI_Comm comm, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Ssend_init(void *buf, int count, MPI_Datatype datatype,
-                                  int dest, int tag, MPI_Comm comm,
-                                  MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Ssend(void *buf, int count, MPI_Datatype datatype, int dest,
-                             int tag, MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Start(MPI_Request *request);
-OMPI_DECLSPEC  int MPI_Startall(int count, MPI_Request *array_of_requests);
-OMPI_DECLSPEC  int MPI_Status_c2f(MPI_Status *c_status, MPI_Fint *f_status);
-OMPI_DECLSPEC  int MPI_Status_f2c(MPI_Fint *f_status, MPI_Status *c_status);
-OMPI_DECLSPEC  int MPI_Status_set_cancelled(MPI_Status *status, int flag);
-OMPI_DECLSPEC  int MPI_Status_set_elements(MPI_Status *status, MPI_Datatype datatype,
-                                           int count);
-OMPI_DECLSPEC  int MPI_Testall(int count, MPI_Request array_of_requests[], int *flag,
-                               MPI_Status array_of_statuses[]);
-OMPI_DECLSPEC  int MPI_Testany(int count, MPI_Request array_of_requests[], int *index,
-                               int *flag, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Test_cancelled(MPI_Status *status, int *flag);
-OMPI_DECLSPEC  int MPI_Testsome(int incount, MPI_Request array_of_requests[],
-                                int *outcount, int array_of_indices[],
-                                MPI_Status array_of_statuses[]);
-OMPI_DECLSPEC  int MPI_Topo_test(MPI_Comm comm, int *status);
-OMPI_DECLSPEC  MPI_Fint MPI_Type_c2f(MPI_Datatype datatype);
-OMPI_DECLSPEC  int MPI_Type_commit(MPI_Datatype *type);
-OMPI_DECLSPEC  int MPI_Type_contiguous(int count, MPI_Datatype oldtype,
-                                       MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_create_darray(int size, int rank, int ndims,
-                                          int gsize_array[], int distrib_array[],
-                                          int darg_array[], int psize_array[],
-                                          int order, MPI_Datatype oldtype,
-                                          MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_create_f90_complex(int p, int r, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_create_f90_integer(int r, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_create_f90_real(int p, int r, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_create_hindexed(int count, int array_of_blocklengths[],
-                                            MPI_Aint array_of_displacements[],
-                                            MPI_Datatype oldtype,
-                                            MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_create_hvector(int count, int blocklength, MPI_Aint stride,
-                                           MPI_Datatype oldtype,
-                                           MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn,
-                                          MPI_Type_delete_attr_function *type_delete_attr_fn,
-                                          int *type_keyval, void *extra_state);
-OMPI_DECLSPEC  int MPI_Type_create_indexed_block(int count, int blocklength,
-                                                 int array_of_displacements[],
-                                                 MPI_Datatype oldtype,
-                                                 MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_create_struct(int count, int array_of_block_lengths[],
-                                          MPI_Aint array_of_displacements[],
-                                          MPI_Datatype array_of_types[],
-                                          MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_create_subarray(int ndims, int size_array[], int subsize_array[],
-                                            int start_array[], int order,
-                                            MPI_Datatype oldtype, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_create_resized(MPI_Datatype oldtype, MPI_Aint lb,
-                                           MPI_Aint extent, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_delete_attr(MPI_Datatype type, int type_keyval);
-OMPI_DECLSPEC  int MPI_Type_dup(MPI_Datatype type, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_extent(MPI_Datatype type, MPI_Aint *extent);
-OMPI_DECLSPEC  int MPI_Type_free(MPI_Datatype *type);
-OMPI_DECLSPEC  int MPI_Type_free_keyval(int *type_keyval);
-OMPI_DECLSPEC  MPI_Datatype MPI_Type_f2c(MPI_Fint datatype);
-OMPI_DECLSPEC  int MPI_Type_get_attr(MPI_Datatype type, int type_keyval,
-                                     void *attribute_val, int *flag);
-OMPI_DECLSPEC  int MPI_Type_get_contents(MPI_Datatype mtype, int max_integers,
-                                         int max_addresses, int max_datatypes,
-                                         int array_of_integers[],
-                                         MPI_Aint array_of_addresses[],
-                                         MPI_Datatype array_of_datatypes[]);
-OMPI_DECLSPEC  int MPI_Type_get_envelope(MPI_Datatype type, int *num_integers,
-                                         int *num_addresses, int *num_datatypes,
-                                         int *combiner);
-OMPI_DECLSPEC  int MPI_Type_get_extent(MPI_Datatype type, MPI_Aint *lb,
-                                       MPI_Aint *extent);
-OMPI_DECLSPEC  int MPI_Type_get_name(MPI_Datatype type, char *type_name,
-                                     int *resultlen);
-OMPI_DECLSPEC  int MPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint *true_lb,
-                                            MPI_Aint *true_extent);
-OMPI_DECLSPEC  int MPI_Type_hindexed(int count, int array_of_blocklengths[],
-                                     MPI_Aint array_of_displacements[],
-                                     MPI_Datatype oldtype, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_hvector(int count, int blocklength, MPI_Aint stride,
-                                    MPI_Datatype oldtype, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_indexed(int count, int array_of_blocklengths[],
-                                    int array_of_displacements[],
-                                    MPI_Datatype oldtype, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_lb(MPI_Datatype type, MPI_Aint *lb);
-OMPI_DECLSPEC  int MPI_Type_match_size(int typeclass, int size, MPI_Datatype *type);
-OMPI_DECLSPEC  int MPI_Type_set_attr(MPI_Datatype type, int type_keyval,
-                                     void *attr_val);
-OMPI_DECLSPEC  int MPI_Type_set_name(MPI_Datatype type, char *type_name);
-OMPI_DECLSPEC  int MPI_Type_size(MPI_Datatype type, int *size);
-OMPI_DECLSPEC  int MPI_Type_struct(int count, int array_of_blocklengths[],
-                                   MPI_Aint array_of_displacements[],
-                                   MPI_Datatype array_of_types[],
-                                   MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Type_ub(MPI_Datatype mtype, MPI_Aint *ub);
-OMPI_DECLSPEC  int MPI_Type_vector(int count, int blocklength, int stride,
-                                   MPI_Datatype oldtype, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int MPI_Unpack(void *inbuf, int insize, int *position,
-                              void *outbuf, int outcount, MPI_Datatype datatype,
-                              MPI_Comm comm);
-OMPI_DECLSPEC  int MPI_Unpublish_name(char *service_name, MPI_Info info, char *port_name);
-OMPI_DECLSPEC  int MPI_Unpack_external (char *datarep, void *inbuf, MPI_Aint insize,
-                                        MPI_Aint *position, void *outbuf, int outcount,
-                                        MPI_Datatype datatype);
-OMPI_DECLSPEC  int MPI_Waitall(int count, MPI_Request *array_of_requests,
-                               MPI_Status *array_of_statuses);
-OMPI_DECLSPEC  int MPI_Waitany(int count, MPI_Request *array_of_requests,
-                               int *index, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Wait(MPI_Request *request, MPI_Status *status);
-OMPI_DECLSPEC  int MPI_Waitsome(int incount, MPI_Request *array_of_requests,
-                                int *outcount, int *array_of_indices,
-                                MPI_Status *array_of_statuses);
-OMPI_DECLSPEC  MPI_Fint MPI_Win_c2f(MPI_Win win);
-OMPI_DECLSPEC  int MPI_Win_call_errhandler(MPI_Win win, int errorcode);
-OMPI_DECLSPEC  int MPI_Win_complete(MPI_Win win);
-OMPI_DECLSPEC  int MPI_Win_create(void *base, MPI_Aint size, int disp_unit,
-                                  MPI_Info info, MPI_Comm comm, MPI_Win *win);
-OMPI_DECLSPEC  int MPI_Win_create_errhandler(MPI_Win_errhandler_fn *function,
-                                             MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int MPI_Win_create_keyval(MPI_Win_copy_attr_function *win_copy_attr_fn,
-                                         MPI_Win_delete_attr_function *win_delete_attr_fn,
-                                         int *win_keyval, void *extra_state);
-OMPI_DECLSPEC  int MPI_Win_delete_attr(MPI_Win win, int win_keyval);
-OMPI_DECLSPEC  MPI_Win MPI_Win_f2c(MPI_Fint win);
-OMPI_DECLSPEC  int MPI_Win_fence(int assert, MPI_Win win);
-OMPI_DECLSPEC  int MPI_Win_free(MPI_Win *win);
-OMPI_DECLSPEC  int MPI_Win_free_keyval(int *win_keyval);
-OMPI_DECLSPEC  int MPI_Win_get_attr(MPI_Win win, int win_keyval,
-                                    void *attribute_val, int *flag);
-OMPI_DECLSPEC  int MPI_Win_get_errhandler(MPI_Win win, MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int MPI_Win_get_group(MPI_Win win, MPI_Group *group);
-OMPI_DECLSPEC  int MPI_Win_get_name(MPI_Win win, char *win_name, int *resultlen);
-OMPI_DECLSPEC  int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win);
-OMPI_DECLSPEC  int MPI_Win_post(MPI_Group group, int assert, MPI_Win win);
-OMPI_DECLSPEC  int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val);
-OMPI_DECLSPEC  int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler);
-OMPI_DECLSPEC  int MPI_Win_set_name(MPI_Win win, char *win_name);
-OMPI_DECLSPEC  int MPI_Win_start(MPI_Group group, int assert, MPI_Win win);
-OMPI_DECLSPEC  int MPI_Win_test(MPI_Win win, int *flag);
-OMPI_DECLSPEC  int MPI_Win_unlock(int rank, MPI_Win win);
-OMPI_DECLSPEC  int MPI_Win_wait(MPI_Win win);
-OMPI_DECLSPEC  double MPI_Wtick(void);
-OMPI_DECLSPEC  double MPI_Wtime(void);
-
-
-  /*
-   * Profiling MPI API
-   */
-OMPI_DECLSPEC  int PMPI_Abort(MPI_Comm comm, int errorcode);
-OMPI_DECLSPEC  int PMPI_Accumulate(void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
-                                   int target_rank, MPI_Aint target_disp, int target_count,
-                                   MPI_Datatype target_datatype, MPI_Op op, MPI_Win win);
-OMPI_DECLSPEC  int PMPI_Add_error_class(int *errorclass);
-OMPI_DECLSPEC  int PMPI_Add_error_code(int errorclass, int *errorcode);
-OMPI_DECLSPEC  int PMPI_Add_error_string(int errorcode, char *string);
-OMPI_DECLSPEC  int PMPI_Address(void *location, MPI_Aint *address);
-OMPI_DECLSPEC  int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                                  void *recvbuf, int recvcount,
-                                  MPI_Datatype recvtype, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                                   void *recvbuf, int *recvcounts,
-                                   int *displs, MPI_Datatype recvtype, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Alloc_mem(MPI_Aint size, MPI_Info info,
-                                  void *baseptr);
-OMPI_DECLSPEC  int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count,
-                                  MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Alltoall(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                                 void *recvbuf, int recvcount,
-                                 MPI_Datatype recvtype, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Alltoallv(void *sendbuf, int *sendcounts, int *sdispls,
-                                  MPI_Datatype sendtype, void *recvbuf, int *recvcounts,
-                                  int *rdispls, MPI_Datatype recvtype, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Alltoallw(void *sendbuf, int *sendcounts, int *sdispls, MPI_Datatype *sendtypes,
-                    void *recvbuf, int *recvcounts, int *rdispls, MPI_Datatype *recvtypes,
-                    MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Attr_delete(MPI_Comm comm, int keyval);
-OMPI_DECLSPEC  int PMPI_Attr_get(MPI_Comm comm, int keyval, void *attribute_val, int *flag);
-OMPI_DECLSPEC  int PMPI_Attr_put(MPI_Comm comm, int keyval, void *attribute_val);
-OMPI_DECLSPEC  int PMPI_Barrier(MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Bcast(void *buffer, int count, MPI_Datatype datatype,
-                              int root, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Bsend(void *buf, int count, MPI_Datatype datatype,
-                              int dest, int tag, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Bsend_init(void *buf, int count, MPI_Datatype datatype,
-                                   int dest, int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Buffer_attach(void *buffer, int size);
-OMPI_DECLSPEC  int PMPI_Buffer_detach(void *buffer, int *size);
-OMPI_DECLSPEC  int PMPI_Cancel(MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int *coords);
-OMPI_DECLSPEC  int PMPI_Cart_create(MPI_Comm old_comm, int ndims, int *dims,
-                                    int *periods, int reorder, MPI_Comm *comm_cart);
-OMPI_DECLSPEC  int PMPI_Cart_get(MPI_Comm comm, int maxdims, int *dims,
-                                 int *periods, int *coords);
-OMPI_DECLSPEC  int PMPI_Cart_map(MPI_Comm comm, int ndims, int *dims,
-                                 int *periods, int *newrank);
-OMPI_DECLSPEC  int PMPI_Cart_rank(MPI_Comm comm, int *coords, int *rank);
-OMPI_DECLSPEC  int PMPI_Cart_shift(MPI_Comm comm, int direction, int disp,
-                                   int *rank_source, int *rank_dest);
-OMPI_DECLSPEC  int PMPI_Cart_sub(MPI_Comm comm, int *remain_dims, MPI_Comm *new_comm);
-OMPI_DECLSPEC  int PMPI_Cartdim_get(MPI_Comm comm, int *ndims);
-OMPI_DECLSPEC  int PMPI_Close_port(char *port_name);
-OMPI_DECLSPEC  int PMPI_Comm_accept(char *port_name, MPI_Info info, int root,
-                                    MPI_Comm comm, MPI_Comm *newcomm);
-OMPI_DECLSPEC  MPI_Fint PMPI_Comm_c2f(MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Comm_call_errhandler(MPI_Comm comm, int errorcode);
-OMPI_DECLSPEC  int PMPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result);
-OMPI_DECLSPEC  int PMPI_Comm_connect(char *port_name, MPI_Info info, int root,
-                                     MPI_Comm comm, MPI_Comm *newcomm);
-OMPI_DECLSPEC  int PMPI_Comm_create_errhandler(MPI_Comm_errhandler_fn *function,
-                                               MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int PMPI_Comm_create_keyval(MPI_Comm_copy_attr_function *comm_copy_attr_fn,
-                                           MPI_Comm_delete_attr_function *comm_delete_attr_fn,
-                                           int *comm_keyval, void *extra_state);
-OMPI_DECLSPEC  int PMPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm);
-OMPI_DECLSPEC  int PMPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval);
-OMPI_DECLSPEC  int PMPI_Comm_disconnect(MPI_Comm *comm);
-OMPI_DECLSPEC  int PMPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm);
-OMPI_DECLSPEC  MPI_Comm PMPI_Comm_f2c(MPI_Fint comm);
-OMPI_DECLSPEC  int PMPI_Comm_free_keyval(int *comm_keyval);
-OMPI_DECLSPEC  int PMPI_Comm_free(MPI_Comm *comm);
-OMPI_DECLSPEC  int PMPI_Comm_get_attr(MPI_Comm comm, int comm_keyval,
-                                      void *attribute_val, int *flag);
-OMPI_DECLSPEC  int PMPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *erhandler);
-OMPI_DECLSPEC  int PMPI_Comm_get_name(MPI_Comm comm, char *comm_name, int *resultlen);
-OMPI_DECLSPEC  int PMPI_Comm_get_parent(MPI_Comm *parent);
-OMPI_DECLSPEC  int PMPI_Comm_group(MPI_Comm comm, MPI_Group *group);
-OMPI_DECLSPEC  int PMPI_Comm_join(int fd, MPI_Comm *intercomm);
-OMPI_DECLSPEC  int PMPI_Comm_rank(MPI_Comm comm, int *rank);
-OMPI_DECLSPEC  int PMPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group);
-OMPI_DECLSPEC  int PMPI_Comm_remote_size(MPI_Comm comm, int *size);
-OMPI_DECLSPEC  int PMPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val);
-OMPI_DECLSPEC  int PMPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler);
-OMPI_DECLSPEC  int PMPI_Comm_set_name(MPI_Comm comm, char *comm_name);
-OMPI_DECLSPEC  int PMPI_Comm_size(MPI_Comm comm, int *size);
-OMPI_DECLSPEC  int PMPI_Comm_spawn(char *command, char **argv, int maxprocs, MPI_Info info,
-                                   int root, MPI_Comm comm, MPI_Comm *intercomm,
-                                   int *array_of_errcodes);
-OMPI_DECLSPEC  int PMPI_Comm_spawn_multiple(int count, char **array_of_commands, char ***array_of_argv,
-                                            int *array_of_maxprocs, MPI_Info *array_of_info,
-                                            int root, MPI_Comm comm, MPI_Comm *intercomm,
-                                            int *array_of_errcodes);
-OMPI_DECLSPEC  int PMPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *newcomm);
-OMPI_DECLSPEC  int PMPI_Comm_test_inter(MPI_Comm comm, int *flag);
-OMPI_DECLSPEC  int PMPI_Dims_create(int nnodes, int ndims, int *dims);
-OMPI_DECLSPEC  MPI_Fint PMPI_Errhandler_c2f(MPI_Errhandler errhandler);
-OMPI_DECLSPEC  int PMPI_Errhandler_create(MPI_Handler_function *function,
-                                          MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  MPI_Errhandler PMPI_Errhandler_f2c(MPI_Fint errhandler);
-OMPI_DECLSPEC  int PMPI_Errhandler_free(MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int PMPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int PMPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler);
-OMPI_DECLSPEC  int PMPI_Error_class(int errorcode, int *errorclass);
-OMPI_DECLSPEC  int PMPI_Error_string(int errorcode, char *string, int *resultlen);
-OMPI_DECLSPEC  int PMPI_Exscan(void *sendbuf, void *recvbuf, int count,
-                               MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
-OMPI_DECLSPEC  MPI_Fint PMPI_File_c2f(MPI_File file);
-OMPI_DECLSPEC  MPI_File PMPI_File_f2c(MPI_Fint file);
-OMPI_DECLSPEC  int PMPI_File_call_errhandler(MPI_File fh, int errorcode);
-OMPI_DECLSPEC  int PMPI_File_create_errhandler(MPI_File_errhandler_fn *function,
-                                               MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int PMPI_File_set_errhandler( MPI_File file, MPI_Errhandler errhandler);
-OMPI_DECLSPEC  int PMPI_File_get_errhandler( MPI_File file, MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int PMPI_File_open(MPI_Comm comm, char *filename, int amode,
-                                  MPI_Info info, MPI_File *fh);
-OMPI_DECLSPEC  int PMPI_File_close(MPI_File *fh);
-OMPI_DECLSPEC  int PMPI_File_delete(char *filename, MPI_Info info);
-OMPI_DECLSPEC  int PMPI_File_set_size(MPI_File fh, MPI_Offset size);
-OMPI_DECLSPEC  int PMPI_File_preallocate(MPI_File fh, MPI_Offset size);
-OMPI_DECLSPEC  int PMPI_File_get_size(MPI_File fh, MPI_Offset *size);
-OMPI_DECLSPEC  int PMPI_File_get_group(MPI_File fh, MPI_Group *group);
-OMPI_DECLSPEC  int PMPI_File_get_amode(MPI_File fh, int *amode);
-OMPI_DECLSPEC  int PMPI_File_set_info(MPI_File fh, MPI_Info info);
-OMPI_DECLSPEC  int PMPI_File_get_info(MPI_File fh, MPI_Info *info_used);
-OMPI_DECLSPEC  int PMPI_File_set_view(MPI_File fh, MPI_Offset disp, MPI_Datatype etype,
-                                      MPI_Datatype filetype, char *datarep, MPI_Info info);
-OMPI_DECLSPEC  int PMPI_File_get_view(MPI_File fh, MPI_Offset *disp,
-                                      MPI_Datatype *etype,
-                                      MPI_Datatype *filetype, char *datarep);
-OMPI_DECLSPEC  int PMPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf,
-                                     int count, MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf,
-                                         int count, MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_write_at(MPI_File fh, MPI_Offset offset, void *buf,
-                                      int count, MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_write_at_all(MPI_File fh, MPI_Offset offset, void *buf,
-                                          int count, MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_iread_at(MPI_File fh, MPI_Offset offset, void *buf,
-                                      int count, MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_File_iwrite_at(MPI_File fh, MPI_Offset offset, void *buf,
-                                       int count, MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_File_read(MPI_File fh, void *buf, int count,
-                                  MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_read_all(MPI_File fh, void *buf, int count,
-                                      MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_write(MPI_File fh, void *buf, int count,
-                                   MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_write_all(MPI_File fh, void *buf, int count,
-                                       MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_iread(MPI_File fh, void *buf, int count,
-                                   MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_File_iwrite(MPI_File fh, void *buf, int count,
-                                    MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_File_seek(MPI_File fh, MPI_Offset offset, int whence);
-OMPI_DECLSPEC  int PMPI_File_get_position(MPI_File fh, MPI_Offset *offset);
-OMPI_DECLSPEC  int PMPI_File_get_byte_offset(MPI_File fh, MPI_Offset offset,
-                                             MPI_Offset *disp);
-OMPI_DECLSPEC  int PMPI_File_read_shared(MPI_File fh, void *buf, int count,
-                                         MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_write_shared(MPI_File fh, void *buf, int count,
-                                          MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_iread_shared(MPI_File fh, void *buf, int count,
-                                          MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_File_iwrite_shared(MPI_File fh, void *buf, int count,
-                                           MPI_Datatype datatype, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_File_read_ordered(MPI_File fh, void *buf, int count,
-                                          MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_write_ordered(MPI_File fh, void *buf, int count,
-                                           MPI_Datatype datatype, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence);
-OMPI_DECLSPEC  int PMPI_File_get_position_shared(MPI_File fh, MPI_Offset *offset);
-OMPI_DECLSPEC  int PMPI_File_read_at_all_begin(MPI_File fh, MPI_Offset offset, void *buf,
-                                               int count, MPI_Datatype datatype);
-OMPI_DECLSPEC  int PMPI_File_read_at_all_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_write_at_all_begin(MPI_File fh, MPI_Offset offset, void *buf,
-                                                int count, MPI_Datatype datatype);
-OMPI_DECLSPEC  int PMPI_File_write_at_all_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_read_all_begin(MPI_File fh, void *buf, int count,
-                                            MPI_Datatype datatype);
-OMPI_DECLSPEC  int PMPI_File_read_all_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_write_all_begin(MPI_File fh, void *buf, int count,
-                                             MPI_Datatype datatype);
-OMPI_DECLSPEC  int PMPI_File_write_all_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_read_ordered_begin(MPI_File fh, void *buf, int count,
-                                                MPI_Datatype datatype);
-OMPI_DECLSPEC  int PMPI_File_read_ordered_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_write_ordered_begin(MPI_File fh, void *buf, int count,
-                                                 MPI_Datatype datatype);
-OMPI_DECLSPEC  int PMPI_File_write_ordered_end(MPI_File fh, void *buf, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_File_get_type_extent(MPI_File fh, MPI_Datatype datatype,
-                                             MPI_Aint *extent);
-OMPI_DECLSPEC  int PMPI_File_set_atomicity(MPI_File fh, int flag);
-OMPI_DECLSPEC  int PMPI_File_get_atomicity(MPI_File fh, int *flag);
-OMPI_DECLSPEC  int PMPI_File_sync(MPI_File fh);
-OMPI_DECLSPEC  int PMPI_Finalize(void);
-OMPI_DECLSPEC  int PMPI_Finalized(int *flag);
-OMPI_DECLSPEC  int PMPI_Free_mem(void *base);
-OMPI_DECLSPEC  int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                               void *recvbuf, int recvcount, MPI_Datatype recvtype,
-                               int root, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                                void *recvbuf, int *recvcounts, int *displs,
-                                MPI_Datatype recvtype, int root, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Get_address(void *location, MPI_Aint *address);
-OMPI_DECLSPEC  int PMPI_Get_count(MPI_Status *status, MPI_Datatype datatype, int *count);
-OMPI_DECLSPEC  int PMPI_Get_elements(MPI_Status *status, MPI_Datatype datatype,
-                                     int *count);
-OMPI_DECLSPEC  int PMPI_Get(void *origin_addr, int origin_count,
-                            MPI_Datatype origin_datatype, int target_rank,
-                            MPI_Aint target_disp, int target_count,
-                            MPI_Datatype target_datatype, MPI_Win win);
-OMPI_DECLSPEC  int PMPI_Get_processor_name(char *name, int *resultlen);
-OMPI_DECLSPEC  int PMPI_Get_version(int *version, int *subversion);
-OMPI_DECLSPEC  int PMPI_Graph_create(MPI_Comm comm_old, int nnodes, int *index,
-                                     int *edges, int reorder, MPI_Comm *comm_graph);
-OMPI_DECLSPEC  int PMPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges,
-                                  int *index, int *edges);
-OMPI_DECLSPEC  int PMPI_Graph_map(MPI_Comm comm, int nnodes, int *index, int *edges,
-                                  int *newrank);
-OMPI_DECLSPEC  int PMPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors);
-OMPI_DECLSPEC  int PMPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors,
-                                        int *neighbors);
-OMPI_DECLSPEC  int PMPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges);
-OMPI_DECLSPEC  int PMPI_Grequest_complete(MPI_Request request);
-OMPI_DECLSPEC  int PMPI_Grequest_start(MPI_Grequest_query_function *query_fn,
-                                       MPI_Grequest_free_function *free_fn,
-                                       MPI_Grequest_cancel_function *cancel_fn,
-                                       void *extra_state, MPI_Request *request);
-OMPI_DECLSPEC  MPI_Fint PMPI_Group_c2f(MPI_Group group);
-OMPI_DECLSPEC  int PMPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result);
-OMPI_DECLSPEC  int PMPI_Group_difference(MPI_Group group1, MPI_Group group2,
-                                         MPI_Group *newgroup);
-OMPI_DECLSPEC  int PMPI_Group_excl(MPI_Group group, int n, int *ranks,
-                                   MPI_Group *newgroup);
-OMPI_DECLSPEC  MPI_Group PMPI_Group_f2c(MPI_Fint group);
-OMPI_DECLSPEC  int PMPI_Group_free(MPI_Group *group);
-OMPI_DECLSPEC  int PMPI_Group_incl(MPI_Group group, int n, int *ranks,
-                                   MPI_Group *newgroup);
-OMPI_DECLSPEC  int PMPI_Group_intersection(MPI_Group group1, MPI_Group group2,
-                                           MPI_Group *newgroup);
-OMPI_DECLSPEC  int PMPI_Group_range_excl(MPI_Group group, int n, int ranges[][3],
-                                         MPI_Group *newgroup);
-OMPI_DECLSPEC  int PMPI_Group_range_incl(MPI_Group group, int n, int ranges[][3],
-                                         MPI_Group *newgroup);
-OMPI_DECLSPEC  int PMPI_Group_rank(MPI_Group group, int *rank);
-OMPI_DECLSPEC  int PMPI_Group_size(MPI_Group group, int *size);
-OMPI_DECLSPEC  int PMPI_Group_translate_ranks(MPI_Group group1, int n, int *ranks1,
-                                              MPI_Group group2, int *ranks2);
-OMPI_DECLSPEC  int PMPI_Group_union(MPI_Group group1, MPI_Group group2,
-                                    MPI_Group *newgroup);
-OMPI_DECLSPEC  int PMPI_Ibsend(void *buf, int count, MPI_Datatype datatype, int dest,
-                               int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  MPI_Fint PMPI_Info_c2f(MPI_Info info);
-OMPI_DECLSPEC  int PMPI_Info_create(MPI_Info *info);
-OMPI_DECLSPEC  int PMPI_Info_delete(MPI_Info info, char *key);
-OMPI_DECLSPEC  int PMPI_Info_dup(MPI_Info info, MPI_Info *newinfo);
-OMPI_DECLSPEC  MPI_Info PMPI_Info_f2c(MPI_Fint info);
-OMPI_DECLSPEC  int PMPI_Info_free(MPI_Info *info);
-OMPI_DECLSPEC  int PMPI_Info_get(MPI_Info info, char *key, int valuelen,
-                                 char *value, int *flag);
-OMPI_DECLSPEC  int PMPI_Info_get_nkeys(MPI_Info info, int *nkeys);
-OMPI_DECLSPEC  int PMPI_Info_get_nthkey(MPI_Info info, int n, char *key);
-OMPI_DECLSPEC  int PMPI_Info_get_valuelen(MPI_Info info, char *key, int *valuelen,
-                                          int *flag);
-OMPI_DECLSPEC  int PMPI_Info_set(MPI_Info info, char *key, char *value);
-OMPI_DECLSPEC  int PMPI_Init(int *argc, char ***argv);
-OMPI_DECLSPEC  int PMPI_Initialized(int *flag);
-OMPI_DECLSPEC  int PMPI_Init_thread(int *argc, char ***argv, int required,
-                                    int *provided);
-OMPI_DECLSPEC  int PMPI_Intercomm_create(MPI_Comm local_comm, int local_leader,
-                                         MPI_Comm bridge_comm, int remote_leader,
-                                         int tag, MPI_Comm *newintercomm);
-OMPI_DECLSPEC  int PMPI_Intercomm_merge(MPI_Comm intercomm, int high,
-                                        MPI_Comm *newintercomm);
-OMPI_DECLSPEC  int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag,
-                               MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source,
-                              int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Irsend(void *buf, int count, MPI_Datatype datatype, int dest,
-                               int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dest,
-                              int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Issend(void *buf, int count, MPI_Datatype datatype, int dest,
-                               int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Is_thread_main(int *flag);
-OMPI_DECLSPEC  int PMPI_Keyval_create(MPI_Copy_function *copy_fn,
-                                      MPI_Delete_function *delete_fn,
-                                      int *keyval, void *extra_state);
-OMPI_DECLSPEC  int PMPI_Keyval_free(int *keyval);
-OMPI_DECLSPEC  int PMPI_Lookup_name(char *service_name, MPI_Info info, char *port_name);
-OMPI_DECLSPEC  MPI_Fint PMPI_Op_c2f(MPI_Op op);
-OMPI_DECLSPEC  int PMPI_Op_create(MPI_User_function *function, int commute,
-                                  MPI_Op *op);
-OMPI_DECLSPEC  int PMPI_Open_port(MPI_Info info, char *port_name);
-OMPI_DECLSPEC  MPI_Op PMPI_Op_f2c(MPI_Fint op);
-OMPI_DECLSPEC  int PMPI_Op_free(MPI_Op *op);
-OMPI_DECLSPEC  int PMPI_Pack_external(char *datarep, void *inbuf, int incount,
-                                      MPI_Datatype datatype, void *outbuf,
-                                      MPI_Aint outsize, MPI_Aint *position);
-OMPI_DECLSPEC  int PMPI_Pack_external_size(char *datarep, int incount,
-                                           MPI_Datatype datatype, MPI_Aint *size);
-OMPI_DECLSPEC  int PMPI_Pack(void *inbuf, int incount, MPI_Datatype datatype,
-                             void *outbuf, int outsize, int *position, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm,
-                                  int *size);
-OMPI_DECLSPEC  int PMPI_Pcontrol(const int level, ...);
-OMPI_DECLSPEC  int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Publish_name(char *service_name, MPI_Info info,
-                                     char *port_name);
-OMPI_DECLSPEC  int PMPI_Put(void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
-                            int target_rank, MPI_Aint target_disp, int target_count,
-                            MPI_Datatype target_datatype, MPI_Win win);
-OMPI_DECLSPEC  int PMPI_Query_thread(int *provided);
-OMPI_DECLSPEC  int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source,
-                                  int tag, MPI_Comm comm, MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int source,
-                             int tag, MPI_Comm comm, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Reduce(void *sendbuf, void *recvbuf, int count,
-                               MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts,
-                                       MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Register_datarep(char *datarep,
-                                         MPI_Datarep_conversion_function *read_conversion_fn,
-                                         MPI_Datarep_conversion_function *write_conversion_fn,
-                                         MPI_Datarep_extent_function *dtype_file_extent_fn,
-                                         void *extra_state);
-OMPI_DECLSPEC  MPI_Fint PMPI_Request_c2f(MPI_Request request);
-OMPI_DECLSPEC  MPI_Request PMPI_Request_f2c(MPI_Fint request);
-OMPI_DECLSPEC  int PMPI_Request_free(MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Request_get_status(MPI_Request request, int *flag,
-                                           MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Rsend(void *ibuf, int count, MPI_Datatype datatype, int dest,
-                              int tag, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Rsend_init(void *buf, int count, MPI_Datatype datatype,
-                                   int dest, int tag, MPI_Comm comm,
-                                   MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Scan(void *sendbuf, void *recvbuf, int count,
-                             MPI_Datatype datatype, MPI_Op op, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                                void *recvbuf, int recvcount, MPI_Datatype recvtype,
-                                int root, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs,
-                                 MPI_Datatype sendtype, void *recvbuf, int recvcount,
-                                 MPI_Datatype recvtype, int root, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype,
-                                  int dest, int tag, MPI_Comm comm,
-                                  MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dest,
-                             int tag, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
-                                 int dest, int sendtag, void *recvbuf, int recvcount,
-                                 MPI_Datatype recvtype, int source, int recvtag,
-                                 MPI_Comm comm,  MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Sendrecv_replace(void * buf, int count, MPI_Datatype datatype,
-                                         int dest, int sendtag, int source, int recvtag,
-                                         MPI_Comm comm, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Ssend_init(void *buf, int count, MPI_Datatype datatype,
-                                   int dest, int tag, MPI_Comm comm,
-                                   MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Ssend(void *buf, int count, MPI_Datatype datatype, int dest,
-                              int tag, MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Start(MPI_Request *request);
-OMPI_DECLSPEC  int PMPI_Startall(int count, MPI_Request *array_of_requests);
-OMPI_DECLSPEC  int PMPI_Status_c2f(MPI_Status *c_status, MPI_Fint *f_status);
-OMPI_DECLSPEC  int PMPI_Status_f2c(MPI_Fint *f_status, MPI_Status *c_status);
-OMPI_DECLSPEC  int PMPI_Status_set_cancelled(MPI_Status *status, int flag);
-OMPI_DECLSPEC  int PMPI_Status_set_elements(MPI_Status *status, MPI_Datatype datatype,
-                                            int count);
-OMPI_DECLSPEC  int PMPI_Testall(int count, MPI_Request array_of_requests[], int *flag,
-                                MPI_Status array_of_statuses[]);
-OMPI_DECLSPEC  int PMPI_Testany(int count, MPI_Request array_of_requests[], int *index, int *flag, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Test(MPI_Request *request, int *flag, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Test_cancelled(MPI_Status *status, int *flag);
-OMPI_DECLSPEC  int PMPI_Testsome(int incount, MPI_Request array_of_requests[],
-                                 int *outcount, int array_of_indices[],
-                                 MPI_Status array_of_statuses[]);
-OMPI_DECLSPEC  int PMPI_Topo_test(MPI_Comm comm, int *status);
-OMPI_DECLSPEC  MPI_Fint PMPI_Type_c2f(MPI_Datatype datatype);
-OMPI_DECLSPEC  int PMPI_Type_commit(MPI_Datatype *type);
-OMPI_DECLSPEC  int PMPI_Type_contiguous(int count, MPI_Datatype oldtype,
-                                        MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_create_darray(int size, int rank, int ndims,
-                                           int gsize_array[], int distrib_array[],
-                                           int darg_array[], int psize_array[],
-                                           int order, MPI_Datatype oldtype,
-                                           MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_create_f90_complex(int p, int r, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_create_f90_integer(int r, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_create_f90_real(int p, int r, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_create_hindexed(int count, int array_of_blocklengths[],
-                                             MPI_Aint array_of_displacements[],
-                                             MPI_Datatype oldtype,
-                                             MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_create_hvector(int count, int blocklength, MPI_Aint stride,
-                                            MPI_Datatype oldtype,
-                                            MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn,
-                                           MPI_Type_delete_attr_function *type_delete_attr_fn,
-                                           int *type_keyval, void *extra_state);
-OMPI_DECLSPEC  int PMPI_Type_create_indexed_block(int count, int blocklength,
-                                                  int array_of_displacements[],
-                                                  MPI_Datatype oldtype,
-                                                  MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_create_struct(int count, int array_of_block_lengths[],
-                                           MPI_Aint array_of_displacements[],
-                                           MPI_Datatype array_of_types[],
-                                           MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_create_subarray(int ndims, int size_array[], int subsize_array[],
-                                             int start_array[], int order,
-                                             MPI_Datatype oldtype, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_create_resized(MPI_Datatype oldtype, MPI_Aint lb,
-                                            MPI_Aint extent, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_delete_attr(MPI_Datatype type, int type_keyval);
-OMPI_DECLSPEC  int PMPI_Type_dup(MPI_Datatype type, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_extent(MPI_Datatype type, MPI_Aint *extent);
-OMPI_DECLSPEC  int PMPI_Type_free(MPI_Datatype *type);
-OMPI_DECLSPEC  int PMPI_Type_free_keyval(int *type_keyval);
-OMPI_DECLSPEC  MPI_Datatype PMPI_Type_f2c(MPI_Fint datatype);
-OMPI_DECLSPEC  int PMPI_Type_get_attr(MPI_Datatype type, int type_keyval,
-                                      void *attribute_val, int *flag);
-OMPI_DECLSPEC  int PMPI_Type_get_contents(MPI_Datatype mtype, int max_integers,
-                                          int max_addresses, int max_datatypes,
-                                          int array_of_integers[],
-                                          MPI_Aint array_of_addresses[],
-                                          MPI_Datatype array_of_datatypes[]);
-OMPI_DECLSPEC  int PMPI_Type_get_envelope(MPI_Datatype type, int *num_integers,
-                                          int *num_addresses, int *num_datatypes,
-                                          int *combiner);
-OMPI_DECLSPEC  int PMPI_Type_get_extent(MPI_Datatype type, MPI_Aint *lb,
-                                        MPI_Aint *extent);
-OMPI_DECLSPEC  int PMPI_Type_get_name(MPI_Datatype type, char *type_name,
-                                      int *resultlen);
-OMPI_DECLSPEC  int PMPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint *true_lb,
-                                             MPI_Aint *true_extent);
-OMPI_DECLSPEC  int PMPI_Type_hindexed(int count, int array_of_blocklengths[],
-                                      MPI_Aint array_of_displacements[],
-                                      MPI_Datatype oldtype, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_hvector(int count, int blocklength, MPI_Aint stride,
-                                     MPI_Datatype oldtype, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_indexed(int count, int array_of_blocklengths[],
-                                     int array_of_displacements[],
-                                     MPI_Datatype oldtype, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_lb(MPI_Datatype type, MPI_Aint *lb);
-OMPI_DECLSPEC  int PMPI_Type_match_size(int typeclass, int size, MPI_Datatype *type);
-OMPI_DECLSPEC  int PMPI_Type_set_attr(MPI_Datatype type, int type_keyval,
-                                      void *attr_val);
-OMPI_DECLSPEC  int PMPI_Type_set_name(MPI_Datatype type, char *type_name);
-OMPI_DECLSPEC  int PMPI_Type_size(MPI_Datatype type, int *size);
-OMPI_DECLSPEC  int PMPI_Type_struct(int count, int array_of_blocklengths[],
-                                    MPI_Aint array_of_displacements[],
-                                    MPI_Datatype array_of_types[],
-                                    MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Type_ub(MPI_Datatype mtype, MPI_Aint *ub);
-OMPI_DECLSPEC  int PMPI_Type_vector(int count, int blocklength, int stride,
-                                    MPI_Datatype oldtype, MPI_Datatype *newtype);
-OMPI_DECLSPEC  int PMPI_Unpack(void *inbuf, int insize, int *position,
-                               void *outbuf, int outcount, MPI_Datatype datatype,
-                               MPI_Comm comm);
-OMPI_DECLSPEC  int PMPI_Unpublish_name(char *service_name, MPI_Info info,
-                                       char *port_name);
-OMPI_DECLSPEC  int PMPI_Unpack_external (char *datarep, void *inbuf, MPI_Aint insize,
-                                         MPI_Aint *position, void *outbuf, int outcount,
-                                         MPI_Datatype datatype);
-OMPI_DECLSPEC  int PMPI_Waitall(int count, MPI_Request *array_of_requests,
-                                MPI_Status *array_of_statuses);
-OMPI_DECLSPEC  int PMPI_Waitany(int count, MPI_Request *array_of_requests,
-                                int *index, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Wait(MPI_Request *request, MPI_Status *status);
-OMPI_DECLSPEC  int PMPI_Waitsome(int incount, MPI_Request *array_of_requests,
-                                 int *outcount, int *array_of_indices,
-                                 MPI_Status *array_of_statuses);
-OMPI_DECLSPEC  MPI_Fint PMPI_Win_c2f(MPI_Win win);
-OMPI_DECLSPEC  int PMPI_Win_call_errhandler(MPI_Win win, int errorcode);
-OMPI_DECLSPEC  int PMPI_Win_complete(MPI_Win win);
-OMPI_DECLSPEC  int PMPI_Win_create(void *base, MPI_Aint size, int disp_unit,
-                                   MPI_Info info, MPI_Comm comm, MPI_Win *win);
-OMPI_DECLSPEC  int PMPI_Win_create_errhandler(MPI_Win_errhandler_fn *function,
-                                              MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int PMPI_Win_create_keyval(MPI_Win_copy_attr_function *win_copy_attr_fn,
-                                          MPI_Win_delete_attr_function *win_delete_attr_fn,
-                                          int *win_keyval, void *extra_state);
-OMPI_DECLSPEC  int PMPI_Win_delete_attr(MPI_Win win, int win_keyval);
-OMPI_DECLSPEC  MPI_Win PMPI_Win_f2c(MPI_Fint win);
-OMPI_DECLSPEC  int PMPI_Win_fence(int assert, MPI_Win win);
-OMPI_DECLSPEC  int PMPI_Win_free(MPI_Win *win);
-OMPI_DECLSPEC  int PMPI_Win_free_keyval(int *win_keyval);
-OMPI_DECLSPEC  int PMPI_Win_get_attr(MPI_Win win, int win_keyval,
-                                     void *attribute_val, int *flag);
-OMPI_DECLSPEC  int PMPI_Win_get_errhandler(MPI_Win win, MPI_Errhandler *errhandler);
-OMPI_DECLSPEC  int PMPI_Win_get_group(MPI_Win win, MPI_Group *group);
-OMPI_DECLSPEC  int PMPI_Win_get_name(MPI_Win win, char *win_name, int *resultlen);
-OMPI_DECLSPEC  int PMPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win);
-OMPI_DECLSPEC  int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win);
-OMPI_DECLSPEC  int PMPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val);
-OMPI_DECLSPEC  int PMPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler);
-OMPI_DECLSPEC  int PMPI_Win_set_name(MPI_Win win, char *win_name);
-OMPI_DECLSPEC  int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win);
-OMPI_DECLSPEC  int PMPI_Win_test(MPI_Win win, int *flag);
-OMPI_DECLSPEC  int PMPI_Win_unlock(int rank, MPI_Win win);
-OMPI_DECLSPEC  int PMPI_Win_wait(MPI_Win win);
-OMPI_DECLSPEC  double PMPI_Wtick(void);
-OMPI_DECLSPEC  double PMPI_Wtime(void);
-
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
-
-/*
- * Conditional MPI 2 C++ bindings support.  Include if:
- *   - The user does not explicitly request us to skip it (when a C++ compiler
- *       is used to compile C code).
- *   - We want C++ bindings support
- *   - We are not building OMPI itself
- *   - We are using a C++ compiler
- */
-#if !defined(OMPI_SKIP_MPICXX) && OMPI_WANT_CXX_BINDINGS && !OMPI_BUILDING
-#if defined(__cplusplus) || defined(c_plusplus)
-#include "openmpi/ompi/mpi/cxx/mpicxx.h"
-#endif
-#endif
-
-#endif /* OMPI_MPI_H */
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPI.c b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPI.c
deleted file mode 100644
index efa16ce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPI.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "mpi.h"
-// Sample MPI program
-int main(int argc, char* argv[]){
-	printf("Hello MPI PTP World!\n");	
-	int  my_rank; /* rank of process */
-	int  p;       /* number of processes */
-	int source;   /* rank of sender */
-	int dest;     /* rank of receiver */
-	int tag=0;    /* tag for messages */
-	char message[100];        /* storage for message */
-	MPI_Status status ;   /* return status for receive */
-	
-	/* start up MPI */
-	
-	MPI_Init(&argc, &argv);
-	
-	/* find out process rank */
-	MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); 
-	
-	/* find out number of processes */
-	MPI_Comm_size(MPI_COMM_WORLD, &p); 
-	
-	
-	if (my_rank !=0){
-		/* create message */
-		sprintf(message, "Greetings from process %d!", my_rank);
-		dest = 0;
-		/* use strlen+1 so that '\0' get transmitted */
-		MPI_Send(message, strlen(message)+1, MPI_CHAR,
-		   dest, tag, MPI_COMM_WORLD);
-	}
-	else{
-		printf("From process 0: Num processes: %d\n",p);
-		for (source = 1; source < p; source++) {
-			MPI_Recv(message, 100, MPI_CHAR, source, tag,
-			      MPI_COMM_WORLD, &status);
-			printf("%s\n",message);
-		}
-	}
-	/* shut down MPI */
-	MPI_Finalize(); 
-	
-	
-	return 0;
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/PldtBaseTestFramework.java b/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/PldtBaseTestFramework.java
deleted file mode 100644
index 38ad4be..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/PldtBaseTestFramework.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * 
- */
-package org.eclipse.ptp.pldt.tests;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.eclipse.cdt.core.tests.BaseTestFramework;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author beth
- * 
- */
-public abstract class PldtBaseTestFramework extends BaseTestFramework {
-	private static HashMap<String, ArrayList<Integer>> lineMaps = new HashMap<String, ArrayList<Integer>>();
-
-	/**
-	 * Put the file into the test project
-	 */
-	protected IFile importFile(String srcDir, String filename) throws Exception {
-		// project.getProject().getFile(filename).delete(true, new
-		// NullProgressMonitor());
-		IFile result = super.importFile(filename, readTestFile(srcDir, filename));
-		// project.refreshLocal(IResource.DEPTH_INFINITE, new
-		// NullProgressMonitor());
-		return result;
-	}
-
-	protected String readTestFile(String srcDir, String filename) throws IOException, URISyntaxException {
-		ArrayList<Integer> lineMap = new ArrayList<Integer>(50);
-		lineMaps.put(filename, lineMap);
-		lineMap.add(0); // Offset of line 1
-		return readStream(lineMap, getClass().getResourceAsStream("/" + srcDir + "/" + filename));
-	}
-
-	protected String readStream(ArrayList<Integer> lineMap, InputStream inputStream) throws IOException {
-		StringBuffer sb = new StringBuffer(4096);
-		BufferedReader in = new BufferedReader(new InputStreamReader(inputStream));
-		for (int offset = 0, ch = in.read(); ch >= 0; ch = in.read()) {
-			sb.append((char) ch);
-			offset++;
-
-			if (ch == '\n' && lineMap != null) {
-				// System.out.println("Line " + (lineMap.size()+1) +
-				// " starts at offset " + offset);
-				lineMap.add(offset);
-			}
-		}
-		in.close();
-		return sb.toString();
-	}
-
-	protected String readStream(InputStream inputStream) throws IOException {
-		return readStream(null, inputStream);
-	}
-
-	protected String readWorkspaceFile(String filename) throws IOException, CoreException {
-		return readStream(project.getFile(filename).getContents());
-	}
-
-	/**
-	 * @param filename
-	 * @param line
-	 *            line number, starting at 1
-	 * @param col
-	 *            column number, starting at 1
-	 */
-	protected int getLineColOffset(String filename, int line, int col) {
-		return lineMaps.get(filename).get(line - 1) + (col - 1);
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test.java b/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test.java
deleted file mode 100644
index b86cacb..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * 
- */
-package org.eclipse.ptp.pldt.tests;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.pldt.mpi.core.MpiIDs;
-import org.eclipse.ptp.pldt.mpi.core.actions.RunAnalyseMPIcommandHandler;
-
-
-/**
- * @author beth
- *
- */
-public class Test extends PldtBaseTestFramework{
-
-
-	
-	public void testMPIartifacts() throws Exception {
-		IFile file = importFile("resources", "testMPI.c");
-		assertNotNull(file);
-		
-		IFile mpiInclude = importFile("resources/includes","mpi.h");
-		assertNotNull(mpiInclude);
-		String tempPath = mpiInclude.getFullPath().toOSString();//includePath= /RegressionTestProject/mpi.h
-		System.out.println("tempPath="+tempPath);
-		String includePath = mpiInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-			+ mpiInclude.getFullPath().toFile().getAbsolutePath();
-		System.out.println("includePath= "+includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		// ICElement covers folders and translationunits
-		final ICElement ce = (ICElement) ((IAdaptable) file).getAdapter(ICElement.class);
-		// assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] {includePath});
-		RunAnalyseMPIcommandHandler racm = new RunAnalyseMPIcommandHandler();
-		
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-		
-		IMarker[] markers=file.findMarkers(MpiIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: "+markers.length);
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			System.out.println(i+ " marker: "+marker.toString());
-			
-			
-		}
-		
-		
-//		protected boolean runResource(IProgressMonitor monitor, ICElement ce,
-//				int indent, List<String> includes) throws InterruptedException {
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath b/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore
deleted file mode 100644
index 2cc8dd1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-icons-old
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.project b/tools/pldt/org.eclipse.ptp.pldt.upc/.project
deleted file mode 100644
index 6349367..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.upc</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
deleted file mode 100644
index d56ae3f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.upc;singleton:=true
-Bundle-Version: 3.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.upc.UPCPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.ptp.pldt.common,
- org.eclipse.help,
- org.eclipse.cdt.doc.user,
- org.eclipse.cdt.core.parser.upc;bundle-version="5.0.0"
-Eclipse-AutoStart: true
-Bundle-ClassPath: .
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties b/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties
deleted file mode 100644
index 33c2c65..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               html/,\
-               plugin.properties
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html
deleted file mode 100644
index 367221c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2><code>MYTHREAD</code> keyword</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>MYTHREAD</code>  is an expression with a value of type int; it specifies the unique
-thread index. 
-<br>The range of possible values is <code>0..THREADS-16</code>.
-<h4>Example</h4>
-<p>The following program prints the numbers 0
-through <code>THREADS-1</code>, in some order.
-<pre>
-    #include &lt;upc.h&gt;
-    main(){ 
-      printf("%d ",MYTHREAD); 
-    }
-</pre>
-<p>See also <a href="id_THREADS.html"><code>THREADS</code></a>,
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html
deleted file mode 100644
index 9a00383..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_THREADS.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<h2><code><code>THREADS</code></code> keyword</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>THREADS</code> is an expression with a value of type <code>int</code>; it specifies the number of
-threads and has the same value on every thread. Under the static <code>THREADS</code>
-translation environment, <code>THREADS</code> is an <code>int</code>eger constant suitable for use in
-#if preprocessing directives.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html
deleted file mode 100644
index f51f59c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_UPC_MAX_BLOCK_SIZE.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<h2><code>UPC_MAX_BLOCK_SIZE</code> identifier</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>UPC_MAX_BLOCK_SIZE</code>  is a predefined integer constant value. It indicates the
-maximum value allowed in a layout qualifier for shared data. It shall be
-suitable for use in <code>#if</code> preprocessing directives.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html
deleted file mode 100644
index 01bb476..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/index.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<h2 id="top">UPC Statements</h2>
-<ul>
-<li><a href="keywords.html">Keywords/Identifiers</a>
-<li><a href="keywords.html">Keywords</a>
-
-</ul>
-<h2 id="top">UPC functions</h2>
-<p>Termination of all threads
-<ul>
-<li><a href="upc_global_exit.html"> <code>upc_global_exit</code> </a>
-</ul>
-<p>Shared memory allocation functions
-<ul>
-<li><a href="upc_global_alloc.html"> <code>upc_global_alloc</code> </a>
-<li><a href="upc_all_alloc.html"> <code>upc_all_alloc</code> </a>
-<li><a href="upc_alloc.html"> <code>upc_alloc</code> </a>
-<li><a href="upc_local_alloc.html"> <code>upc_local_alloc</code> </a>  <i>deprecated</i>
-<li><a href="upc_free.html"> <code>upc_free</code> </a>
-</ul>
-
-<p>Pointer-to-shared manipulation functions
-<ul>
-<li><a href="upc_threadof.html"> <code>upc_threadof</code> </a>
-<li><a href="upc_phaseof.html"> <code>upc_phaseof</code> </a>
-<li><a href="upc_resetphase.html"> <code>upc_resetphase</code> </a>
-<li><a href="upc_addrfield.html"> <code>upc_addrfield</code> </a>
-<li><a href="upc_affinitysize.html"> <code>upc_affinitysize</code> </a>
-</ul>
-
-<p>Lock functions
-<ul>
-<li><a href="upc_lock_t.html"> <code>upc_lock_t</code> </a> &nbsp; type 
-<li><a href="upc_global_lock_alloc.html"> <code>upc_global_lock_alloc</code>  </a>
-<li><a href="upc_all_lock_alloc.html"> <code>upc_all_lock_alloc</code>  </a>
-<li><a href="upc_lock_free.html"> <code>upc_lock_free</code>  </a>
-<li><a href="upc_lock.html"> <code>upc_lock</code>  </a>
-<li><a href="upc_lock_attempt.html"> <code>upc_lock_attempt</code>  </a>
-<li><a href="upc_unlock.html"> <code>upc_unlock</code>  </a>
-</ul>
-
-<p>Shared string handling functions
-<ul>
-<li><a href="upc_memcpy.html"> <code>upc_memcpy</code> </a>
-<li><a href="upc_memget.html"> <code>upc_memget</code> </a>
-<li><a href="upc_memcpy.html"> <code>upc_memcpy</code> </a>
-<li><a href="upc_memset.html"> <code>upc_memset</code> </a>
-</ul>
-
-<p>Collective Utilities
-<ul>
-<li><a href="upc_all_broadcast.html"> <code>upc_all_broadcast</code> </a>
-<li><a href="upc_all_scatter.html"> <code>upc_all_scatter</code> </a>
-<li><a href="upc_all_gather.html"> <code>upc_all_gather</code> </a>
-<li><a href="upc_all_gather_all.html"> <code>upc_all_gather_all</code> </a>
-<li><a href="upc_all_exchange.html"> <code>upc_all_exchange</code> </a>
-<li><a href="upc_all_permute.html"> <code>upc_all_permute</code> </a>
-
-</ul>
-<p>
-See also <a href="terms.html">Terms, definitions, and symbols</a>
-<p>
-<a href="#top">Back to top</a>
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html
deleted file mode 100644
index 1e21ac3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/keywords.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<h2>UPC Keywords/Identifiers</h2>
-<code>
-<ul>    
-<li><a href="id_MYTHREAD.html">MYTHREAD   </a>
-<li><a href="id_relaxed.html">relaxed       </a>
-<li><a href="id_shared.html">shared        </a>
-<li><a href="id_strict.html">strict       </a>
-<li><a href="id_THREADS.html">THREADS      </a>
-<li><a href="id_upc_barrier.html">upc_barrier         </a>
-<li><a href="id_upc_blocksizeof.html">upc_blocksizeof      </a>
-<li><a href="id_upc_elemsizeof.html">upc_elemsizeof      </a>
-<li><a href="id_upc_fence.html">upc_fence           </a>
-<li><a href="id_upc_localsizeof.html">upc_localsizeof   </a>
-<li><a href="id_UPC_MAX_BLOCKSIZE.html">UPC_MAX_BLOCKSIZE   </a>
-<li><a href="id_upc_notify.html">upc_notify   </a>
-<li><a href="id_upc_wait.html">upc_wait   </a>
-<li><a href="id_upc_forall.html">upc_forall        </a>     
-</ul>
-</code>
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html
deleted file mode 100644
index f5fe38d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/shared.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<h2><code><code>shared</code></code> keyword</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>shared</code> indicates a variable is shared between threads.
-<p>
-<pre>
-shared int i;
-shared [2] int a[200];
-strict shared int i;
-</pre>
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html
deleted file mode 100644
index abfa250..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/terms.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<h4 id="top">UPC Terms, definitions and symbols</h4>
-<p>
-For the purpose of these specifications the following definitions apply.
-
-<dl>
-<dt><strong><strong>thread</strong></strong></dt>
-<dd>
-an instance of execution initiated by the execution environment at program
-startup.</dd>
-
-<dt><strong> </strong></dt>
-<dd> </dd>
-
-<dt><strong>object</strong></dt>
-<dd>
-region of data storage in the execution environment which can represent
-values.</dd>
-
-<dt><strong>shared object </strong></dt>
-<dd>
-an object allocated using a shared-qualified declarator or by a library function
-defined to create shared objects. 
-<p>Note: 
-All threads may access shared objects.</dd>
-
-<dt><strong>private object</strong></dt>
-<dd>
-any object which is not a shared object.
-<p>Note: Each thread declares and creates its own private objects which no
-other thread can access.</dd>
-<dt><strong> shared array</strong></dt>
-<dd>
-an array with elements that have shared qualified type.
-</dd>
-<dt><strong>affinity</strong></dt>
-<dd>
-logical association between shared objects and threads. Each element of data
-storage that contains shared objects has affinity to exactly one thread.
-</dd>
-<dt><strong>pointer-to-shared</strong></dt>
-<dd>
-a pointer whose referenced type is shared-qualified.
-</dd>
-<dt><strong> pointer-to-local</strong></dt>
-<dd>
-a pointer whose referenced type is not shared-qualified.
-</dd>
-<dt><strong>access</strong></dt>
-<dd>
-&lt;execution-time action&gt; to read or modify the value of an object by a thread.
-<p>The file scope declaration int y; creates a separate object for each thread to access.
-</dd>
-<dt><strong>shared access</strong></dt>
-<dd>
-an access using an expression whose type is shared-qualified.</dd>
-<dt><strong> strict shared read</strong></dt>
-<dd>
-a shared read access which is determined to be strict.</dd>
-<dt><strong>strict shared write</strong></dt>
-<dd>
-a shared modify access which is determined to be strict </dd>
-<dt><strong>relaxed shared read</strong></dt>
-<dd>
-a shared read access which is determined to be relaxed</dd>
-<dt><strong>relaxed shared write</strong></dt>
-<dd>
-a shared modify access which is determined to be relaxed </dd>
-<dt><strong>local access</strong></dt>
-<dd>
-an access using an expression whose type is not shared-qualified.
-</dd>
-<dt><strong>collective</strong></dt>
-<dd>
-a constraint placed on some language operations which requires evaluation
-of such operations to be matched across all threads. The behavior of collective
-operations is undefined unless all threads execute the same sequence of
-collective operations.</dd>
-<dt><strong>single-valued</strong></dt>
-<dd>
-an operand to a collective operation, which has the same value on every
-thread. The behavior of the operation is otherwise undefined.</dd>
-<dt><strong>phase</strong></dt>
-<dd>
-an unsigned integer value associated with a pointer-to-shared which indicates
-the element-offset within an affinity block; used in pointer-to-shared
-arithmetic to determine affinity boundaries</dd>
-</dl>
-<p>&nbsp
-<p>&nbsp
-<p><a href="#top">Back to  top</a>
-<p><a href="index.html">Back to index of all UPC functions</a>
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html
deleted file mode 100644
index b4133e68..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_addrfield.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h2>The <code>upc_addrfield</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    size_t upc_addrfield(shared void *ptr);                 
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_addrfield </code>  function returns an implementation-defined value reflecting
-the <q>local address</q>of the object pointed to by the pointer-to-shared
-argument.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html
deleted file mode 100644
index de6b81f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_affinitysize.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<h2>The <code>upc_affinitysize</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    size_t upc_affinitysize(size_t totalsize, 
-                            size_t nbytes,
-                            size_t threadid);                
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_affinitysize </code>  function is a convenience function which calculates the exact size
-of the local portion of the data in a shared object with affinity to <code>threadid</code>.
-<p>In the case of a dynamically allocated shared object, the <code>totalsize</code> argument
-shall be <code>nbytes*nblocks</code> and the <code>nbytes</code> argument shall be <code>nbytes</code>,
-where <code>nblocks</code> and <code>nbytes</code> are exactly as passed to <code>upc_global_alloc</code> or
-<code>upc_all_alloc</code> when the object was allocated.
-<p>In the case of a statically allocated shared object with declaration:
-<pre>
-   shared [b] t d[s];
-   </pre>
-the <code>totalsize</code> argument shall be <code>s * sizeof(t)</code> and the <code>nbytes</code> argument
-shall be <code>b * sizeof(t)</code>. If the block size is indefinite, <code>nbytes</code> shall be 0.
-<p><code>threadid</code> shall be a value in <code>0..(THREADS-1)</code>.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html
deleted file mode 100644
index 4cb0943..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_alloc.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<h2 >The <code>upc_all_alloc</code>     </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    shared void *upc_all_alloc(size_t nblocks, 
-                               size_t nbytes);   
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_all_alloc   </code> function allocates shared space compatible with the following
-declaration:
-<p><code>
-shared [nbytes] char[nblocks * nbytes].
-</code></p>
-<p>
-The <code>upc_all_alloc   </code> function returns the same pointer value on all threads.
-If nblocks*nbytes is zero, the result is a null pointer-to-shared.
-<p>The dynamic lifetime of an allocated object extends from the time any thread
-completes the call to <code>upc_all_alloc   </code> until any thread has deallocated the
-object.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html
deleted file mode 100644
index a34903c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_broadcast.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<h2>The <code>upc_all_broadcast</code> function</h2>
-<h4>Purpose</h4>
-<p>Copies a block of memory
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_broadcast(shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags);             
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_broadcast </code>  function  
-copies a block of memory with affinity to
-a single thread to a block of shared memory on each thread. The number of
-bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p><code>upc_all_broadcast </code> function treats the <code>src</code> pointer as if it pointed to a
-shared memory area with the type:
-<pre>
-    shared [] char[nbytes]
-    </pre>
-<p>The effect is equivalent to copying the entire array pointed to by <code>src</code> to each
-block of <code>nbytes</code> bytes of a shared array <code>dst</code> with the type:
-<pre>
-    shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>The target of the <code>dst</code> pointer must have affinity to thread 0.
-<p>The <code>dst</code> pointer is treated as if it has phase 0.
-
-<ul>
-<li>EXAMPLE 1 shows upc_all_broadcast
-
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-shared int A[THREADS];
-shared int B[THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_broadcast( B, &A[1], sizeof(int),
-                   UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-
-<li>EXAMPLE 2:
-
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [] int A[NELEMS];
-shared [NELEMS] int B[NELEMS*THREADS];
-// Initialize A.
-upc_all_broadcast( B, A, sizeof(int)*NELEMS,
-                   UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-<li>EXAMPLE 3 shows <code>(A[3],A[4])</code> is broadcast to <code>(B[0],B[1]), (B[10],B[11]),
-(B[20],B[21]), ..., (B[NELEMS*(THREADS-1)],B[NELEMS*(THREADS-1)+1]).</code>
-
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [NELEMS] int B[NELEMS*THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_broadcast( B, &A[3], sizeof(int)*2,
-                   UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html
deleted file mode 100644
index ac50338..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_exchange.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<h2>The <code>upc_all_exchange</code> function     </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_exchange(shared void * restrict dst, 
-                          shared const void * restrict src, 
-                          size_t nbytes, upc_flag_t flags);  
-    </pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_all_exchange   </code> function   copies the ith block of memory from a shared
-memory area that has affinity to thread j to the jth block of a shared memory
-area that has affinity to thread i. The number of bytes in each block is
-<code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>
-<p>The <code>upc_all_exchange   </code> function treats the <code>src</code> pointer and the <code>dst</code> pointer
-as if each pointed to a shared memory area of <code>nbytes * THREADS</code> bytes on each
-thread and therefore had type:
-<pre>
-    shared [nbytes * THREADS] char[nbytes * THREADS * THREADS]
-</pre>
-<p>The targets of the <code>src</code> and <code>dst</code> pointers must have affinity to thread 0.
-<p>The <code>src</code> and <code>dst</code> pointers are treated as if they have phase 0.
-<p>For each pair of threads i and j, the effect is equivalent to copying the ith
-block of <code>nbytes</code> bytes that has affinity to thread j pointed to by <code>src</code> to the
-jth block of <code>nbytes</code> bytes that has affinity to thread i pointed to by <code>dst</code>.
-<ul>
-<li>EXAMPLE 1 <code>upc_all_exchange   </code> for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS*THREADS] int A[THREADS][NELEMS*THREADS];
-shared [NELEMS*THREADS] int B[THREADS][NELEMS*THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_exchange( B, A, NELEMS*sizeof(int),
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-
-<li>EXAMPLE 2 <code>upc_all_exchange   </code> for the dynamic THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared int *Adata, *Bdata;
-shared [] int *myA, *myB;
-int i;
-
-Adata = upc_all_alloc(THREADS*THREADS, NELEMS*sizeof(int));
-myA = (shared [] int *)&Adata[MYTHREAD];
-Bdata = upc_all_alloc(THREADS*THREADS, NELEMS*sizeof(int));
-myB = (shared [] int *)&Bdata[MYTHREAD];
-// Adata and Bdata contain THREADS*THREADS*NELEMS elements.
-// myA and myB are MYTHREAD's rows of Adata and Bdata, resp.
-// Initialize MYTHREAD's row of A. For example,
-for (i=0; i&lt;NELEMS*THREADS; i++)
-myA[i] = MYTHREAD*10 + i;
-upc_all_exchange( Bdata, Adata, NELEMS*sizeof(int),
-                  UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html
deleted file mode 100644
index e5e55ca..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<h2>The <code>upc_all_gather</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_gather(shared void * restrict dst, 
-                        shared const void * restrict src, 
-                        size_t nbytes, 
-                        upc_flag_t flags); 
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_gather </code>  function 
-copies a block of shared memory that has
-affinity to the ith thread to the ith block of a shared memory area that has
-affinity to a single thread. The number of bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>The upc all gather function treats the <code>src</code> pointer as if it pointed to a
-shared memory area of <code>nbytes</code> bytes on each thread and therefore had type:
-<pre>
-    shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>and it treats the <code>dst</code> pointer as if it pointed to a shared memory area with
-the type:
-<pre>
-    shared [] char[nbytes * THREADS]
-    </pre>
-<p>The target of the <code>src</code> pointer must have affinity to thread 0.
-<p>The <code>src</code> pointer is treated as if it has phase 0.
-<p>For each thread i, the effect is equivalent to copying the block of <code>nbytes</code> bytes
-pointed to by <code>src</code> that has affinity to thread i to the ith block of <code>nbytes</code>
-bytes pointed to by <code>dst</code>.
-<p>
-<ul>
-<li>EXAMPLE 1 <code>upc_all_gather </code> for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [] int B[NELEMS*THREADS];
-// Initialize A.
-upc_all_gather( B, A, sizeof(int)*NELEMS,
-UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-<li>EXAMPLE 2 <code>upc_all_gather </code> for the dynamic THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [] int *B;
-B = (shared [] int *) upc_all_alloc(1,NELEMS*THREADS*sizeof(int));
-// Initialize A.
-upc_barrier;
-upc_all_gather( B, A, sizeof(int)*NELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-<li>
-<li>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br><p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html
deleted file mode 100644
index 4e3199e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_gather_all.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<h2>The <code>upc_all_gather_all</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_gather_all(shared void * restrict dst,
-                            shared const void * restrict src, 
-                            size_t nbytes,
-                            upc_flag_t flags);
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_gather_all </code>  function 
-copies a block of memory from one shared
-memory area with affinity to the ith thread to the ith block of a shared
-memory area on each thread. The number of bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>The upc_all_gather_all function treats the <code>src</code> pointer as if it pointed to a
-shared memory area of <code>nbytes</code> bytes on each thread and therefore had type:
-<pre>
-shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>and it treats the <code>dst</code>  pointer as if it pointed to a shared memory area with
-the type:
-shared [nbytes * THREADS] char[nbytes * THREADS * THREADS]
-<p>The targets of the <code>src</code> and <code>dst</code> pointers must have affinity to thread 0.
-<p>The <code>src</code> and <code>dst</code>  pointers are treated as if they have phase 0.
-<p>The effect is equivalent to copying the ith block of <code>nbytes</code> bytes pointed to
-by <code>src</code> to the ith block of <code>nbytes</code> bytes pointed to by <code>dst</code> that has affinity
-to each thread.
-
-
-
-<p>
-<ul>
-<li> EXAMPLE 1 <code>upc_all_gather_all </code> for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared [NELEMS*THREADS] int B[THREADS][NELEMS*THREADS];
-// Initialize A.
-upc_barrier;
-upc_all_gather_all( B, A, sizeof(int)*NELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-<li>EXAMPLE 2 <code>upc_all_gather_all </code> all for the dynamic THREADS translation
-environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS];
-shared int *Bdata;
-shared [] int *myB;
-Bdata = upc_all_alloc(THREADS*THREADS, NELEMS*sizeof(int));
-myB = (shared [] int *)&Bdata[MYTHREAD];
-// Bdata contains THREADS*THREADS*NELEMS elements.
-// myB is MYTHREADÕs row of Bdata.
-// Initialize A.
-upc_all_gather_all( Bdata, A, NELEMS*sizeof(int),
-UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
-<li>
-<li>
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html
deleted file mode 100644
index 8262913..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_lock_alloc.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<h2 >The <code>upc_all_lock_alloc</code> function   </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    upc_lock_t *upc_all_lock_alloc(void);                     
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_all_lock_alloc</code>    function dynamically allocates a lock and returns
-a pointer to it. The lock is created in an unlocked state.
-<p>The <code>upc_all_lock_alloc</code>  function is  a <i>collective</i> function. 
-The return value on every
-thread points to the same lock object.
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html
deleted file mode 100644
index 86b93b4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_permute.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<h2>The <code>upc_all_permute</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_permute(shared void * restrict dst,
-        shared const void * restrict src,
-        shared const int * restrict perm,
-        size_t nbytes, upc_flag_t flags);
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_permute </code>  function 
-copies a block of memory from a shared memory
-area that has affinity to the ith thread to a block of a shared memory
-that has affinity to thread perm[i]. The number of bytes in each block is
-<code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p><code>perm[0..THREADS-1]</code> must contain <code>THREADS</code>
-distinct values: 
-<code>0, 1, ..., THREADS-1.</code>
-<p>The <code>upc_all_permute </code> function treats the <code>src</code> pointer and the <code>dst</code> pointer
-as if each pointed to a shared memory area of <code>nbytes</code> bytes on each thread
-and therefore had type:
-<pre>
-    shared [<code>nbytes</code>] char[<code>nbytes</code> * THREADS]
-    </pre>
-<p>The targets of the <code>src</code>, perm, and <code>dst</code> pointers must have affinity to thread 0.
-<p>The <code>src</code> and <code>dst</code> pointers are treated as if they have phase 0.
-<p>The effect is equivalent to copying the block of <code>nbytes</code> bytes that has affinity
-to thread i pointed to by <code>src</code> to the block of <code>nbytes</code> bytes that has affinity
-to thread perm[i] pointed to by <code>dst</code>.
-<ul>
-<li>EXAMPLE 1: <code>upc_all_permute</code>
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [NELEMS] int A[NELEMS*THREADS], B[NELEMS*THREADS];
-shared int P[THREADS];
-// Initialize A and P.
-upc_barrier;
-upc_all_permute( B, A, P, sizeof(int)*NELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC );
-upc_barrier;
-</pre>
-
-</ul>
-
- 
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html
deleted file mode 100644
index 5b21e92..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_all_scatter.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<h2>The <code>upc_all_scatter</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    #include &lt;upc_collective.h&gt;
-    void upc_all_scatter(shared void * restrict dst, 
-                         shared const void * restrict src, 
-                         size_t nbytes, 
-                         upc_flag_t flags);
-               
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_all_scatter </code>  function 
-copies the ith block of an area of shared
-memory with affinity to a single thread to a block of shared memory with
-affinity to the ith thread. The number of bytes in each block is <code>nbytes</code>.
-<p><code>nbytes</code> must be strictly greater than 0.
-<p>The <code>upc_all_scatter </code>  function treats the <code>src</code> pointer as if it pointed to a
-shared memory area with the type:
-<pre>
-    shared [] char[nbytes * THREADS]
- </pre>
-<p>and it treats the <code>dst</code> pointer as if it pointed to a shared memory area with
-the type:
-<pre>
-    shared [nbytes] char[nbytes * THREADS]
-</pre>
-<p>The target of the <code>dst</code> pointer must have affinity to thread 0.
-<p>The <code>dst</code> pointer is treated as if it has phase 0.
-<p>For each thread i, the effect is equivalent to copying the ith block of <code>nbytes</code>
-bytes pointed to by <code>src</code> to the block of <code>nbytes</code> bytes pointed to by 
-<code>dst</code> that
-has affinity to thread i.
-<ul>
-<li>EXAMPLE 1: <code>upc_all_scatter</code> for the dynamic THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NUMELEMS 10
-#define SRC_THREAD 1
-shared int *A;
-shared [] int *myA, *srcA;
-shared [NUMELEMS] int B[NUMELEMS*THREADS];
-// allocate and initialize an array distributed across all threads
-A = upc_all_alloc(THREADS, THREADS*NUMELEMS*sizeof(int));
-myA = (shared [] int *) &A[MYTHREAD];
-for (i=0; i<NUMELEMS*THREADS; i++)
-myA[i] = i + NUMELEMS*THREADS*MYTHREAD; // (for example)
-// scatter the SRC_THREADÕs row of the array
-srcA = (shared [] int *) &A[SRC_THREAD];
-upc_barrier;
-upc_all_scatter( B, srcA, sizeof(int)*NUMELEMS,
-UPC_IN_NOSYNC | UPC_OUT_NOSYNC);
-upc_barrier;
-</pre>
-<li>EXAMPLE 2: <code>upc_all_scatter</code>  for the static THREADS translation environment.
-<pre>
-#include &lt;upc.h&gt;
-#include &lt;upc_collective.h&gt;
-#define NELEMS 10
-shared [] int A[NELEMS*THREADS];
-shared [NELEMS] int B[NELEMS*THREADS];
- 
-// Initialize A.
-upc_all_scatter( B, A, sizeof(int)*NELEMS,
-UPC_IN_ALLSYNC | UPC_OUT_ALLSYNC );
-</pre>
- 
-</ul>
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html
deleted file mode 100644
index 9f94bb0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_alloc.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<h2 >The <code>upc_alloc</code> function    </h2>
-
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    shared void *upc_alloc(size_t nbytes);                          
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_alloc  </code> allocates shared space of at least <code>nbytes</code> bytes with
-affinity to the calling thread.
-<p>
-<code>upc_alloc</code> is similar to malloc() except that it returns a pointer-to-shared
-value. It is not a <i>collective</i> function. If <code>nbytes</code> is zero, the result is a null
-pointer-to-shared.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html
deleted file mode 100644
index 1dbf679..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_free.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<h2 >The <code>upc_free</code> function   </h2>
-<h4>Synopsis</h4>
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_free(shared void *ptr);                         
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_free </code>   function frees the dynamically allocated shared storage pointed
-to by <code>ptr</code>. If <code>ptr</code> is a null pointer, no action occurs. Otherwise, if the
-argument does not match a pointer earlier returned by the 
-<a href="upc_alloc.html"><code>upc_alloc</code></a>,
-<a href="upc_global_alloc.html"><code>upc_global_alloc</code></a>,
-<a href="upc_all_alloc.html"><code>upc_all_alloc</code></a>, or 
-<a href="upc_local_alloc.html"><code>upc_local_alloc</code></a>
-function, or if the
-space has been deallocated by a previous call, by any thread 
-(i.e., only one thread may call <code>upc_free </code> for each allocation),
-to <code>upc_free</code>,
-the behavior is undefined.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html
deleted file mode 100644
index 8373525..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_alloc.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<h2 >upc_global_alloc</h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre>
-    #include &lt;upc.h&gt;
-    shared void *upc_global_alloc(size_t nblocks, 
-                                  size_t nbytes);
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_global_alloc</code> allocates shared space compatible with the declaration:
-<p>
-<code>
-shared [nbytes] char[nblocks * nbytes]</code>
-<p>
-<code>upc_global_alloc</code> function is not a collective function. If called by
-multiple threads, all threads which make the call get different allocations. If
-<code>nblocks*nbytes</code> is zero, the result is a null pointer-to-shared.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html
deleted file mode 100644
index 4b2f998..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_exit.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<h2 >The <code>upc_global_exit</code> function </h2>
-<h4>Synopsis</h4>
-<pre>
-    #include &lt;upc.h&gt;
-    void upc_global_exit(int status);
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-<code>upc_global_exit() </code>
-flushes all I/O, releases all storage, and terminates the
-execution for all active threads.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
-
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html
deleted file mode 100644
index e4e35ff..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_global_lock_alloc.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<h2 >The <code>upc_global_lock_alloc</code> function   </h2>
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    upc_lock_t *upc_global_lock_alloc(void);                      
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_global_lock_alloc </code>   function dynamically allocates a lock and returns
-a pointer to it. The lock is created in an unlocked state.
-<p>The <code>upc_global_lock_alloc </code> function is not a <i>collective</i> function.  If called
-by multiple threads, all threads which make the call get different allocations.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html
deleted file mode 100644
index 5247a1a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_local_alloc.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<h2 >The <code>upc_local_alloc</code> function &nbsp;&nbsp; <i>deprecated</i> </h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre> 
-    #include &lt;upc.h&gt;
-    shared void *upc_local_alloc(size_t nblocks, 
-                                 size_t nbytes);                          
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_local_alloc </code> function is deprecated and should not be used. UPC
-programs should use the <code>upc_alloc </code> function instead. Support may be removed
-in future versions of this specification.
-<p>
-The <code>upc_local_alloc </code> function allocates shared space of at least 
-<code>nblocks * nbytes </code> bytes with affinity to the calling thread. If 
-<code>nblocks * nbytes </code>  is zero,
-the result is a null pointer-to-shared.
-<p>
-<code>upc_local_alloc </code> is similar to malloc() except that it returns a pointer-to-shared
-value. It is not a <i>collective</i> function.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html
deleted file mode 100644
index b10919e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<h2 >The <code>upc_lock</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_lock(upc_lock_t *ptr);                  
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_lock</code>    function  sets the state of the lock pointed to by <code>ptr</code> to locked.
-<p>If the lock is already in locked state due to the calling thread setting it to
-locked state, the result is undefined.
-<p>If the lock is already in locked state, then the calling thread waits for some
-other thread to set the state to unlocked. 
-<p>Once the lock is in state unlocked, a single calling thread sets the state to
-locked and the function returns.
-<p>A null strict access is implied after a call to upc_lock().
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html
deleted file mode 100644
index 7f92a9b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_attempt.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<h2 >The <code>upc_lock_attempt</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    int upc_lock_attempt(upc_lock_t *ptr);               
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_lock_attempt</code>    function  attempts to set the state of the lock pointed
-to by <code>ptr</code> to locked.
-<p>If the lock is already in locked state due to the calling thread setting it to
-locked state, the result is undefined.
-<p>If the lock is already in locked state the function returns 0.
-<p>If the lock is in state unlocked, a single calling thread sets the state to locked
-and the function returns 1.
-<p>A null strict access is implied after a call to upc_lock_attempt() that returns
-1.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html
deleted file mode 100644
index c56d3f3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_free.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<h2 >The <code>upc_lock_free</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    upc_lock_t *upc_lock_free(upc_lock_t *ptr);                     
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_lock_free</code>    function  frees all resources associated with the dynamically
-allocated <code>upc_lock_t</code> pointed to by <code>ptr</code>. 
-If <code>ptr</code> is a null pointer, no
-action occurs. 
-Otherwise, if the argument does not match a pointer earlier
-returned by the <code>upc_global_lock_alloc</code> or 
-<code>upc_all_lock_alloc</code> function,
-or if the lock has been deallocated by a previous call to <code>upc_lock_free</code>,
-the behavior is undefined.
-<p>
-<code>upc_lock_free</code> succeeds regardless of whether the referenced lock is currently
-unlocked or currently locked (by any thread).
-<p>Any subsequent calls to locking functions from any thread using <code>ptr</code> have
-undefined effects. This also applies to any thread currently calling <code>upc_lock</code>.
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html
deleted file mode 100644
index 42aa596..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_lock_t.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<h2>The <code>upc_lock_t</code> type</h2>
-
-<h4>Synopsis</h4>
-<p>The type declared is
-<pre>   
-    upc_lock_t               
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The type <code>upc_lock_t </code>  is an opaque UPC type. <code>upc_lock_t </code> is a shared
-datatype with incomplete type (as defined in [ISO/IEC00 Sec 6.2.5]). 
-Objects
-of type <code>upc_lock_t </code> may therefore only be manipulated through pointers.
-Such objects have two states called locked and unlocked.
-<p>Two pointers to that reference the same lock object will compare as equal.
-The results of applying upc_phaseof(), upc_threadof(), and upc_addrfield()
-to such pointers are undefined.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html
deleted file mode 100644
index c5e4af6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memcpy.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<h2 >The <code>upc_memcpy</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_memcpy(shared void * restrict dst, 
-                    shared const void * restrict src, 
-                    size_t n);
-                    
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_memcpy</code>    function  copies n characters from a shared object having
-affinity with one thread to a shared object having affinity with the same or
-another thread.
-<p>The <code>upc_memcpy</code> function treats the <code>dst</code> and <code>src</code> pointers as if 
-they had type:
-<pre>
-    shared [] char[n]
-</pre>
-The effect is equivalent to copying the entire contents from one shared array
-object with this type (the <code>src</code> array) to another shared array object with
-this type (the <code>dst</code> array).
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html
deleted file mode 100644
index 6cbc444..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memget.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<h2 >The <code>upc_memget</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_memget(void * restrict dst, 
-                    shared const void * restrict src, 
-                    size_t n);
-                    
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_memget</code>    function  copies n characters from a shared object with affinity
-to any single thread to an object on the calling thread.
-<p>The <code>upc_memget</code> function treats the <code>src</code> pointer as if it had type:
-<pre>
-    shared [] char[n]
-    </pre>
-The effect is equivalent to copying the entire contents from one shared array
-object with this type (the <code>src</code> array) to an array object (the <code>dst</code> array)
-declared with the type
-<pre>
-    char[n]
-</pre>
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html
deleted file mode 100644
index 184d820..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_memset.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<h2 >The <code>upc_memset</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_memset(shared void *dst, 
-                    int c, 
-                    size_t n);
-                    
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_memset</code>    function  copies the value of c, converted to an unsigned
-char, to a shared object with affinity to any single thread. The number of
-bytes set is n.
-<p>The <code>upc_memset</code>  function treats the <code>dst</code> pointer as if had type:
-<pre>
-    shared [] char[n]
-</pre>
-    
-The effect is equivalent to setting the entire contents of a shared array object
-with this type (the <code>dst</code> array) to the value c.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html
deleted file mode 100644
index bee4bfa..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_phaseof.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h2>The <code>upc_phaseof</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    #include &lt;upc.h&gt;
-    size_t upc_phaseof(shared void *ptr);                          
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_phaseof </code> function  returns the phase component of the pointer-to-shared
-argument.
-<p>If <code>ptr</code> is a null pointer-to-shared, the function returns 0.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html
deleted file mode 100644
index 8327802..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_resetphase.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h2>The <code>upc_resetphase</code> function</h2>
-
-<h4>Synopsis</h4>
-<pre>    
-    #include &lt;upc.h&gt;
-    shared void *upc_resetphase(shared void *ptr);                     
-</pre>
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_resetphase </code> function   returns a pointer-to-shared which is identical
-to its input except that it has zero phase.
-
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html
deleted file mode 100644
index a0b410b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_threadof.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<h2 >The <code>upc_threadof</code> function &nbsp;&nbsp; </h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre> 
-    #include &lt;upc.h&gt;
-    size_t upc_threadof(shared void *ptr);                        
-</pre>
-<p>
-<h4>Description</h4>
-<p>
-The <code>upc_threadof </code>function returns the index of the thread that has affinity
-to the shared object pointed to by <code>ptr</code>.
-<p>
-If <code>ptr</code> is a null pointer-to-shared, the function returns 0.
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html
deleted file mode 100644
index 112d0ab..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/upc_unlock.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<h2 >The <code>upc_unlock</code> function   </h2>
-
-<h4>Synopsis</h4>
-<p>
-
-<pre> 
-    #include &lt;upc.h&gt;
-    void upc_unlock(upc_lock_t *ptr);              
-</pre>
-
-<p>
-<h4>Description</h4>
-
-<p>
-The <code>upc_unlock</code>    function  sets the state of the lock pointed to by <code>ptr</code> to
-unlocked.
-<p>Unless the lock is in locked state and the calling thread is the locking thread,
-the result is undefined.
-<p>A null strict access is implied before a call to upc unlock().
-
-<p>&nbsp
-<p>&nbsp
-<p><a href="terms.html">Terms, definitions, and symbols</a><br>
-<p><a href="index.html">Back to index of all UPC functions</a>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore
deleted file mode 100644
index 32f2eb8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-pspbrwse.jbf
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif b/tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif
deleted file mode 100644
index daa8733..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/icons/upc.gif
+++ /dev/null
Binary files differ
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties
deleted file mode 100644
index 8f3fddd..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-pluginName=UPC support for PLDT
-pluginProvider=Eclipse.org
-
-view.name=UPC Artifact View
-viewcat.name=PTP UPC Views
-run.label=Run UPC Analysis
-run.tooltip=Run UPC Analysis on selected file, folder, or project to find UPC Artifacts
-
-#need to add more
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml b/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml
deleted file mode 100644
index f6ff444..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/plugin.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   
-   <extension
-         point="org.eclipse.ui.preferencePages">
-         <page
-            class="org.eclipse.ptp.pldt.upc.prefs.UPCPreferencePage"
-            id="org.eclipse.ptp.pldt.upc.prefpage"
-            category="org.eclipse.ptp.pldt.common.prefs.PLDTPreferencePage"
-            name="UPC"/>
-         
-   </extension>
-
-   <!--  UPC markers -->
-   <extension point="org.eclipse.core.resources.markers"
-		id="upcMarker"
-        name="upc Artifact Marker">
-      <super type="org.eclipse.core.resources.textmarker"/>
-   </extension>
-   <!-- this changes the marker image in the editor marker bar  -->
-   <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-            markerType="org.eclipse.ptp.pldt.upc.upcMarker"
-            name="org.eclipse.ptp.pldt.upc.upcMarkerAnnotation">
-      </type>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="org.eclipse.ptp.pldt.upc.upcMarkerAnnotation"
-            icon="icons/upc.gif" 
-            
-            presentationLayer="3"
-            label="upc Annotation Marker"
-            
-            textPreferenceKey="upcIndication"
-            textPreferenceValue="true"
-            highlightPreferenceKey="artifactHighlighting"
-            highlightPreferenceValue="false"
-            colorPreferenceKey="artifactIndicationColor"
-            colorPreferenceValue="128,128,192"
-            verticalRulerPreferenceKey="artifactIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="true"
-			showInNextPrevDropdownToolbarActionKey="showPortingInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="false"
-            overviewRulerPreferenceKey="artifactIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            
-            includeOnPreferencePage="true"
-            isGoToPreviousNavigationTargetKey="isPortingGoToPreviousNavigationTarget"
-
-            isGoToNextNavigationTargetKey="isPortingRecordGoToNextNavigationTarget"
-            >
-      </specification>  
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="%viewcat.name"
-            id="org.eclipse.ptp.pldt.upc">
-      </category>
-      <view
-            name="%view.name"
-            icon="icons/upc.gif"
-            category="org.eclipse.ptp.pldt.upc"
-            class="org.eclipse.ptp.pldt.upc.views.UPCArtifactView"
-            id="org.eclipse.ptp.pldt.upc.views.upcArtifactView">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.ui.CHelpProvider">
-      <provider
-            class="org.eclipse.ptp.pldt.upc.editorHelp.UPCCHelpInfoProvider"
-            id="org.eclipse.ptp.pldt.upc.editorHelp.UPCCHelpInfoProvider"/>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            defaultHandler="org.eclipse.ptp.pldt.upc.actions.RunAnalyseUPCcommandHandler"
-            id="org.eclipse.ptp.pldt.upc.command2"
-            name="find upc artifacts">
-      </command>
-   </extension>
-      <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ptp.pldt.common.toolbar.command1 ">
-         <command
-               commandId="org.eclipse.ptp.pldt.upc.command2"
-               icon="icons/upc.gif"
-               label="Show UPC Artifacts">
-         </command>
-      </menuContribution>
-   </extension>
-</plugin>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java
deleted file mode 100644
index e3df505..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCArtifactMarkingVisitor.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc;
-
-import org.eclipse.ptp.pldt.common.ArtifactMarkingVisitor;
-
-public class UPCArtifactMarkingVisitor extends ArtifactMarkingVisitor
-{
-    public UPCArtifactMarkingVisitor(String markerId)
-    {
-        super(markerId);
-    }
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java
deleted file mode 100644
index 7dc4ee7..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCIDs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc;
-
-/**
- * UPC Plugin constants
- * 
- * @author Beth Tibbitts
- */
-public interface UPCIDs
-{
-    // preference page name for UPC
-    String UPC_INCLUDES    = "UPC Includes";
-    
-    String MARKER_ID       = "org.eclipse.ptp.pldt.upc.upcMarker";
-    String MARKER_ERROR_ID = "org.eclipse.ptp.pldt.upc.upcErrorMarker";
-    
-    // artifact view id
-    String UPC_VIEW_ID = "org.eclipse.ptp.pldt.upc.views.upcArtifactView";
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java
deleted file mode 100644
index 3b67f07..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/UPCPlugin.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class UPCPlugin extends AbstractUIPlugin {
-
-	/** The shared instance. */
-	private static UPCPlugin plugin;
-	public static final String PLUGIN_ID = "org.eclipse.ptp.pldt.upc";
-	
-	/**
-	 * The constructor.
-	 */
-	public UPCPlugin() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static UPCPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.ptp.pldt.upc", path);
-	}
-    
-    /**
-     * Returns the preference setting for UPC include paths
-     * 
-     * @return
-     */
-    public List<String> getUPCIncludeDirs()
-    {
-        String stringList = getPluginPreferences().getString(UPCIDs.UPC_INCLUDES);
-        StringTokenizer st = new StringTokenizer(stringList, File.pathSeparator + "\n\r");//$NON-NLS-1$
-        List<String> dirs = new ArrayList<String>();
-        while (st.hasMoreElements()) {
-            dirs.add(st.nextToken());
-        }
-        return dirs;
-    }
-    
-    public static String getPluginId()
-    {
-        return PLUGIN_ID;
-    }
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java
deleted file mode 100644
index 93c9356..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/actions/RunAnalyseUPCcommandHandler.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.actions;
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.upc.UPCLanguage;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.actions.RunAnalyseHandlerBase;
-import org.eclipse.ptp.pldt.common.util.ViewActivater;
-import org.eclipse.ptp.pldt.upc.UPCArtifactMarkingVisitor;
-import org.eclipse.ptp.pldt.upc.UPCIDs;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-import org.eclipse.ptp.pldt.upc.analysis.UPCCASTVisitor;
-
-/**
- * The "Find UPC Artifacts" action/command
- * @author Beth Tibbitts
- *
- */
-public class RunAnalyseUPCcommandHandler extends RunAnalyseHandlerBase
-{
-	/**
-	 * Constructor for the "Run Analysis" action
-	 */
-	public RunAnalyseUPCcommandHandler() {
-		super("UPC", new UPCArtifactMarkingVisitor(UPCIDs.MARKER_ID), UPCIDs.MARKER_ID); //$NON-NLS-1$
-	}
-
-	/**
-	 * Returns UPC analysis artifacts for file
-	 * 
-	 * @param file
-	 * @param includes
-	 *            UPC include paths
-	 * @return
-	 */
-	@Override
-	public ScanReturn doArtifactAnalysis(final ITranslationUnit tu,	final List<String> includes) {
-		final ScanReturn msr = new ScanReturn();
-		final String fileName = tu.getElementName();
-		ILanguage lang;
-		try {
-			lang = tu.getLanguage();
-            
-			IASTTranslationUnit atu = tu.getAST();
-			if (lang.getId().equals(UPCLanguage.ID)) {// cdt40
-				atu.accept(new UPCCASTVisitor(includes, fileName, msr));
-			} 
-
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return msr;
-	}
-
-	/**
-	 * Determination of whether or not a given filename is valid for UPC artifact analysis
-	 * <br>TODO  Consider using language or content-type instead of file extension?
-	 * Re-visit after https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331 is resolved (UPC  content-type not recognized)
-	 * 
-	 * @param filename
-	 * @param isCPP  is the project a C++ project or not
-	 * @return
-	 * 
-	 */
-	@Override
-	protected boolean validForAnalysis(String filename, boolean isCPP) {
-		int loc = filename.lastIndexOf(".");
-		if (loc <= 0) // if no dot, or filename is ".foo", not valid for
-						// analysis.
-			return false;
-		String ext = filename.substring(loc + 1);
-		ext = ext.toLowerCase();
-		boolean result = true;
-		if (ext.equals("upc")) 
-			result = true;
-		else
-			result = false;
-		return result;
-	}
-	@Override
-	protected List<String> getIncludePath() {
-		return UPCPlugin.getDefault().getUPCIncludeDirs();
-	}
-	@Override
-	protected void activateArtifactView() {
-		ViewActivater.activateView(UPCIDs.UPC_VIEW_ID);
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java
deleted file mode 100644
index 21e72b9..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/analysis/UPCCASTVisitor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.analysis;
-
-
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTFunctionCallExpression;
-import org.eclipse.cdt.core.dom.ast.IASTIdExpression;
-import org.eclipse.cdt.core.dom.ast.IASTLiteralExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.analysis.PldtAstVisitor;
-
-/**
- * This dom-walker collects "artifacts" related to the specific domain <br>
- * (e.g. UPC). Currently these artifacts include function calls
- * and constants. It add markers to the source file for C code, marking the
- * position of the artifacts found.
- * 
- * This version extends PldtAstVisitor instead of delegating to<br>
- * MpiGeneralASTVisitorBehavior.
- *
- * @author tibbitts
- * 
- */
-public class UPCCASTVisitor extends PldtAstVisitor 
-{
-    private static final String PREFIX="upc_";
-
-    {
-        this.shouldVisitExpressions = true;
-        this.shouldVisitStatements = true;
-        this.shouldVisitDeclarations = true;
-        this.shouldVisitTranslationUnit = true;
-    }
-
-    public UPCCASTVisitor(List upcIncludes, String fileName, ScanReturn msr)
-    {
-        super(upcIncludes, fileName, msr);
-		ARTIFACT_CALL = "UPC Call";
-		ARTIFACT_CONSTANT="UPC Constant";
-    }
-
-
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTExpression)
-     */
-    public int visit(IASTExpression expression)
-    {
-        if (expression instanceof IASTFunctionCallExpression) {
-            IASTExpression astExpr = ((IASTFunctionCallExpression) expression).getFunctionNameExpression();
-            String signature = astExpr.getRawSignature();
-            //System.out.println("func signature=" + signature);
-            if (signature.startsWith(PREFIX)) {
-                if (astExpr instanceof IASTIdExpression) {
-                    IASTName funcName = ((IASTIdExpression) astExpr).getName();
-                    processFuncName(funcName, astExpr);
-                }
-            }
-        } else if (expression instanceof IASTLiteralExpression) {
-            processMacroLiteral((IASTLiteralExpression) expression);
-        }
-        return PROCESS_CONTINUE;
-    }
-}
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java
deleted file mode 100644
index cbba937..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpBook.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.editorHelp;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.cdt.ui.IFunctionSummary;
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpBookImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionPrototypeSummaryImpl;
-import org.eclipse.ptp.pldt.common.editorHelp.FunctionSummaryImpl;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-
-/**
- * UPC help book - this is the information that is used for the hover help
- * <p>
- * <b>Note:</b> This (and F1/dynamic help as well) requires a fix to CDT post-5.0.0 release
- * to org.eclipse.cdt.internal.core.model.TranslationUnit  - to recognize content-type of UPC to be a deriviative ("kindOf") the C content type.
- * <p>See https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331  
- * @author Beth Tibbitts
- *
- */
-public class UPCCHelpBook extends CHelpBookImpl {
-	private static final String TITLE = "UPC C Help Book";
-	private Map<String,String> desc=new HashMap<String, String>();
-
-	
-	public UPCCHelpBook() {
-        super(UPCPlugin.getPluginId());
-        // populate description map - this just makes the funcName2FuncInfo init lines a bit more terse
-      
-        desc.put("upc_addrfield", "Returns an implementation-defined value reflecting the <q>local address</q>of the object pointed to by the pointer-to-shared argument.");
-        desc.put("upc_affinitysize", "A convenience function which calculates the exact size of the local portion of the data in a shared object with affinity to <code>threadid</code>.");
-        desc.put("upc_all_alloc", "Allocates shared space");
-        desc.put("upc_all_broadcast", "Copies a block of memory with affinity to a single thread to a block of shared memory on each thread.");
-        desc.put("upc_all_lock_alloc", "Dynamically allocates a lock and returns a pointer to it. The lock is created in an unlocked state.");
-        desc.put("upc_all_exchange", "Copies the ith block of memory from a shared memory area that has affinity to thread j to the jth block of a shared memory area that has affinity to thread i");
-        desc.put("upc_all_gather",     "Copies a block of shared memory that has affinity to the ith thread to the ith block of a shared memory area that has affinity to a single thread.");
-        desc.put("upc_all_gather_all", "Copies a block of memory from one shared memory area with affinity to the ith thread to the ith block of a shared memory area on each thread.");
-        desc.put("upc_all_lock_alloc", "Dynamically allocates a lock and returns a pointer to it. The lock is created in an unlocked state.");
-        desc.put("upc_all_permute", "Copies a block of memory from a shared memory area that has affinity to the ith thread to a block of a shared memory that has affinity to thread perm[i].");
-        desc.put("upc_all_scatter", "Copies the ith block of an area of shared memory with affinity to a single thread to a block of shared memory with affinity to the ith thread.");
-        desc.put("upc_alloc", "Allocates shared space of at least nbytes with affinity to the calling thread.");      
-        desc.put("upc_free", "Frees dynamically allocated shared storage");
-        desc.put("upc_global_alloc","Allocates shared space");
-        desc.put("upc_global_exit","Flushes all I/O, releases all storage, and terminates the execution for all active threads.");
-        desc.put("upc_global_lock_alloc", "Dynamically allocates a lock and returns a pointer to it. The lock is created in an unlocked state.");
-        desc.put("upc_local_alloc","Deprecated. Use upc_alloc instead.\nAllocates shared space.");      
-        desc.put("upc_lock_attempt", "Attempts to set the state of a lock to locked. Return code indicates previous state.");
-        desc.put("upc_lock_free", "Frees all resources associated with a lock.");
-        desc.put("upc_lock_t", "UPC type for a lock");
-        desc.put("upc_lock", "Sets the state of a lock to locked.");
-        desc.put("upc_memcpy", "Copies n characters from a shared object having affinity with one thread to a shared object having affinity with the same or another thread.");
-        desc.put("upc_memget", "Copies n characters from a shared object with affinity to any single thread to an object on the calling thread.");
-        desc.put("upc_memset", "Copies a value, converted to an unsigned char, to a shared object with affinity to any single thread.");
-        desc.put("upc_phaseof", "Returns the phase component of the pointer-to-shared argument.");
-        desc.put("upc_resetphase", "Returns a pointer-to-shared which is identical to its input except that it has zero phase");
-        desc.put("upc_threadof", "Returns the index of the thread that has affinity to the shared object pointed to by the argument.");
-        desc.put("upc_unlock", "Sets the state of a lock to unlocked."); 
-        desc.put("shared", "this is a shared UPC keyword");
-        
-        
-		// populate func map
-        //funcName2FuncInfo.put("upc_free", new FunctionSummaryImpl("upc_free", "", "upc_free test description",
-        //        new FunctionPrototypeSummaryImpl("upc_free", "void", "shared void *ptr"), null));
-        String desc = ""; // will do map lookup for description in fps method.
-        funcName2FuncInfo.put("upc_addrfield", fps("upc_addrfield", "", desc, "size_t", "shared void *ptr"));
-        funcName2FuncInfo.put("upc_affinitysize", fps("upc_affinitysize", "", desc, "size_t", "size_t totalsize, size_t nbytes, size_t threadid"));
-        funcName2FuncInfo.put("upc_all_alloc", fps("upc_all_alloc", "", desc, "void", "size_t nblocks, size_t nbytes"));
-        funcName2FuncInfo.put("upc_all_broadcast", fps("upc_all_broadcast", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));
-        funcName2FuncInfo.put("upc_all_exchange", fps("upc_all_exchange", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));
-        funcName2FuncInfo.put("upc_all_gather_all", fps("upc_all_gather_all", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));
-        funcName2FuncInfo.put("upc_all_gather", fps("upc_all_gather", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));      		
-        funcName2FuncInfo.put("upc_all_lock_alloc", fps("upc_all_lock_alloc", "", desc, "upc_lock_t", "void"));
-        funcName2FuncInfo.put("upc_all_permute", fps("upc_all_permute", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, shared const int * restrict perm, size_t nbytes, upc_flag_t flags"));
-        funcName2FuncInfo.put("upc_all_scatter", fps("upc_all_scatter", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t nbytes, upc_flag_t flags"));
-        funcName2FuncInfo.put("upc_alloc", fps("upc_alloc", "", desc, "void", "size_t nbytes"));      
-        funcName2FuncInfo.put("upc_free", fps("upc_free", "", desc, "void", "shared void *ptr"));
-        funcName2FuncInfo.put("upc_global_alloc", fps("upc_global_alloc", "", desc, "void", "int status"));
-        funcName2FuncInfo.put("upc_global_exit", fps("upc_global_exit", "", desc, "void", "int status"));
-        funcName2FuncInfo.put("upc_global_lock_alloc", fps("upc_global_lock_alloc", "", desc, "upc_lock_t", "void"));
-        funcName2FuncInfo.put("upc_local_alloc", fps("upc_local_alloc", "", desc, "void", "size_t nblocks, size_t nbytes"));    
-        funcName2FuncInfo.put("upc_lock_attempt", fps("upc_lock_attempt", "", desc, "int", "upc_lock_t *ptr"));
-        funcName2FuncInfo.put("upc_lock_free", fps("upc_lock_free", "", desc, "upc_lock_t", "void"));
-        funcName2FuncInfo.put("upc_lock", fps("upc_lock", "", desc, "void", "upc_lock_t *ptr"));
-        funcName2FuncInfo.put("upc_memcpy", fps("upc_memcpy", "", desc, "void", "shared void * restrict dst, shared const void * restrict src, size_t n"));      
-        funcName2FuncInfo.put("upc_memget", fps("upc_memget", "", desc, "void", "void * restrict dst, shared const void * restrict src, size_t n"));
-        funcName2FuncInfo.put("upc_memset", fps("upc_memset", "", desc, "void", "shared void *dst, int c, size_t n"));
-        funcName2FuncInfo.put("upc_phaseof", fps("upc_memset", "", desc, "size_t", "shared void *ptr"));     
-        funcName2FuncInfo.put("upc_resetphase", fps("upc_resetphase", "", desc, "void", "shared void *ptr"));
-        funcName2FuncInfo.put("upc_threadof", fps("upc_threadof", "", desc, "size_t", "shared void *ptr"));
-        funcName2FuncInfo.put("upc_unlock", fps("upc_unlock", "", desc, "void", "upc_lock_t *ptr"));
-        funcName2FuncInfo.put("shared", fps("shared", "", desc, "", ""));
-        
-        // set title
-        setTitle(TITLE);
-	}
-	
-	/**
-	 * Convenience function for inputting these FunctionPrototypeSummary and FunctionSummary arguments.
-	 * @param name
-	 * @param namespace
-	 * @param description if empty will do lookup in Map
-	 * @param returnType
-	 * @param args
-	 * @return
-	 */
-	protected IFunctionSummary fps(String name, String namespace, String description, String returnType, String args){
-		if(description==null || description.length()==0) {
-			description=getDesc(name);
-		}
-		IFunctionSummary fps = new FunctionSummaryImpl(name, namespace, description,
-                new FunctionPrototypeSummaryImpl(name, returnType, args), null);
-		return fps;
-	}
-	protected String getDesc(String key) {
-		String description = (String)desc.get(key);
-		if(description==null)
-			description=key+" description";
-		return description;
-	}
-	
-	/**
-	 * Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331
-	 * ("CHelpProvider not called for UPC")
-	 * so that UPC help will get called.
-	 * CDT bug fix required for this to work otherwise.
-	 * For example, in TranslationUnit to make the UPC type 'inherit' from the C type.
-	 * <p>
-	 * This returns an invalid number as a workaround.
-	 * This will cause the default part of the switch in CHelpBookDescriptor.matches()
-	 * to execute and the UPC help will
-	 * match for all files. Not pretty but it will work for now.
-	 * @see org.eclipse.cdt.internal.core.model.TranslationUnit
-	 * 
-	 */
-	@SuppressWarnings("restriction")// just for the javadoc comment to not get warning :)
-	@Override
-	public int getCHelpType() {
-		return -1;
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java
deleted file mode 100644
index 3268b36..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/editorHelp/UPCCHelpInfoProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.editorHelp;
-
-import org.eclipse.ptp.pldt.common.editorHelp.CHelpProviderImpl;
-
-/**
- * 
- * This class implements ICHelpProvider and provides UPC information <br>
- * (F1, hover, content assist, etc.)
-  * <p>
- * <b>Note:</b> This  requires a fix to CDT post-5.0.0 release
- * to org.eclipse.cdt.internal.core.model.TranslationUnit  - to recognize content-type of UPC to be a deriviative ("kindOf") the C content type.
- * <p>See https://bugs.eclipse.org/bugs/show_bug.cgi?id=237331  
- * <p>Further note: a workaround has been applied in UCCCHelpBook to not require the CDT patch
- * 
- * 
- * @author Beth Tibbitts
- *
- */
-public class UPCCHelpInfoProvider extends CHelpProviderImpl {
-
-	public UPCCHelpInfoProvider() {
-		//System.out.println("UPCCHelpInfoProvider ctor()...");//debug only , to see when called
-	}
-
-	public void initialize() {
-		helpBook = new UPCCHelpBook();
-		//System.out.println("UPCCHelpInfoProvider initialize()...");
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java
deleted file mode 100644
index e1d49b8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/prefs/UPCPreferencePage.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.prefs;
-
-
-
-import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PathEditor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.pldt.upc.UPCIDs;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-/**
- * Preference page based on FieldEditorPreferencePage
- * 
- * @author xue
- */
-
-public class UPCPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage
-{
-    private static final String INCLUDES_PREFERENCE_LABEL  = "UPC include paths:";
-    private static final String INCLUDES_PREFERENCE_BROWSE = "Please choose a directory:";
-    private static final String UPC_HELP="Location of UPC help files:";
-    private static final String UPC_HELP_DEFAULT="Use default";
-    private static final String UPC_HELP_DEFAULT_ID="upcHelpUseDefault";
-    //private static final String UPC_HELP_LINUX="Use Linux location: ";
-    //private static final String UPC_HELP_AIX="Use AIX location: ";
-    //private static final String UPC_HELP_OTHER="Other:";
-    //private static final String UPC_HELP_OTHER_ID="upcHelpOther";
-    
-    //private static final String UPC_LOCATION_AIX="/opt/rsct/lapi/eclipse/help";
-    //private static final String UPC_LOCATION_LINUX="opt/ibmhpc/lapi/eclipse/help";
-    
-    private static final String UPC_WHICH_HELP_ID="default";  // alternatives are: default, aix, linux, other
-
-    public UPCPreferencePage()
-    {
-        super(FLAT);
-        initPreferenceStore();
-    }
-
-    public UPCPreferencePage(int style)
-    {
-        super(style);
-        initPreferenceStore();
-    }
-
-    public UPCPreferencePage(String title, ImageDescriptor image, int style)
-    {
-        super(title, image, style);
-        initPreferenceStore();
-    }
-
-    public UPCPreferencePage(String title, int style)
-    {
-        super(title, style);
-        initPreferenceStore();
-    }
-
-    /**
-     * Init preference store and set the preference store for the preference page
-     */
-    private void initPreferenceStore()
-    {
-        IPreferenceStore store = UPCPlugin.getDefault().getPreferenceStore();
-        setPreferenceStore(store);
-    }
-
-    public void init(IWorkbench workbench)
-    {
-    }
-
-    protected void createFieldEditors()
-    {
-        PathEditor pathEditor = new PathEditor(UPCIDs.UPC_INCLUDES, INCLUDES_PREFERENCE_LABEL,
-                INCLUDES_PREFERENCE_BROWSE, getFieldEditorParent());
-        addField(pathEditor);
-
-        //"Use default?"
-//        BooleanFieldEditor bed = new BooleanFieldEditor(UPC_HELP_DEFAULT_ID,UPC_HELP_DEFAULT,getFieldEditorParent());
-//        addField(bed);
-  /*      
-        int numCol=1;
-    	RadioGroupFieldEditor choiceFE = new RadioGroupFieldEditor(UPC_WHICH_HELP_ID, UPC_HELP, numCol, new String[][] {
-				{ UPC_HELP_DEFAULT, "choice1" }, 
-				{ UPC_HELP_AIX+UPC_LOCATION_AIX, "choice2" }, 
-				{ UPC_HELP_LINUX+UPC_LOCATION_LINUX, "Choice3" },
-				{ UPC_HELP_OTHER, "Choice4" }},
-				getFieldEditorParent());
-    	addField(choiceFE);
-    	
-    	StringFieldEditor otherLoc=new StringFieldEditor(UPC_HELP_OTHER_ID, UPC_HELP_OTHER,getFieldEditorParent());
-    	addField(otherLoc);
-    	*/
-    	
-    }
-    
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java b/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java
deleted file mode 100644
index cd728d5..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/src/org/eclipse/ptp/pldt/upc/views/UPCArtifactView.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.pldt.upc.views;
-
-import org.eclipse.ptp.pldt.common.views.SimpleTableMarkerView;
-import org.eclipse.ptp.pldt.upc.UPCIDs;
-import org.eclipse.ptp.pldt.upc.UPCPlugin;
-
-
-
-/**
- * A UPC artifact view based on SimpleTableView <br>
- * Note that the ID must be unique.
- * 
- */
-public class UPCArtifactView extends SimpleTableMarkerView
-{
-    public UPCArtifactView()
-    {
-        // if you need to read icon images, etc. from the plug-in, be sure to pass
-        // in an actual Plugin class instance for first arg
-        super(UPCPlugin.getDefault(), "UPC Artifact", "UPC Artifacts", "Construct", UPCIDs.MARKER_ID);
-    }
-}
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.classpath b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.project b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.project
deleted file mode 100644
index 5b6f673..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.sampleCDTstaticAnalysis</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/META-INF/MANIFEST.MF b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/META-INF/MANIFEST.MF
deleted file mode 100644
index 2984ab7..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Sample CDT Static Analysis
-Bundle-SymbolicName: org.eclipse.ptp.pldt.sampleCDTstaticAnalysis;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.core,
- org.eclipse.core.resources,
- org.eclipse.ptp.pldt.common,
- org.eclipse.ptp.pldt.mpi.analysis,
- org.eclipse.ptp.pldt.mpi.analysis.cdt
-Eclipse-LazyStart: true
-Bundle-Vendor: IBM Research
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/build.properties b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/build.properties
deleted file mode 100644
index 0d3d3a7..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/calls.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/calls.gif
deleted file mode 100644
index 695e5a5..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/calls.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsC.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsC.gif
deleted file mode 100644
index 469fa25..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsC.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsCF.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsCF.gif
deleted file mode 100644
index 4433b19..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsCF.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/class_hi.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/class_hi.gif
deleted file mode 100644
index 17f927e..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/class_hi.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphC.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphC.gif
deleted file mode 100644
index 905c338..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphC.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphW.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphW.gif
deleted file mode 100644
index 23b294b..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphW.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/sample.gif b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/sample.gif
+++ /dev/null
Binary files differ
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/plugin.xml b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/plugin.xml
deleted file mode 100644
index 6ba6e75..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/plugin.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            name="Sample Category"
-            id="cdtAST2.commands.category">
-      </category>
-      <command
-            name="CallGraph Command"
-            categoryId="cdtAST2.commands.category"
-            id="cdtAST2.commands.cgCommand">
-      </command>
-       <command
-            name="CFG Command"
-            categoryId="cdtAST2.commands.category"
-            id="cdtAST2.commands.cfgCommand">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            commandId="cdtAST2.commands.cgCommand"
-            class="org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.handlers.BuildCallGraphHandler">
-      </handler>
-      <handler
-            commandId="cdtAST2.commands.cfgCommand"
-            class="org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.handlers.BuildCFGraphHandler">
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.ui.bindings">
-      <key
-            commandId="cdtAST2.commands.cgCommand"
-            contextId="org.eclipse.ui.contexts.window"
-            sequence="M1+6"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu?after=additions">
-         <menu
-               label="Sample Menu"
-               mnemonic="M"
-               id="cdtAST2.menus.sampleMenu">
-            <command
-                  commandId="cdtAST2.commands.cgCommand"
-                  icon="icons/graphW.gif"
-                  id="cdtAST2.menus.cgCommand"
-                  label="Walk AST tree"
-                  mnemonic="S"
-                  tooltip="Walk AST Tree tooltip">
-            </command>
-         </menu>
-      </menuContribution>
-      <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-         <toolbar
-               id="cdtAST2.toolbars.sampleToolbar">
-            <command
-                  commandId="cdtAST2.commands.cgCommand"
-                  icon="icons/callsC.gif"
-                  id="cdtAST2.toolbars.buildCallGraphCommand"
-                  label="Build Call Graph"
-                  tooltip="Build Call Graph">
-            </command>
-             <command
-                  commandId="cdtAST2.commands.cfgCommand"
-                  icon="icons/callsCF.gif"
-                  id="cdtAST2.toolbars.buildCallGraphCommand"
-                  label="Build CFGraph"
-                  tooltip="Build Control Flow Graph">
-            </command>
-         </toolbar>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="Sample Action Set"
-            visible="true"
-            id="cdtAST2.actionSet">
-         <action
-               label="Walk AST"
-               icon="icons/graphW.gif"
-               class="org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.actions.ASTWalkerAction"
-               tooltip="Walk AST tooltip"
-               menubarPath="sampleMenu/sampleGroup"
-               toolbarPath="sampleGroup"
-               id="cdtast2.actions.SampleAction">
-         </action>
-      </actionSet>
-   </extension>
-
-</plugin>
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/Hello.c b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/Hello.c
deleted file mode 100644
index efe282b..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/Hello.c
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-#include <stdio.h>
-#define MYVAR 42
-
-int graphtest(void) {
-	int a,b;
-	int pi=3.14;
-	a=0;
-	b=MYVAR; // use defined
-	b = b + a;
-	a=3.14;
-	return b;
-}
-
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/graph.c b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/graph.c
deleted file mode 100644
index d6fc2c5..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/graph.c
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "mpi.h"
-#include "stdio.h"
- 
-void foo(int x);
-void gee(int x);
-void kei(int x);
-
-void foo(int x){
-  x ++;
-  gee(x);
-}
-
-void gee(int x){
-  x *= 3;
-  kei(x);
-}
-
-void kei(int x){
-  x = x % 10;
-  foo(x);
-}
-
-void a(int x){
-  x --;
-}
-
-int main3(int argc, char* argv[]){
-  int x = 0;
-  foo(x);
-  a(x);
-}
\ No newline at end of file
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast.c b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast.c
deleted file mode 100644
index 26deb89..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast.c
+++ /dev/null
@@ -1,15 +0,0 @@
-// p16
-#include <stdio.h>
-#define MYVAR 42
-
-int main(void) {
-	int a,b;
-	a=0;
-	b=MYVAR; // use defined
-	b = b + a;
-	return b;
-}
-int foo(int bar){
-  int z = bar;
-  return z;
-}
\ No newline at end of file
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast_edge.c b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast_edge.c
deleted file mode 100644
index 12a81b9..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast_edge.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <stdio.h>
-
-void edge(int a) {
-	int x,y;
-	if(a>0)
-		x=0;
-	else 
-		x=1;
-	y=x;
-}
-int foo(int bar){
-  int z = bar;
-  return z;
-}
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast_edge_comments.c b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast_edge_comments.c
deleted file mode 100644
index a1700eb..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast_edge_comments.c
+++ /dev/null
@@ -1,16 +0,0 @@
-//#include <stdio.h>
-/** function that shows a short edge in a CFG */
-void edge(int a) {
-	int x,y;
-	if(a>0)
-		x=0;  // the then case
-	else 
-		x=1;  // the else case
-	// use resultant value of x
-	/* partLine comment */ y=x; 
-}
-/** the ever-present foo function */
-int foo(int bar){
-  int z = bar;
-  return z;
-}
\ No newline at end of file
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/Activator.java b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/Activator.java
deleted file mode 100644
index 5b260ca..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/Activator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.ptp.pldt.sampleCDTstaticAnalysis;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "cdtAST2";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-}
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/actions/ASTWalkerAction.java b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/actions/ASTWalkerAction.java
deleted file mode 100644
index 56323bc..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/actions/ASTWalkerAction.java
+++ /dev/null
@@ -1,402 +0,0 @@
-package org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.cdt.core.dom.ast.ASTVisitor;
-import org.eclipse.cdt.core.dom.ast.IASTBinaryExpression;
-import org.eclipse.cdt.core.dom.ast.IASTComment;
-import org.eclipse.cdt.core.dom.ast.IASTCompoundStatement;
-import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
-import org.eclipse.cdt.core.dom.ast.IASTExpression;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorIncludeStatement;
-import org.eclipse.cdt.core.dom.ast.IASTPreprocessorStatement;
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.dom.ast.IType;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit.IDependencyTree;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit.IDependencyTree.IASTInclusionNode;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.core.model.ICElementVisitor;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.cdt.internal.core.dom.parser.c.CASTExpressionStatement;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * This was initially built from the "Sample Action" plugin example.
- * 
- * This sample action walks an AST tree for a selected C source file.
- * Select a C source file in the Projects view and click the icon in the toolbar
- * to print AST walking information.
- * 
- * @see IWorkbenchWindowActionDelegate
- * 
- * @author Beth Tibbitts tibbitts@us.ibm.com
- */
-public class ASTWalkerAction implements IWorkbenchWindowActionDelegate {
-	private IWorkbenchWindow window;
-	private IStructuredSelection selection;
-
-	/**
-	 * The constructor.
-	 */
-	public ASTWalkerAction() {
-	}
-
-	/**
-	 * The action has been activated. The argument of the method represents the
-	 * 'real' action sitting in the workbench UI.
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#run
-	 */
-	public void run(IAction action) {
-		MessageDialog.openInformation(window.getShell(), "CdtAST2 Plug-in",
-				"See Console for AST walking results");
-		try {
-			runSelectionExample(selection);
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Selection in the workbench has been changed. We can change the state of
-	 * the 'real' action here if we want, but this can only happen after the
-	 * delegate has been created.
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#selectionChanged
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			this.selection = (IStructuredSelection) selection;
-		}
-
-	}
-
-	public void runSelection(ISelection selection) {
-		System.out.println("selection=" + selection);
-		if (selection instanceof ITranslationUnit) {
-			System.out.println("   ITranslationUnit");
-		}
-		if (selection instanceof ICElement) {
-			System.out.println("ICElement");
-			walkICElement((ICElement) selection);
-
-		}
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection) selection;
-			// System.out.println(" IStructuredSelection, contents:");
-
-			for (Iterator iter = ss.iterator(); iter.hasNext();) {
-				Object obj = (Object) iter.next();
-				// It can be a Project, Folder, File, etc...
-				if (obj instanceof IAdaptable) {
-					IAdaptable iad = (IAdaptable) obj;
-					final IResource res = (IResource) iad
-							.getAdapter(IResource.class);
-					System.out.println("     got resource: " + res);
-
-					// ICElement covers folders and translationunits
-					final ICElement ce = (ICElement) iad
-							.getAdapter(ICElement.class);// cdt40
-					System.out.println("     got ICElement: " + ce);
-
-					ITranslationUnit tu = (ITranslationUnit) iad
-							.getAdapter(ITranslationUnit.class);
-					System.out.println("     got ITranslationUnit: " + tu);
-					try {
-						listFlatInfo(tu);
-						walkITU(tu);
-					} catch (CoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-			}// end for
-		}
-	}
-
-	public void runSelectionExample(ISelection selection) throws CoreException {
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection ss = (IStructuredSelection) selection;
-			for (Iterator iter = ss.iterator(); iter.hasNext();) {
-				Object obj = (Object) iter.next();
-				// It can be a Project, Folder, File, etc...
-				if (obj instanceof IAdaptable) {
-					IAdaptable iad = (IAdaptable) obj;
-					final IResource res = (IResource) iad
-							.getAdapter(IResource.class);
-					System.out.println("     got resource: " + res);
-
-					// ICElement covers folders and translation units
-					final ICElement ce = (ICElement) iad
-							.getAdapter(ICElement.class);// cdt40
-					System.out.println("     got ICElement: " + ce);
-
-					ITranslationUnit tu = (ITranslationUnit) iad
-							.getAdapter(ITranslationUnit.class);
-					System.out.println("     got ITranslationUnit: " + tu);
-					System.out.println("\n==========listFlatInfo():");
-					listFlatInfo(tu);
-					System.out.println("\n==========walkITU():");
-					walkITU(tu);
-					System.out.println("\n==========walkITU_AST():");
-					walkITU_AST(tu);
-
-				}
-			}
-		}
-	}
-
-	/**
-	 * We can use this method to dispose of any system resources we previously
-	 * allocated.
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#dispose
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * We will cache window object in order to be able to provide parent shell
-	 * for the message dialog.
-	 * 
-	 * @see IWorkbenchWindowActionDelegate#init
-	 */
-	public void init(IWorkbenchWindow window) {
-		this.window = window;
-	}
-
-	public void walkICElement(ICElement ice) {
-		// ICElement ice = (ICElement)selection;
-		String eName = ice.getElementName();
-		System.out.println("ICElement name: " + eName);
-
-	}
-
-	/**
-	 * Walk the ITranslationUnit with a visitor, which (only) visits ICElements
-	 * 
-	 * @param tu
-	 * @throws CoreException
-	 */
-	private void walkITU(ITranslationUnit tu) throws CoreException {
-		String tuName = tu.getElementName();
-		System.out.println("ITranslationUnit name: " + tuName);
-		tu.accept(new ICElementVisitor() {
-			public boolean visit(ICElement element) throws CoreException {
-				boolean visitChildren = true;
-				System.out.println("Visiting: " + element.getElementName());
-				return visitChildren;
-			}
-		});
-		System.out.println("AST visitor for " + tuName);
-		IASTTranslationUnit ast = tu.getAST();
-		ast.accept(new MyASTVisitor());
-	}
-
-	/**
-	 * Walk the IASTTranslationUnit's AST tree, which can visit many types of
-	 * nodes
-	 * 
-	 * @param tu
-	 * @throws CoreException
-	 */
-	private void walkITU_AST(ITranslationUnit tu) throws CoreException {
-		System.out.println("AST visitor for " + tu.getElementName());
-		IASTTranslationUnit ast = tu.getAST();
-		System.out
-				.println("\n=================MyASTVisitor2 also implements leave() \n");
-		ast.accept(new MyASTVisitor2());
-	}
-
-	class MyASTVisitor extends ASTVisitor {
-
-		MyASTVisitor() {
-			this.shouldVisitStatements = true; // lots more
-			this.shouldVisitDeclarations = true;
-		}
-
-		public int visit(IASTStatement stmt) { // lots more
-			String sig = stmt.getRawSignature();
-			if (sig.length() > 0)
-				System.out.println("Visiting stmt: " + stmt.getRawSignature());
-			else if (stmt instanceof IASTCompoundStatement) {
-				IASTCompoundStatement cstmt = (IASTCompoundStatement) stmt;
-				IASTStatement[] stmts = cstmt.getStatements();
-				System.out.println("Visiting compound stmt with stmts: "
-						+ stmts.length);
-				for (IASTStatement st : stmts) {
-					String rawSig = st.getRawSignature();
-
-					if (rawSig.length() == 0) {
-						System.out.println("   ->" + st);
-						if (st instanceof CASTExpressionStatement) {
-							CASTExpressionStatement es = (CASTExpressionStatement) st;
-							IASTExpression exp = es.getExpression();
-							if (exp instanceof IASTBinaryExpression) {
-								IASTBinaryExpression bexp = (IASTBinaryExpression) exp;
-
-								System.out.println("    binary exp: "
-										+ bexp.getOperand1() + " "
-										+ bexp.getOperator() + " "
-										+ bexp.getOperand2());
-							}
-							String expStr = exp.getRawSignature();
-							IType type = exp.getExpressionType();
-						}
-					} else {
-						System.out.println("   ->" + rawSig);
-					}
-				}
-			}
-			return PROCESS_CONTINUE;
-		}
-
-		public int visit(IASTDeclaration decl) {
-			System.out.println("Visiting decl: " + decl.getRawSignature());
-			return PROCESS_CONTINUE;
-		}
-
-	}
-
-
-	/** Visitor that uses leave() to show nesting */
-	class MyASTVisitor2 extends ASTVisitor {
-
-		MyASTVisitor2() {
-			this.shouldVisitStatements = true;
-			this.shouldVisitDeclarations = true;
-			this.shouldVisitNames = true;
-		}
-
-		/**
-		 * Print statement info: if altered by preprocessor, then
-		 * getRawSignature() is empty; use alternate representation
-		 */
-		public int visit(IASTStatement stmt) {
-			String sig = stmt.getRawSignature();
-			if (sig.length() > 0)
-				System.out.println("Visiting stmt: " + stmt.getRawSignature());
-			else
-				System.out.println("Visiting stmt: " + stmt.toString());
-			return PROCESS_CONTINUE;
-		}
-
-		public int visit(IASTDeclaration decl) {
-			System.out.println("Visiting decl: " + decl.getRawSignature());
-			return PROCESS_CONTINUE;
-		}
-
-		public int visit(IASTName name) {
-			String prtName = name.toString();
-			if (prtName.length() == 0)
-				prtName = name.getRawSignature(); // use pre pre-processor
-			// value
-			System.out.println("Visiting name: " + prtName);
-			return PROCESS_CONTINUE;
-		}
-
-		public int leave(IASTStatement stmt) {
-			System.out.println(" Leaving stmt: " + stmt.getRawSignature());
-			return PROCESS_CONTINUE;
-		}
-
-		public int leave(IASTDeclaration decl) {
-			System.out.println(" Leaving decl: " + decl.getRawSignature());
-			return PROCESS_CONTINUE;
-		}
-
-		public int leave(IASTName name) {
-			System.out.println(" Leaving name: " + name);// possibly empty
-			return PROCESS_CONTINUE;
-		}
-	}
-
-	/**
-	 * List "flat info" type queries that return lists of things on the ast
-	 * 
-	 * @param tu
-	 * @throws CoreException
-	 */
-	void listFlatInfo(ITranslationUnit tu) throws CoreException {
-		IASTTranslationUnit ast = tu.getAST();
-
-		System.out.println("AST for: " + ast.getContainingFilename());
-
-		IASTPreprocessorStatement[] ppss = ast.getAllPreprocessorStatements();
-		System.out.println("PreprocessorStmts: (omit /usr/...)");
-		for (int i = 0; i < ppss.length; i++) {
-			IASTPreprocessorStatement pps = ppss[i];
-			String fn = pps.getContainingFilename();
-			if (!fn.startsWith("/usr")) {
-				System.out.println(i + "  PreprocessorStmt: " + lastpart(fn)
-						+ " " + pps.getRawSignature());
-			}
-		}
-		IASTDeclaration[] decls = ast.getDeclarations();
-		System.out.println("Declarations: (omit /usr/...)");
-		for (int i = 0; i < decls.length; i++) {
-			IASTDeclaration decl = decls[i];
-			String fn = decl.getContainingFilename();
-			if (!fn.startsWith("/usr")) {
-				System.out.println(i + "  Declaration: " + lastpart(fn) + " "
-						+ decl.getRawSignature());
-			}
-		}
-		IASTPreprocessorStatement[] idirs = ast.getIncludeDirectives();
-		// recurses thru includes included by other includes...
-		System.out.println("Include directives: ");
-		for (int i = 0; i < idirs.length; i++) {
-			IASTPreprocessorStatement idir = idirs[i];
-			System.out.println(i + " include directive: " + idir);
-
-		}
-
-		IDependencyTree dt = ast.getDependencyTree();
-		IASTInclusionNode[] ins = dt.getInclusions();
-		// this lists only the includes immediately included by this src file
-		System.out.println("Dependency tree/Include statements:");
-		for (int i = 0; i < ins.length; i++) {
-			IASTInclusionNode in = ins[i];
-			IASTPreprocessorIncludeStatement is = in.getIncludeDirective();
-			System.out.println(i + "  include stmt: " + is);
-		}
-		// note: comments are not available as AST Nodes but are available here.
-		// (In spite of the existence of IASTComment class and visit(IASTComment) method.)
-		// These are deprecated in CDT 5.0
-		ast = tu.getAST(null,ITranslationUnit.AST_CREATE_COMMENT_NODES);
-		IASTComment[] cmts = ast.getComments();
-		System.out.println("Comments found: "+cmts.length);
-		for (int i = 0; i < cmts.length; i++) {
-			IASTComment comment = cmts[i];
-			char[] cmtChar=comment.getComment();
-			String cmtStr=String.valueOf(cmtChar);
-			
-			System.out.println(i + " Comment: [" + cmtStr + "] rawSig: ["+comment.getRawSignature()+"] line "
-					+ comment.getFileLocation());
-
-		}
-
-	}
-
-	/**
-	 * Return last part of string pathname: e.g. a/b/c/foo.c returns foo.c
-	 * 
-	 * @param pathname
-	 * @return
-	 */
-	String lastpart(String pathname) {
-		int loc = pathname.lastIndexOf('/');
-		return pathname.substring(loc + 1);
-	}
-}
\ No newline at end of file
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCFGraphHandler.java b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCFGraphHandler.java
deleted file mode 100644
index 624ad8e..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCFGraphHandler.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.handlers;
-
-import java.util.Iterator;
-
-import org.eclipse.cdt.core.dom.ast.IASTStatement;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.GraphCreator;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IBlock;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraphNode;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.IControlFlowGraph;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.impl.ControlFlowGraph;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * Build Control Flow Graph
- * 
- * @author Beth Tibbitts  tibbitts@us.ibm.com
- *  
- * @see org.eclipse.core.commands.IHandler
- * @see org.eclipse.core.commands.AbstractHandler
- * @see org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.GraphCreator
- */
-public class BuildCFGraphHandler extends AbstractHandler implements
-		ISelectionListener {
-	private IStructuredSelection selection;
-	protected ICallGraph callGraph;
-	protected GraphCreator graphCreator;
-	protected IWorkbenchWindow window;
-
-	/**
-	 * The constructor.
-	 */
-	public BuildCFGraphHandler() {
-		graphCreator = new GraphCreator();
-
-	}
-
-	/**
-	 * Execute the command: extract extract the needed information from the
-	 * application context. <br>
-	 * A new call graph is constructed for the selected resources.
-	 * 
-	 * @param event
-	 * @return the result of the execution. Reserved for future use by IHandler
-	 *         interface, must be <code>null</code>.
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
-		System.out.println("BuildCFGraphHandler.execute()");
-		// create an empty call graph to begin with
-		callGraph = graphCreator.initCallGraph();
-		// Get the current selection
-		if (selection == null) {
-			ISelection sel = HandlerUtil.getCurrentSelection(event);
-			if (sel instanceof IStructuredSelection) {
-				selection = (IStructuredSelection) sel;
-			}
-			if (selection == null) {
-				message("No selection detected. Please select a file, folder, or project in the Projects View.");
-				selection=null;
-				return null;
-			}
-		}
-
-		// We iterate here only to handle the possibility of multiple-selection.
-		// graphCreator will descend into child nodes.
-		/*final*/ IResource res=null;
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = (Object) iter.next();
-			// It can be a Project, Folder, File, etc...
-			if (obj instanceof IAdaptable) {
-				IAdaptable iad = (IAdaptable) obj;
-				res = (IResource) iad.getAdapter(IResource.class);
-				// Note: put this in a Job or WorkspaceModifyOperation if resources
-				// will be changed.
-				if (res != null) {
-					callGraph = graphCreator.initCallGraph(res);
-				} else {
-					message("Please select a file, folder, or project in the Projects view");
-					selection=null;
-					return null;
-				}
-			}
-		}
-
-		graphCreator.computeCallGraph(callGraph);
-		// get the first node
-		ICallGraphNode topNode = callGraph.topEntry();
-		String topName=topNode.getFuncName();
-		
-		ICallGraphNode firstNode=callGraph.getAllNodes().get(0);
-		String firstName=firstNode.getFuncName();
-		// get a node by function name
-		ICallGraphNode namedNode = callGraph.getNode(res.getName(), "foo");
-		String namedName="";
-		if(namedNode!=null) {
-			namedName=namedNode.getFuncName();
-		}
-		
-		ICallGraphNode node = topNode;
-		IASTStatement funcBody=node.getFuncDef().getBody();
-		IControlFlowGraph cfg = new ControlFlowGraph(funcBody);
-		cfg.buildCFG();
-		
-		IBlock entryBlock = cfg.getEntry();
-		for (IBlock block= cfg.getEntry(); block!=null; block = block.getTopNext()) {
-			block.print();
-		}
-		return null;
-	}
-
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			this.selection = (IStructuredSelection) selection;
-			System.out.println("BuildCallGraphHandler got selection");
-		}
-
-	}
-
-	public void message(String msg) {
-		MessageDialog.openInformation(window.getShell(),
-				"Houston, we have a problem", msg);
-	}
-}
diff --git a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCallGraphHandler.java b/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCallGraphHandler.java
deleted file mode 100644
index d5c6861..0000000
--- a/tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCallGraphHandler.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.ptp.pldt.sampleCDTstaticAnalysis.handlers;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.GraphCreator;
-import org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.ICallGraph;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * This handler extends AbstractHandler, an IHandler base class. This handler
- * builds a call graph for the selected resource(s) in the Project Explorer view. <br>
- * 
- * Two steps to building call graph: <br>
- * 1. collect all function definitions in the call graph <br>
- * 2. construct the caller and callee relationship among the CallGraphNodes
- * <br>Most of the work is done by GraphCreator
- * 
- * @author Beth Tibbitts tibbitts@us.ibm.com
- * 
- * @see org.eclipse.core.commands.IHandler
- * @see org.eclipse.core.commands.AbstractHandler
- * @see org.eclipse.ptp.pldt.mpi.analysis.cdt.graphs.GraphCreator
- */
-public class BuildCallGraphHandler extends AbstractHandler implements
-		ISelectionListener {
-	private IStructuredSelection selection;
-	protected ICallGraph callGraph;
-	protected GraphCreator graphCreator;
-	protected IWorkbenchWindow window;
-
-	/**
-	 * The constructor.
-	 */
-	public BuildCallGraphHandler() {
-		graphCreator = new GraphCreator();
-
-	}
-
-	/**
-	 * Execute the command: extract extract the needed information from the
-	 * application context. <br>
-	 * A new call graph is constructed for the selected resources.
-	 * 
-	 * @param event
-	 * @return the result of the execution. Reserved for future use by IHandler
-	 *         interface, must be <code>null</code>.
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		window = HandlerUtil.getActiveWorkbenchWindowChecked(event);
-		System.out.println("BuildCallGraphHandler.execute()");
-		// create an empty call graph to begin with
-		callGraph = graphCreator.initCallGraph();
-		// Get the current selection
-		if (selection == null) {
-			ISelection sel = HandlerUtil.getCurrentSelection(event);
-			if (sel instanceof IStructuredSelection) {
-				selection = (IStructuredSelection) sel;
-			}
-			if (selection == null) {
-				message("No selection detected. Please select a file, folder, or project in the Projects View.");
-				selection=null;
-				return null;
-			}
-		}
-
-		// We iterate here only to handle the possibility of multiple-selection.
-		// graphCreator will descend into child nodes.
-		for (Iterator iter = selection.iterator(); iter.hasNext();) {
-			Object obj = (Object) iter.next();
-			// It can be a Project, Folder, File, etc...
-			if (obj instanceof IAdaptable) {
-				IAdaptable iad = (IAdaptable) obj;
-				final IResource res = (IResource) iad.getAdapter(IResource.class);
-				// Note: put this in a Job or WorkspaceModifyOperation if resources
-				// will be changed.
-				if (res != null) {
-					callGraph = graphCreator.initCallGraph(res);
-				} else {
-					message("Please select a file, folder, or project in the Projects view");
-					selection=null;
-					return null;
-				}
-			}
-		}
-		System.out.println("resources scanned. Now search for callers/callees");
-		graphCreator.computeCallGraph(callGraph);
-		System.out.println("showCallGraph...");
-		graphCreator.showCallGraph(callGraph);
-		System.out.println("showCallGraph complete.");
-		return null;
-	}
-
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			this.selection = (IStructuredSelection) selection;
-			System.out.println("BuildCallGraphHandler got selection");
-		}
-
-	}
-
-	public void message(String msg) {
-		MessageDialog.openInformation(window.getShell(),
-				"Houston, we have a problem", msg);
-	}
-}