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

Sprout from master 2009-10-17 16:25:15 UTC Greg Watson <g.watson@computer.org> 'Move test to correct place.'
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/serviceCategories.exsd
    core/org.eclipse.ptp.services.core/schema/services.exsd
    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/IServiceCategory.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/IServiceProviderWorkingCopy.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/ServiceProviderWorkingCopy.java
    core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServicesCorePlugin.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/ServiceCategory.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.core/src/org/eclipse/ptp/services/internal/core/ServiceProviderDescriptor.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/ServicesConfigurationWizard.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/handlers/LaunchWizardHandler.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/icons/etool16/service-category.gif
    core/org.eclipse.ptp.services.ui/icons/etool16/service-disabled.gif
    core/org.eclipse.ptp.services.ui/icons/etool16/service.gif
    core/org.eclipse.ptp.services.ui/icons/obj16/service_configuration_obj.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/internal/ui/adapters/ServiceWorkbenchAdapter.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/ServiceModelImages.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/ServicesUIPlugin.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/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/widgets/NewServiceModelWidget.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/NewServiceModelWidgetDialog.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/ServiceConfigurationSelectionWidget.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/ServiceModelWidget.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/FilenameStore.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/ServiceConfigurationExportWizard.java
    core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationImportWizard.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/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.pbs-feature/.project
    releng/org.eclipse.ptp.rm.pbs-feature/build.properties
    releng/org.eclipse.ptp.rm.pbs-feature/epl-v10.html
    releng/org.eclipse.ptp.rm.pbs-feature/feature.properties
    releng/org.eclipse.ptp.rm.pbs-feature/feature.xml
    releng/org.eclipse.ptp.rm.pbs-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/MPICH2ResourceManager.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/MPICH2RuntimeModelPresentation.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.pbs.core/.classpath
    rms/org.eclipse.ptp.rm.pbs.core/.project
    rms/org.eclipse.ptp.rm.pbs.core/.settings/org.eclipse.jdt.core.prefs
    rms/org.eclipse.ptp.rm.pbs.core/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.pbs.core/about.html
    rms/org.eclipse.ptp.rm.pbs.core/build.properties
    rms/org.eclipse.ptp.rm.pbs.core/plugin.properties
    rms/org.eclipse.ptp.rm.pbs.core/plugin.xml
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/Activator.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSAttributes.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSJobAttributes.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSPreferenceManager.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/Messages.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/messages.properties
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/IPBSResourceManagerConfiguration.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManager.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSProxyRuntimeClient.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystem.java
    rms/org.eclipse.ptp.rm.pbs.proxy/.cproject
    rms/org.eclipse.ptp.rm.pbs.proxy/.project
    rms/org.eclipse.ptp.rm.pbs.proxy/AUTHORS
    rms/org.eclipse.ptp.rm.pbs.proxy/COPYING
    rms/org.eclipse.ptp.rm.pbs.proxy/ChangeLog
    rms/org.eclipse.ptp.rm.pbs.proxy/INSTALL
    rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/eclipse.inf
    rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.am
    rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.in
    rms/org.eclipse.ptp.rm.pbs.proxy/NEWS
    rms/org.eclipse.ptp.rm.pbs.proxy/README
    rms/org.eclipse.ptp.rm.pbs.proxy/about.html
    rms/org.eclipse.ptp.rm.pbs.proxy/aclocal.m4
    rms/org.eclipse.ptp.rm.pbs.proxy/compile
    rms/org.eclipse.ptp.rm.pbs.proxy/config.guess
    rms/org.eclipse.ptp.rm.pbs.proxy/config.h.in
    rms/org.eclipse.ptp.rm.pbs.proxy/config.sub
    rms/org.eclipse.ptp.rm.pbs.proxy/configure
    rms/org.eclipse.ptp.rm.pbs.proxy/configure.in
    rms/org.eclipse.ptp.rm.pbs.proxy/depcomp
    rms/org.eclipse.ptp.rm.pbs.proxy/install-sh
    rms/org.eclipse.ptp.rm.pbs.proxy/missing
    rms/org.eclipse.ptp.rm.pbs.proxy/plugin.properties
    rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_proxy.c
    rms/org.eclipse.ptp.rm.pbs.ui/.classpath
    rms/org.eclipse.ptp.rm.pbs.ui/.project
    rms/org.eclipse.ptp.rm.pbs.ui/.settings/org.eclipse.jdt.core.prefs
    rms/org.eclipse.ptp.rm.pbs.ui/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.pbs.ui/about.html
    rms/org.eclipse.ptp.rm.pbs.ui/build.properties
    rms/org.eclipse.ptp.rm.pbs.ui/plugin.properties
    rms/org.eclipse.ptp.rm.pbs.ui/plugin.xml
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/Activator.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSProviderContributor.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSServiceProvider.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationDynamicTab.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationFactory.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/Messages.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/messages.properties
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/preferences/PBSPreferencePage.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSConfigurationWizardPage.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSResourceManagerConfigurationWizardPage.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/ISLURMResourceManagerConfiguration.java
    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/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/SLURMProviderContributor.java
    rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/SLURMServiceProvider.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
    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 8cd8c4f..0000000
--- a/core/org.eclipse.ptp.services.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +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.ServicesCorePlugin
-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,
- org.eclipse.ptp.services.internal.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 a33b20f..0000000
--- a/core/org.eclipse.ptp.services.core/plugin.xml
+++ /dev/null
@@ -1,8 +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"/>
-   <extension-point id="serviceCategories" name="Service Categories" schema="schema/serviceCategories.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/serviceCategories.exsd b/core/org.eclipse.ptp.services.core/schema/serviceCategories.exsd
deleted file mode 100644
index dfd5b09..0000000
--- a/core/org.eclipse.ptp.services.core/schema/serviceCategories.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.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.ptp.services.core" id="serviceCategories" name="Service Categories"/>
-      </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="category"/>
-         </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="category">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </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.core/schema/services.exsd b/core/org.eclipse.ptp.services.core/schema/services.exsd
deleted file mode 100644
index c039ded..0000000
--- a/core/org.eclipse.ptp.services.core/schema/services.exsd
+++ /dev/null
@@ -1,145 +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>
-         <attribute name="categoryId" type="string">
-            <annotation>
-               <documentation>
-                  ID of the serviceCategory that the service should belong to. Optional, if not specified the service will fall into the &quot;Additional Services&quot; category.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="nullProviderClass" type="string">
-            <annotation>
-               <documentation>
-                  The null service provider for this service. A service may have a null provider that acts as a &quot;no-op&quot; provider and will be returned by IServiceConfiguration.getServiceProvider() when a service is disabled, if there is no null provider then null will be returned instead.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.ptp.services.core.IServiceProvider"/>
-               </appInfo>
-            </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/IService.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IService.java
deleted file mode 100644
index 9921051..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IService.java
+++ /dev/null
@@ -1,102 +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
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import java.util.Set;
-import java.util.SortedSet;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-/**
- * 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 extends IAdaptable {
-
-	/**
-	 * 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);
-	
-	/**
-	 * Returns the service category that contains this service or
-	 * null if the service is not associated with a category.
-	 */
-	public IServiceCategory getCategory();
-	
-	
-	/**
-	 * Returns the special null "no-op" service provider, or null if there is none.
-	 */
-	public IServiceProvider getNullProvider();
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceCategory.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceCategory.java
deleted file mode 100644
index 56ab84a..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceCategory.java
+++ /dev/null
@@ -1,38 +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 java.util.Set;
-
-/**
- * Services can be organized into categories. 
- * This is mainly so that services can be presented to the user
- * in an organized way.
- */
-public interface IServiceCategory {
-	
-	
-	/**
-	 * Get the ID of the service category.
-	 */
-	public String getId();
-	
-	/**
-	 * Get the name of this service category.
-	 */
-	public String getName();
-	
-	/**
-	 * Get a set of all the services in the category.
-	 * @return
-	 */
-	public Set<IService> getServices();
-}
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 81ff360..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceConfiguration.java
+++ /dev/null
@@ -1,113 +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
- *******************************************************************************/
-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. 
- * 
- * An IServiceConfiguration represents a mapping from IService to IServiceProvider.
- * If there exists a mapping for a particular IService then that service is
- * considered "enabled". If there is no mapping for a service then the service 
- * is considered "disabled" in this configuration. Disabling a service removes 
- * the service from the configuration.
- * 
- * <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.
-	 * If the service is disabled and the service has a null-provider
-	 * then the null-provider will be returned, if the service does not
-	 * have a null-provider then null will be returned.
-	 * 
-	 * @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 enabled in this configuration.
-	 * @return all of the services that are part of this configuration.
-	 */
-	public Set<IService> getServices();
-	
-	/**
-	 * Return the set of services that are enabled in this configuration
-	 * sorted by priority.
-	 * 
-	 * @param service service containing providers
-	 * @return sorted providers
-	 */
-	public SortedSet<IService> getServicesByPriority();
-	
-	/**
-	 * 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.
-	 * If the service was formerly disabled it becomes enabled.
-	 * 
-	 * If the service already has a provider associated with it it will be replaced
-	 * with the given provider, the old provider will be remembered and will be
-	 * returned from getFormerServicePRoviders().
-	 * 
-	 * @param service service to set the provider for
-	 * @param provider provider for this service
-	 * 
-	 * @throws NullPointerException if service or provider is null
-	 * @throws IllegalArgumentException
-	 */
-	public void setServiceProvider(IService service, IServiceProvider provider);
-	
-	/**
-	 * Returns true of the given service is not part of this configuration.
-	 * Equivalent to:
-	 * {@code !getServices().contains(service)}
-	 * 
-	 * If this method returns false then {@code getServiceProvider()}
-	 * will not return null.
-	 * 
-	 */
-	public boolean isDisabled(IService service);
-	
-	/**
-	 * Disables (removes) the service provider from this configuration.
-	 */
-	public void disable(IService service);
-}
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 c07a80c..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelEvent.java
+++ /dev/null
@@ -1,99 +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;
-
-
-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 a service provider
-	 * has been modified. For this type of event, {@link #getSource()}
-	 * will return an instance of IServiceProvider.
-	 */
-	public static final int SERVICE_PROVIDER_CHANGED =			0x040;
-
-	/**
-	 * Event type that can be used to indicate that notification of all
-	 * types of events is requested.
-	 */
-	public static final int ALL_EVENTS = 						0x07f;
-
-	/**
-	 * 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();
-	
-	/**
-	 * For events of type SERVICE_CONFIGURATION_CHANGED this will return
-	 * the service provider instance that was replaced or removed.
-	 * @see IServiceModelEvent#SERVICE_CONFIGURATION_CHANGED
-	 */
-	public IServiceProvider getOldProvider();
-	
-	/**
-	 * Returns the type of event being reported.
-	 *
-	 * @return one of the event type constants
-	 * {@link #SERVICE_CONFIGURATION_ADDED}
-	 * {@link #SERVICE_CONFIGURATION_REMOVED}
-	 * {@link #SERVICE_CONFIGURATION_CHANGED}
-	 * {@link #SERVICE_CONFIGURATION_SELECTED}
-	 * {@link #SERVICE_PROVIDER_CHANGED}
-	 * {@link #SERVICE_MODEL_SAVED}
-	 * {@link #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 66f6ab5..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceModelManager.java
+++ /dev/null
@@ -1,288 +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
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import java.lang.reflect.InvocationTargetException;
-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 service configuration to the model without explicitly
-	 * associating it with a particular project. It may be associated with a project
-	 * later using the addConfiguration(IProject, IServiceConfiguration) method.
-	 * 
-	 * @param project the project
-	 * @param conf the configuration
-	 * 
-	 * @throws NullPointerException if conf is null
-	 */
-	public void addConfiguration(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);
-	
-	/**
-	 * Export a set of service configurations to a file. 
-	 * 
-	 * @param file file name used to save the configuration
-	 * @return service configurations to export
-	 * @throws InvocationTargetException wraps any exceptions thrown during export
-	 */
-	public boolean exportConfigurations(String filename, IServiceConfiguration[] configs) throws InvocationTargetException;
-	
-	/**
-	 * 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);
-	
-	/**
-	 * Returns all the service categories that have been registered with
-	 * the system.
-	 * @return
-	 */
-	public Set<IServiceCategory> getCategories();
-	
-	/**
-	 * 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);
-	
-	/**
-	 * Import a set of service configurations from a file. The configurations
-	 * must be added to the model using {@link #addConfiguration(IServiceConfiguration)}
-	 * before they can be used. No model events will be generated while loading
-	 * the configurations.
-	 * 
-	 * @param file file name containing the configuration
-	 * @return imported service configurations
-	 * @throws InvocationTargetException wraps any exceptions thrown during import
-	 */
-	public IServiceConfiguration[] importConfigurations(String filename) throws InvocationTargetException;
-
-	/**
-	 * Returns true if the given project has a configuration.
-	 * 
-	 */
-	public boolean isConfigured(IProject project);
-	
-	/**
-	 * Validate a set of service configurations in a file
-	 * 
-	 * @param file file name of the file containing the configurations
-	 * @return true if valid, false otherwise
-	 */
-	public boolean isValidConfigurationFile(String filename);
-
-	/**
-	 * Obtain a new service configuration with name 'name'. The name
-	 * does not need to be unique. This service configuration will not
-	 * become part of the service model until it is passed to 
-	 * one of the addConfiguration() methods.
-	 * 
-	 * @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 f657392..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProvider.java
+++ /dev/null
@@ -1,141 +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
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-
-/**
- * An IServiceProvider represents an instance of an IServiceProviderDescriptor, 
- * and there can be many instances for each IServiceProviderDescriptor. 
- * 
- * IServiceProvider contains attributes and other information for a particular
- * 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 IService
- */
-public interface IServiceProvider extends IServiceProviderDescriptor, IAdaptable {
-	public IServiceProviderWorkingCopy copy();
-	
-	/**
-	 * 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 provider specific information for the current configuration.
-	 * 
-	 * @return information on current configuration for this provider
-	 * @deprecated
-	 */
-	public String getConfigurationString();
-
-	/**
-	 * Get the descriptor for this service provider
-	 * 
-	 * @return service provider descriptor
-	 */
-	public IServiceProviderDescriptor getDescriptor();
-
-	/**
-	 * 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 an unmodifiable view of the properties that apply 
-	 * to this service provider.
-	 * 
-	 * @return map containing the properties
-	 */
-	public Map<String, String> getProperties();
-	
-	/**
-	 * 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();
-
-	/**
-	 * Returns a set of all the property keys that apply to this
-	 * service provider.
-	 * 
-	 * @deprecated use <code>getProperties().keySet()</code> instead.
-	 */
-	public Set<String> keySet();
-
-	/**
-	 * 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);
-	
-	/**
-	 * Set the descriptor for this provider.
-	 * 
-	 * @param descriptor descriptor to set
-	 */
-	public void setDescriptor(IServiceProviderDescriptor descriptor);
-	
-	/**
-	 * Add the properties in the supplied map to the properties
-	 * of the service provider. Will replace any properties of
-	 * the same name.
-	 * 
-	 * @param map map containing the properties to be added.
-	 */
-	public void setProperties(Map<String, String> map);
-	
-}
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 f245a91..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProviderDescriptor.java
+++ /dev/null
@@ -1,53 +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
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-/**
- * An IServiceProviderDescriptor represents the description (but not an
- * instance of) of a service provider. IServiceProviderDescriptors contain
- * the immutable information about 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, or null if this is a null provider.
-	 * 
-	 * @return ID of this service provider
-	 */
-	public String getId();
-	
-	/**
-	 * Get the name of this service provider, or null if this is a null 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/IServiceProviderWorkingCopy.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProviderWorkingCopy.java
deleted file mode 100644
index 24fd2db..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/IServiceProviderWorkingCopy.java
+++ /dev/null
@@ -1,24 +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
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import org.eclipse.core.runtime.IAdaptable;
-
-
-/**
- * An IServiceProviderWorkingCopy represents an editable copy of
- * and IServiceProvider. Properties of a service provider can
- * be modified by modifying the properties of a working
- * copy and then saving the working copy.
- */
-public interface IServiceProviderWorkingCopy extends IServiceProvider, IAdaptable {
-	public void save();
-}
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 54ae35a..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) {
-			ServicesCorePlugin.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 d9cab0d..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceModelManager.java
+++ /dev/null
@@ -1,1026 +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.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.lang.reflect.InvocationTargetException;
-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.ServiceCategory;
-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.ptp.services.internal.core.ServiceProviderDescriptor;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.WorkbenchException;
-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 CATEGORY_EXTENSION_ID = "serviceCategories"; //$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 CATEGORY_ELEMENT_NAME = "category"; //$NON-NLS-1$
-	private final static String DISABLED_PROVIDERS_ELEMENT_NAME = "disabledProviders"; //$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_CATEGORY_ID = "categoryId"; //$NON-NLS-1$
-	private final static String ATTR_NULL_PROVIDER_CLASS = "nullProviderClass"; //$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;
-	} 
-	
-	/**
-	 * Save a collection of service configurations to the memento
-	 * NOTE: does not actually save the memento
-	 * 
-	 * @param memento memento used to save configurations
-	 * @param configs collection of serice configurations to save
-	 */
-	private static void saveConfigurations(IMemento memento, IServiceConfiguration[] configs) {
-		for (IServiceConfiguration config : configs) {
-			String configurationId = config.getId();
-			String configurationName = config.getName();
-			
-			IMemento configMemento = memento.createChild(SERVICE_CONFIGURATION_ELEMENT_NAME);
-			configMemento.putString(ATTR_ID, configurationId);
-			configMemento.putString(ATTR_NAME, configurationName);
-			
-			Set<IService> services = config.getServices();
-			for (IService service : services) {
-				if(!config.isDisabled(service)) {
-					IServiceProvider provider = config.getServiceProvider(service);
-					IMemento serviceMemento = configMemento.createChild(SERVICE_ELEMENT_NAME);
-					serviceMemento.putString(ATTR_ID, service.getId());
-					serviceMemento.putString(ATTR_PROVIDER_ID, provider.getId());
-					saveProviderState(provider, serviceMemento);
-				}
-				
-				if(config instanceof ServiceConfiguration) {
-					Set<IServiceProvider> disabledProviders = ((ServiceConfiguration)config).getFormerServiceProviders(service);
-					if(!disabledProviders.isEmpty()) {
-						IMemento disabledMemento = configMemento.createChild(DISABLED_PROVIDERS_ELEMENT_NAME);
-						disabledMemento.putString(ATTR_ID, service.getId());
-						for(IServiceProvider disabledProvider : disabledProviders) {
-							IMemento providerMemento = disabledMemento.createChild(PROVIDER_ELEMENT_NAME);
-							providerMemento.putString(ATTR_PROVIDER_ID, disabledProvider.getId());
-							saveProviderState(disabledProvider, providerMemento);
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Save the model configuration to persistent storage
-	 * 
-	 * @param configs
-	 * @param projectConfigs
-	 * @param activeConfigs
-	 * @param writer
-	 * @throws IOException
-	 */
-	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);
-		
-		saveConfigurations(rootMemento, configs.values().toArray(new IServiceConfiguration[0]));
-		
-		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);
-	}
-	
-	/**
-	 * Save the state of a service provider
-	 * 
-	 * @param provider
-	 * @param parentMemento
-	 */
-	private static void saveProviderState(IServiceProvider provider, IMemento parentMemento) {
-		if (provider instanceof ServiceProvider) {
-			IMemento providerConfigMemento = parentMemento.createChild(PROVIDER_CONFIGURATION_ELEMENT_NAME);
-			((ServiceProvider)provider).saveState(providerConfigMemento);
-		}
-	}
-	/** 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, Service> fServices = null;
-	private Map<String,ServiceCategory> fCategories;
-	private Set<IService> fServiceSet = null;
-	private Map<String, Set<IService>> fNatureServices = null;
-	private IServiceConfiguration fDefaultServiceConfiguration = null;
-	private ServiceModelEventManager fEventManager = new ServiceModelEventManager();
-	private boolean fModelLoaded = false;
-	
-	private boolean fEventsEnabled = true;
-	
-	private static ServiceModelManager fInstance;
-	
-	public static synchronized ServiceModelManager getInstance() {
-		if(fInstance == null) {
-			fInstance = new ServiceModelManager();
-		}
-		return fInstance;
-	}
-
-	private ServiceModelManager() {
-		defaultSaveFile = ServicesCorePlugin.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) {
-		checkAndLoadModel();
-		
-		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);
-			}
-		}
-		
-		addConfiguration(conf);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#addConfiguration(org.eclipse.ptp.services.core.IServiceConfiguration)
-	 */
-	public void addConfiguration(IServiceConfiguration conf) {
-		checkAndLoadModel(); 
-		if(fConfigurations.put(conf.getId(), conf) == null) {
-			notifyListeners(new ServiceModelEvent(conf, IServiceModelEvent.SERVICE_CONFIGURATION_ADDED));
-		}
-	}
-	
-	/* (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#exportConfigurations(java.lang.String, java.util.Set)
-	 */
-	public boolean exportConfigurations(String filename, 
-			IServiceConfiguration[] configs) throws InvocationTargetException {
-		final File file = new File(filename);
-		if (!file.exists()) {
-			final Writer writer;
-			try {
-				writer = new BufferedWriter(new FileWriter(file));
-			} catch (IOException e) {
-				throw new InvocationTargetException(e);
-			}
-			try {
-				final XMLMemento rootMemento = XMLMemento.createWriteRoot(SERVICE_MODEL_ELEMENT_NAME);
-				saveConfigurations(rootMemento, configs);
-				rootMemento.save(writer);
-			} catch (IOException e) {
-				throw new InvocationTargetException(e);
-			} finally {
-				try {
-					writer.close();
-				} catch (IOException e) {
-					throw new InvocationTargetException(e);
-				}
-			}
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getDefaultConfiguration()
-	 */
-	public IServiceConfiguration getActiveConfiguration() {
-		checkAndLoadModel();
-		return fDefaultServiceConfiguration;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getActiveConfiguration(org.eclipse.core.resources.IProject)
-	 */
-	public IServiceConfiguration getActiveConfiguration(IProject project) {
-		checkAndLoadModel();
-		return getConf(fActiveConfigurations, project);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getCategories()
-	 */
-	public Set<IServiceCategory> getCategories() {
-		checkAndLoadModel();
-		return new HashSet<IServiceCategory>(fCategories.values());
-	}
-	
-	/* (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) {
-		checkAndLoadModel();
-		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) {
-		checkAndLoadModel();
-		return fConfigurations.get(id);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getConfigurations()
-	 */
-	public Set<IServiceConfiguration> getConfigurations() {
-		checkAndLoadModel();
-		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) {
-		checkAndLoadModel();
-		return new HashSet<IServiceConfiguration>(getConf(fProjectConfigurations, project).values());
-	}
-	
-	/**
-	 * 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) {
-		checkAndLoadModel();
-
-		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) {
-		loadServicesFromExtensionRegistry();
-		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(ServicesCorePlugin.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);
-								provider.setDescriptor(desc);
-								return provider;
-							} catch (Exception e) {
-								ServicesCorePlugin.getDefault().log(e);
-								return null;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getServices()
-	 */
-	public Set<IService> getServices() {
-		loadServicesFromExtensionRegistry();
-		return fServiceSet;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getServices(org.eclipse.core.resources.IProject)
-	 */
-	public Set<IService> getServices(IProject project) {
-		checkAndLoadModel();
-		return getConf(fProjectServices, project);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#getServices(java.lang.String)
-	 */
-	public Set<IService> getServices(String natureId) {
-		loadServicesFromExtensionRegistry();
-		return fNatureServices.get(natureId);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#importConfigurations(java.lang.String)
-	 */
-	public IServiceConfiguration[] importConfigurations(String filename) throws InvocationTargetException {
-		final File file = new File(filename);
-		if (file.exists()) {
-			final Reader reader;
-			try {
-				reader = new BufferedReader(new FileReader(file));
-			} catch (FileNotFoundException e) {
-				throw new InvocationTargetException(e);
-			}
-			try {
-				final XMLMemento rootMemento = XMLMemento.createReadRoot(reader);
-				setEnableEvents(false);
-				return doLoadConfigurations(rootMemento, true);
-			} catch (WorkbenchException e) {
-				throw new InvocationTargetException(e);
-			} finally {
-				setEnableEvents(true);
-				try {
-					reader.close();
-				} catch (IOException e) {
-					throw new InvocationTargetException(e);
-				}
-			}
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#isConfigured(org.eclipse.core.resources.IProject)
-	 */
-	public boolean isConfigured(IProject project) {
-		checkAndLoadModel();
-		return fProjectConfigurations.containsKey(project);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceModelManager#isValidConfigurationFile(java.lang.String)
-	 */
-	public boolean isValidConfigurationFile(String filename) {
-		File file = new File(filename);
-		if (file.exists()) {
-			final Reader reader;
-			try {
-				reader = new BufferedReader(new FileReader(file));
-			} catch (FileNotFoundException e) {
-				return false;
-			}
-			try {
-				final XMLMemento rootMemento = XMLMemento.createReadRoot(reader);
-				final IMemento[] children = rootMemento.getChildren(SERVICE_CONFIGURATION_ELEMENT_NAME);
-				if (children == null || children.length == 0) {
-					return false;
-				}
-				for (IMemento configMemento : children) {
-					String configId = configMemento.getString(ATTR_ID);
-					if (configId == null) {
-						return false;
-					}
-					String configName = configMemento.getString(ATTR_NAME);
-					if (configName == null) {
-						return false;
-					}
-					for (IMemento serviceMemento : configMemento.getChildren(SERVICE_ELEMENT_NAME)) {
-						String serviceId = serviceMemento.getString(ATTR_ID);
-						if (serviceId == null) {
-							return false;
-						}
-						IService service = getService(serviceId);
-						if (service == null) {
-							return false;
-						}
-						if (!validateServiceProvider(serviceMemento, service)) {
-							return false;
-						}
-					}
-					for (IMemento disabledMemento : configMemento.getChildren(DISABLED_PROVIDERS_ELEMENT_NAME)) {
-						String serviceId = disabledMemento.getString(ATTR_ID);
-						if (serviceId == null) {
-							return false;
-						}
-						IService service = getService(serviceId);
-						if (service == null) {
-							return false;
-						}
-						for (IMemento providerMemento : disabledMemento.getChildren(PROVIDER_ELEMENT_NAME)) {
-							if (!validateServiceProvider(providerMemento, service)) {
-								return false;
-							}
-						}
-					}
-					
-				}
-			} catch (WorkbenchException e) {
-				return false;
-			} finally {
-				try {
-					reader.close();
-				} catch (IOException e) {
-					// Too late now
-				}
-			}
-		}
-		return true;
-	}
-	
-	/**
-	 * 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 {
-		loadServicesFromExtensionRegistry();
-		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 {
-		fModelLoaded = true; // avoid re-entry
-
-		initialize(); // Clear out the existing model
-		
-		XMLMemento rootMemento = XMLMemento.createReadRoot(reader);
-		
-		for (IServiceConfiguration config: doLoadConfigurations(rootMemento, false)) {
-			addConfiguration(config);
-		}
-		
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		
-		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) {
-		checkAndLoadModel();
-		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) {
-		checkAndLoadModel();
-		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) {
-		checkAndLoadModel();
-		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 {
-		checkAndLoadModel();
-		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) {
-		checkAndLoadModel();
-
-		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));
-	}
-	
-	/**
-	 * Check if the model is already loaded. If not, load it.
-	 * 
-	 * This is used to ensure that the model is loaded prior to accessing it.
-	 */
-	private void checkAndLoadModel() {
-		if (!fModelLoaded) {
-			try {
-				loadModelConfiguration();
-			} catch (Exception e) {
-				ServicesCorePlugin.getDefault().log(e);
-			}
-		}
-	}
-	
-	/**
-	 * Do the actual job of loading configurations.
-	 * 
-	 * If the configurations are being imported then a new ID is generated for each configuration.
-	 * This is to avoid the import causing duplicate configuration IDs.
-	 * 
-	 * @param rootMemento
-	 * @return
-	 */
-	private IServiceConfiguration[] doLoadConfigurations(IMemento rootMemento, boolean importing) {
-		Set<IServiceConfiguration> configs = new HashSet<IServiceConfiguration>();
-		
-		for (IMemento configMemento : rootMemento.getChildren(SERVICE_CONFIGURATION_ELEMENT_NAME)) {
-			String configId = configMemento.getString(ATTR_ID);
-			if (importing) {
-				configId = UUID.randomUUID().toString();
-			}
-			String configName = configMemento.getString(ATTR_NAME);
-			ServiceConfiguration config = newServiceConfiguration(configId, configName);
-			
-			for (IMemento serviceMemento : configMemento.getChildren(SERVICE_ELEMENT_NAME)) {
-				String serviceId = serviceMemento.getString(ATTR_ID);
-				IService service = getService(serviceId);
-				IServiceProvider provider = loadServiceProvider(serviceMemento, service);
-				config.setServiceProvider(service, provider);
-			}
-			
-			for (IMemento disabledMemento : configMemento.getChildren(DISABLED_PROVIDERS_ELEMENT_NAME)) {
-				String serviceId = disabledMemento.getString(ATTR_ID);
-				IService service = getService(serviceId);
-				for (IMemento providerMemento : disabledMemento.getChildren(PROVIDER_ELEMENT_NAME)) {
-					IServiceProvider provider = loadServiceProvider(providerMemento, service);
-					config.addFormerServiceProvider(service, provider);
-				}
-			}
-			
-			configs.add(config);
-		}
-		
-		return configs.toArray(new IServiceConfiguration[0]);
-	}
-
-	/**
-	 * Initialize model
-	 */
-	private void initialize() {
-		fActiveConfigurations.clear();
-		fProjectConfigurations.clear();
-		fProjectServices.clear();
-		fConfigurations.clear();
-	}
-	
-	/**
-	 * Load a service provider from persistent state
-	 * 
-	 * @param providerMemento
-	 * @param service
-	 * @return
-	 */
-	private IServiceProvider loadServiceProvider(IMemento providerMemento, IService service) {
-		if(service == null)
-			return null;
-		
-		String providerId = providerMemento.getString(ATTR_PROVIDER_ID);
-		IServiceProviderDescriptor descriptor = service.getProviderDescriptor(providerId);
-		if (descriptor != null) {
-			IServiceProvider provider = getServiceProvider(descriptor);
-			if (provider != null) {
-				if (provider instanceof ServiceProvider) {
-					IMemento providerConfigMemento = providerMemento.getChild(PROVIDER_CONFIGURATION_ELEMENT_NAME);
-					((ServiceProvider)provider).restoreState(providerConfigMemento);
-				}
-				return provider;
-			} 
-			else {
-				ServicesCorePlugin.getDefault().logErrorMessage(Messages.ServiceModelManager_2);
-			}
-		}
-		else {
-			ServicesCorePlugin.getDefault().logErrorMessage(Messages.ServiceModelManager_0 + providerId);
-		}
-		return null;
-	}
-	
-	/**
-	 * Locate and initialize service extensions.
-	 */
-	private void loadServicesFromExtensionRegistry() {
-		if (fServices != null) {
-			return;
-		}
-		fServices = new HashMap<String, Service>();
-		fCategories = new HashMap<String, ServiceCategory>();
-		fServiceSet = new HashSet<IService>();
-		fNatureServices = new HashMap<String, Set<IService>>();
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(ServicesCorePlugin.PLUGIN_ID, CATEGORY_EXTENSION_ID);
-		if(extensionPoint != null) {
-			for (IExtension extension : extensionPoint.getExtensions()) {
-				for (IConfigurationElement element : extension.getConfigurationElements()) {
-					if (element.getName().equals(CATEGORY_ELEMENT_NAME)) {
-						String id = element.getAttribute(ATTR_ID);
-						String name = element.getAttribute(ATTR_NAME);
-						ServiceCategory category = new ServiceCategory(id, name);
-						fCategories.put(id, category);
-					}
-				}
-			}
-		}
-		
-        extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(ServicesCorePlugin.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);
-						String categoryId = element.getAttribute(ATTR_CATEGORY_ID);
-						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);
-								}
-							}
-						}
-						Service 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);
-						}
-						
-						if(element.getAttribute(ATTR_NULL_PROVIDER_CLASS) != null) {
-							try {
-								IServiceProvider nullProvider = (IServiceProvider) element.createExecutableExtension(ATTR_NULL_PROVIDER_CLASS);
-								if(nullProvider instanceof ServiceProvider) {
-									String providerId = service.getId() + ".nullProvider";
-									ServiceProviderDescriptor descriptor = new ServiceProviderDescriptor(providerId, "Null Provider", service.getId(), "0");
-									((ServiceProvider)nullProvider).setDescriptor(descriptor);
-								}
-								service.setNullServiceProvider(nullProvider);
-							} catch (CoreException e) {
-								ServicesCorePlugin.getDefault().log(e);
-							}
-						}
-						
-						ServiceCategory category = fCategories.get(categoryId);
-						if(category != null) {
-							category.addService(service);
-							service.setCategory(category);
-						}
-					}
-				}
-			}
-		}
-        extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(ServicesCorePlugin.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);
-						Service service = fServices.get(serviceId);
-						if (service != null) {
-							service.addServiceProvider(desc);
-						} else {
-							ServicesCorePlugin.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 ServiceConfiguration newServiceConfiguration(String id, String name) {
-		return new ServiceConfiguration(id, name);
-	}
-	
-	/**
-	 * Enable/disable model events.
-	 * 
-	 * @param enable
-	 */
-	private void setEnableEvents(boolean enable) {
-		fEventsEnabled = enable;
-	}
-	
-	/**
-	 * Validate a service provider from persistent state
-	 * 
-	 * @param providerMemento
-	 * @param service
-	 * @return
-	 */
-	private boolean validateServiceProvider(IMemento providerMemento, IService service) {
-		String providerId = providerMemento.getString(ATTR_PROVIDER_ID);
-		if (providerId == null) {
-			return false;
-		}
-		IServiceProviderDescriptor descriptor = service.getProviderDescriptor(providerId);
-		if (descriptor == null) {
-			return false;
-		}
-		IMemento providerConfigMemento = providerMemento.getChild(PROVIDER_CONFIGURATION_ELEMENT_NAME);
-		if (providerConfigMemento == null) {
-			return false;
-		}
-		return true;
-	}
-}
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 22b1a96..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProvider.java
+++ /dev/null
@@ -1,258 +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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.ptp.services.core.messages.Messages;
-import org.eclipse.ptp.services.internal.core.ServiceModelEvent;
-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;
-	private final HashMap<String, String> fProperties = new HashMap<String, String>();
-	protected ServiceModelManager fManager = ServiceModelManager.getInstance();
-
-	public ServiceProvider() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#copy()
-	 */
-	public IServiceProviderWorkingCopy copy() {
-		return new ServiceProviderWorkingCopy(this);
-	}
-
-	// generated by eclipse
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		ServiceProvider other = (ServiceProvider) obj;
-		if (fDescriptor == null) {
-			if (other.fDescriptor != null)
-				return false;
-		} else if (!fDescriptor.equals(other.fDescriptor))
-			return false;
-		return true;
-	}
-	
-	/* (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;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#getDescriptor()
-	 */
-	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.IServiceProvider#getProperties()
-	 */
-	public Map<String, String> getProperties() {
-		return Collections.unmodifiableMap(fProperties);
-	}
-	
-	/* (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 = fProperties.get(key);
-		if (value == null) {
-			return defaultValue;
-		}
-		return value;
-	}
-
-	// generated by eclipse
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result
-				+ ((fDescriptor == null) ? 0 : fDescriptor.hashCode());
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#keySet()
-	 */
-	public Set<String> keySet() {
-		return fProperties.keySet();
-	}
-
-	/* (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) {
-		fProperties.put(key, value);
-		fManager.notifyListeners(new ServiceModelEvent(this, IServiceModelEvent.SERVICE_PROVIDER_CHANGED, null));
-	}
-
-	/**
-	 * 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) {
-		fProperties.clear();
-		for (String key : memento.getAttributeKeys()) {
-			fProperties.put(key, memento.getString(key));
-		}
-		fManager.notifyListeners(new ServiceModelEvent(this, IServiceModelEvent.SERVICE_PROVIDER_CHANGED, null));
-	}
-
-	/**
-	 * 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 : fProperties.keySet()) {
-			memento.putString(key, fProperties.get(key));
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#setDescriptor(org.eclipse.ptp.services.core.IServiceProviderDescriptor)
-	 */
-	public void setDescriptor(IServiceProviderDescriptor descriptor) {
-		this.fDescriptor = descriptor;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#setProperties(java.util.Map)
-	 */
-	public void setProperties(Map<String, String> properties) {
-		fProperties.putAll(properties);
-		fManager.notifyListeners(new ServiceModelEvent(this, IServiceModelEvent.SERVICE_PROVIDER_CHANGED, null));
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProviderWorkingCopy.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProviderWorkingCopy.java
deleted file mode 100644
index 7941c0d..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServiceProviderWorkingCopy.java
+++ /dev/null
@@ -1,40 +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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.core;
-
-
-/**
- * An abstract base class for service provider working copy implementations.
- *
- */
-public class ServiceProviderWorkingCopy extends ServiceProvider implements IServiceProviderWorkingCopy {
-	private IServiceProvider fProvider;
-	
-	public ServiceProviderWorkingCopy(IServiceProvider provider) {
-		fProvider = provider;
-		setProperties(provider.getProperties());
-		setDescriptor(provider.getDescriptor());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#isConfigured()
-	 */
-	public boolean isConfigured() {
-		return fProvider.isConfigured();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProviderWorkingCopy#save()
-	 */
-	public void save() {
-		fProvider.setProperties(getProperties());
-	}
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServicesCorePlugin.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServicesCorePlugin.java
deleted file mode 100644
index c5b1fd7..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/core/ServicesCorePlugin.java
+++ /dev/null
@@ -1,85 +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 ServicesCorePlugin 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 ServicesCorePlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public ServicesCorePlugin() {
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-
-		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 ServicesCorePlugin 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/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 fc93561..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/Service.java
+++ /dev/null
@@ -1,170 +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
- *******************************************************************************/
-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.core.runtime.PlatformObject;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceCategory;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.IServiceProviderDescriptor;
-
-/**
- * @author greg
- *
- */
-public class Service extends PlatformObject 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>();
-	private IServiceCategory category;
-	
-	private IServiceProvider nullProvider;
-	
-	
-	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);
-	}
-
-	public void setNullServiceProvider(IServiceProvider nullProvider) {
-		this.nullProvider = nullProvider;
-	}
-	
-	public IServiceProvider getNullProvider() {
-		return nullProvider;
-	}
-	
-	
-	@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$
-	}
-
-	public void setCategory(IServiceCategory category) {
-		this.category = category;
-	}
-	
-	public IServiceCategory getCategory() {
-		return category;
-	}
-
-	
-}
diff --git a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceCategory.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceCategory.java
deleted file mode 100644
index 7c9d90f..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceCategory.java
+++ /dev/null
@@ -1,49 +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:
- *    Mike Kucera (IBM) - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.ptp.services.internal.core;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceCategory;
-
-public class ServiceCategory implements IServiceCategory {
-
-	private final String id;
-	private final String name;
-	
-	private final Set<IService> services = new HashSet<IService>();
-	
-	public ServiceCategory(String id, String name) {
-		this.id = id;
-		this.name = name;
-	}
-
-	public void addService(IService service) {
-		if(service != null)
-			services.add(service);
-	}
-	
-	public String getId() {
-		return id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public Set<IService> getServices() {
-		return Collections.unmodifiableSet(services);
-	}
-
-}
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 fb11cf3..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceConfiguration.java
+++ /dev/null
@@ -1,194 +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 - 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.LinkedHashSet;
-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>();
-	protected Map<IService, LinkedHashSet<IServiceProvider>> fFormerServiceProviders = new HashMap<IService, LinkedHashSet<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) {
-		IServiceProvider activeProvider = fServiceToProviderMap.get(service);
-		return activeProvider == null ? service.getNullProvider() : activeProvider;
-	}
-	
-	
-	/**
-	 * Returns service providers that used to be associated with the given
-	 * service. 
-	 *
-	 * This method is here mainly for use by the NewServiceModelWidget.
-	 * The service configuration will automatically remember old service
-	 * providers and their state. That way if a user switches back to an
-	 * old provider the state can be restored and the user doesn't have
-	 * to set up the provider again.
-	 * 
-	 * @param service the service
-	 * @return set of old service providers
-	 * 
-	 * @see NewServiceModelWidget in the services.ui plugin
-	 */
-	public Set<IServiceProvider> getFormerServiceProviders(IService service) {
-		Set<IServiceProvider> disabledProviders = fFormerServiceProviders.get(service);
-		return disabledProviders == null ? Collections.<IServiceProvider>emptySet() : disabledProviders;
-	}
-	
-	
-	/* (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());
-				}
-			});
-		
-		sortedServices.addAll(getServices());
-		
-		return sortedServices;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceConfiguration#removeService(org.eclipse.ptp.services.core.IService)
-	 */
-	public void removeService(IService service) {
-		IServiceProvider oldProvider = fServiceToProviderMap.remove(service);
-		fFormerServiceProviders.remove(service);
-
-		fManager.notifyListeners(new ServiceModelEvent(this, IServiceModelEvent.SERVICE_CONFIGURATION_CHANGED, oldProvider));
-	}
-	
-	/* (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) {
-		if(provider != null && provider.equals(service.getNullProvider()))
-			provider = null;
-		
-		IServiceProvider oldProvider;
-		if(provider == null)
-			oldProvider = fServiceToProviderMap.remove(service);
-		else
-			oldProvider = fServiceToProviderMap.put(service, provider);
-		
-		if(oldProvider != null) {
-			addFormerServiceProvider(service, oldProvider);
-			fFormerServiceProviders.get(service).remove(provider);
-		}
-	
-		fManager.notifyListeners(new ServiceModelEvent(this, IServiceModelEvent.SERVICE_CONFIGURATION_CHANGED, oldProvider));
-	}
-	
-	
-	public void addFormerServiceProvider(IService service, IServiceProvider disabledProvider) {
-		if(disabledProvider == null)
-			return;
-		
-		LinkedHashSet<IServiceProvider> disabledServices = fFormerServiceProviders.get(service);
-		if(disabledServices == null) {
-			disabledServices = new LinkedHashSet<IServiceProvider>(); // very important to maintain insertion order
-			fFormerServiceProviders.put(service, disabledServices);
-		}
-		disabledServices.add(disabledProvider);
-	}
-	
-	
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	public String toString() {
-		return "ServiceConfiguration: " + fName + " -> " + fServiceToProviderMap; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	
-	public void disable(IService service) {
-		setServiceProvider(service, null);
-	}
-
-	public boolean isDisabled(IService service) {
-		return !fServiceToProviderMap.containsKey(service);
-	}
-
-}
\ 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 1bcb6ae..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceModelEvent.java
+++ /dev/null
@@ -1,43 +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.core;
-
-import java.util.EventObject;
-
-import org.eclipse.ptp.services.core.IServiceModelEvent;
-import org.eclipse.ptp.services.core.IServiceProvider;
-
-
-public class ServiceModelEvent extends EventObject implements IServiceModelEvent {
-	private static final long serialVersionUID = 1L;
-	
-	private int type;
-	private IServiceProvider oldProvider;
-
-	public ServiceModelEvent(Object source, int type) {
-		super(source);
-		this.type = type;
-	}
-
-	public ServiceModelEvent(Object source, int type, IServiceProvider oldProvider) {
-		this(source, type);
-		this.oldProvider = oldProvider;
-	}
-	
-	public int getType() {
-		return type;
-	}
-
-	public IServiceProvider getOldProvider() {
-		return oldProvider;
-	}
-	
-}
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 bb17338..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceModelEventManager.java
+++ /dev/null
@@ -1,92 +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) { 
-					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) {
-				ListenerList list = fEventListeners.get(pos);
-				if (list != null) {
-					for (Object obj : list.getListeners()) {
-						((IServiceModelEventListener)obj).handleEvent(event);
-					}
-				}
-				return;
-			}
-		}
-	}
-
-	/**
-	 * 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.core/src/org/eclipse/ptp/services/internal/core/ServiceProviderDescriptor.java b/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceProviderDescriptor.java
deleted file mode 100644
index ff74283..0000000
--- a/core/org.eclipse.ptp.services.core/src/org/eclipse/ptp/services/internal/core/ServiceProviderDescriptor.java
+++ /dev/null
@@ -1,89 +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 org.eclipse.ptp.services.core.IServiceProviderDescriptor;
-
-
-/**
- * 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.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 12a6d1d..0000000
--- a/core/org.eclipse.ptp.services.test/plugin.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.services.core.services">
-      <service
-            categoryId="Category1"
-            id="ServiceA"
-            name="ServiceA">
-      </service>
-      <service
-            id="ServiceB"
-            name="ServiceB"
-            nullProviderClass="org.eclipse.ptp.services.test.TestServiceProvider">
-      </service>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.services.core.providers">
-      <provider
-            class="org.eclipse.ptp.services.test.TestServiceProvider"
-            id="ProviderA_1"
-            name="ProviderA_1"
-            priority="100"
-            serviceId="ServiceA">
-      </provider>
-      <provider
-            class="org.eclipse.ptp.services.test.TestServiceProvider"
-            id="ProviderA_2"
-            name="ProviderA_2"
-            priority="1"
-            serviceId="ServiceA">
-      </provider>
-      <provider
-            class="org.eclipse.ptp.services.test.TestServiceProvider"
-            id="ProviderA_3"
-            name="ProviderA_3"
-            priority="1"
-            serviceId="ServiceA">
-      </provider>
-      <provider
-            class="org.eclipse.ptp.services.test.TestServiceProvider"
-            id="ProviderB_1"
-            name="ProviderB_1"
-            priority="1"
-            serviceId="ServiceB">
-      </provider>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.services.core.serviceCategories">
-      <category
-            id="Category1"
-            name="Category1">
-      </category>
-      <category
-            id="Category2"
-            name="Category2">
-      </category>
-   </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="Configure...">
-      </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.test.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 c256634..0000000
--- a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/ServiceModelManagerTests.java
+++ /dev/null
@@ -1,247 +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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.test;
-
-import static org.junit.Assert.*;
-
-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.Iterator;
-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.IServiceCategory;
-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.internal.core.ServiceConfiguration;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Note, you need to run this without any other plugins that
- * contribute to the service model.
- *
- */
-public class ServiceModelManagerTests {
-	
-	private static final String
-		SERVICE_A = "ServiceA",
-		SERVICE_B = "ServiceB";
-	
-	private static final String
-		PROVIDER_A_1 = "ProviderA_1",
-		PROVIDER_A_2 = "ProviderA_2",
-		PROVIDER_A_3 = "ProviderA_3",
-		PROVIDER_B_1 = "ProviderB_1";
-	
-	private static final String
-		CATEGORY_1 = "Category1",
-		CATEGORY_2 = "Category2";
-	
-	
-	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();
-		}
-	}
-	
-	IServiceProvider 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);
-		return 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(SERVICE_A); 
-		addProvider(PROVIDER_A_1, fService1, fConfig); 
-		fService2 = manager.getService(SERVICE_B); 
-		addProvider(PROVIDER_B_1, fService2, fConfig); 
-
-		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(SERVICE_A); 
-		addProvider(PROVIDER_A_2, fService1, fConfig); 
-		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);
-	}
-	
-	@Test
-	public void testFormerProviders() throws Exception {
-		IServiceModelManager smm = ServiceModelManager.getInstance();
-		ServiceConfiguration config = (ServiceConfiguration) smm.newServiceConfiguration("blah");
-		
-		fService1 = smm.getService(SERVICE_A); 
-		IServiceProvider provider1 = addProvider(PROVIDER_A_1, fService1, config); 
-		provider1.putString("key1", "val1");
-		provider1.putString("key2", "val2");
-		
-		IServiceProvider provider2 = addProvider(PROVIDER_A_2, fService1, config); 
-		provider2.putString("key1", "val1_2");
-		
-		IServiceProvider provider3 = addProvider(PROVIDER_A_3, fService1, config); 
-		provider3.putString("key1", "provider3");
-		
-		
-		persistAndReplaceModel();
-		
-		
-		Set<IServiceProvider> providers = config.getFormerServiceProviders(fService1);
-		assertNotNull(providers);
-		assertEquals(2, providers.size());
-		Iterator<IServiceProvider> iter = providers.iterator();
-		
-		IServiceProvider disabledProvider = iter.next();
-		assertEquals(PROVIDER_A_1, disabledProvider.getId());
-		assertEquals("val1", disabledProvider.getString("key1", null));
-		assertEquals("val2", disabledProvider.getString("key2", null));
-		
-		disabledProvider = iter.next();
-		assertEquals(PROVIDER_A_2, disabledProvider.getId());
-		assertEquals("val1_2", disabledProvider.getString("key1", null));
-		
-		IServiceProvider provider = config.getServiceProvider(fService1);
-		assertEquals(PROVIDER_A_3, provider.getId());
-		assertEquals("provider3", provider.getString("key1", null));
-		
-		
-		addProvider(PROVIDER_A_1, fService1, config);
-		
-		
-		providers = config.getFormerServiceProviders(fService1);
-		assertNotNull(providers);
-		assertEquals(2, providers.size());
-		iter = providers.iterator();
-		
-		disabledProvider = iter.next();
-		assertEquals(PROVIDER_A_2, disabledProvider.getId());
-		assertEquals("val1_2", disabledProvider.getString("key1", null));
-		
-		disabledProvider = iter.next();
-		assertEquals(PROVIDER_A_3, disabledProvider.getId());
-		assertEquals("provider3", disabledProvider.getString("key1", null));
-		
-		
-		config.disable(fService1);
-		assertEquals(0, config.getServices().size());
-		
-		// should still remember the former providers even if the service is disabled
-		providers = config.getFormerServiceProviders(fService1);
-		assertNotNull(providers);
-		assertEquals(3, providers.size());
-	}
-	
-	@Test
-	public void testServiceCategories() {
-		Set<IServiceCategory> categories = ServiceModelManager.getInstance().getCategories();
-		assertNotNull(categories);
-		assertEquals(2, categories.size());
-	}
-	
-	@Test
-	public void testNullProvider() {
-		ServiceModelManager smm = ServiceModelManager.getInstance();
-		IService serviceA = smm.getService(SERVICE_A);
-		IService serviceB = smm.getService(SERVICE_B);
-		IServiceConfiguration config = smm.newServiceConfiguration("blah");
-		config.setServiceProvider(serviceA, null);
-		config.setServiceProvider(serviceB, null);
-		
-		assertNull(config.getServiceProvider(serviceA));
-		assertNotNull(config.getServiceProvider(serviceB));
-	}
-}
-
-
diff --git a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/ServicesConfigurationWizard.java b/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/ServicesConfigurationWizard.java
deleted file mode 100644
index fecfb12..0000000
--- a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/ServicesConfigurationWizard.java
+++ /dev/null
@@ -1,79 +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.test;
-
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ptp.services.ui.widgets.ServiceConfigurationSelectionWidget;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-
-public class ServicesConfigurationWizard extends Wizard {
-
-	private class SelectServiceConfigurationPage extends WizardPage {
-
-		private ServiceConfigurationSelectionWidget serviceConfigWidget;
-
-		public SelectServiceConfigurationPage(String pageName) {
-			super(pageName);
-			setTitle(pageName);
-			setDescription("Select or modify a service configuration"); //$NON-NLS-1$
-		}
-
-		public void createControl(Composite parent) {
-	        Composite composite = new Composite(parent, SWT.NULL);
-	        composite.setFont(parent.getFont());
-	        composite.setLayout(new GridLayout());
-	        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-	        
-	        serviceConfigWidget = new ServiceConfigurationSelectionWidget(composite, SWT.NONE);
-	        GridData data = new GridData(GridData.FILL_BOTH);
-	        data.heightHint = 200;
-	        serviceConfigWidget.setLayoutData(data);
-	        serviceConfigWidget.addSelectionChangedListener(new ISelectionChangedListener() {
-				public void selectionChanged(SelectionChangedEvent event) {
-					setPageComplete(serviceConfigWidget.getSelectedConfiguration() != null);
-				}
-	        });
-
-			setControl(composite);
-			setPageComplete(false);
-		}
-	}
-
-	/*
-	 * Constructor used when creating a new resource manager.
-	 */
-	public ServicesConfigurationWizard() {
-		setForcePreviousAndNextButtons(true);
-		addPage(new SelectServiceConfigurationPage("Service Configurations")); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	@Override
-	public boolean performFinish() {
-		return true;
-	}
-}
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 66ef7d9..0000000
--- a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/TestServiceProvider.java
+++ /dev/null
@@ -1,21 +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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.services.test;
-
-import org.eclipse.ptp.services.core.ServiceProvider;
-
-public class TestServiceProvider extends ServiceProvider {
-
-	public boolean isConfigured() {
-		return true;
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/handlers/LaunchWizardHandler.java b/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/handlers/LaunchWizardHandler.java
deleted file mode 100644
index a36e9e1..0000000
--- a/core/org.eclipse.ptp.services.test/src/org/eclipse/ptp/services/test/handlers/LaunchWizardHandler.java
+++ /dev/null
@@ -1,42 +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.test.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.test.ServicesConfigurationWizard;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- */
-public class LaunchWizardHandler extends AbstractHandler {
-	/**
-	 * 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);
-		ServicesConfigurationWizard wizard = new ServicesConfigurationWizard();
-		WizardDialog dialog = new WizardDialog(window.getShell(), wizard);
-		dialog.open();
-		return null;
-	}
-}
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 350e949..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.ServicesUIPlugin
-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.messages,
- org.eclipse.ptp.services.ui.widgets,
- 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 060c911..0000000
--- a/core/org.eclipse.ptp.services.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               icons/
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/icons/etool16/service-category.gif b/core/org.eclipse.ptp.services.ui/icons/etool16/service-category.gif
deleted file mode 100644
index ee7c485..0000000
--- a/core/org.eclipse.ptp.services.ui/icons/etool16/service-category.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.services.ui/icons/etool16/service-disabled.gif b/core/org.eclipse.ptp.services.ui/icons/etool16/service-disabled.gif
deleted file mode 100644
index 3986a4b..0000000
--- a/core/org.eclipse.ptp.services.ui/icons/etool16/service-disabled.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.services.ui/icons/etool16/service.gif b/core/org.eclipse.ptp.services.ui/icons/etool16/service.gif
deleted file mode 100644
index c984fba..0000000
--- a/core/org.eclipse.ptp.services.ui/icons/etool16/service.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.services.ui/icons/obj16/service_configuration_obj.gif b/core/org.eclipse.ptp.services.ui/icons/obj16/service_configuration_obj.gif
deleted file mode 100644
index c984fba..0000000
--- a/core/org.eclipse.ptp.services.ui/icons/obj16/service_configuration_obj.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 80999a2..0000000
--- a/core/org.eclipse.ptp.services.ui/plugin.properties
+++ /dev/null
@@ -1,14 +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
-ServiceImportWizardCategory.name = Services
-ServiceConfigurationImportWizard.name = Service Configurations
-ServiceExportWizardCategory.name = Services
-ServiceConfigurationExportWizard.name = Service Configurations
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 5a9a277..0000000
--- a/core/org.eclipse.ptp.services.ui/plugin.xml
+++ /dev/null
@@ -1,149 +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>
-      <factory
-            adaptableType="org.eclipse.ptp.services.core.IService"
-            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>
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <category
-            id="org.eclipse.ptp.services.ui.importWizardCategory"
-            name="%ServiceImportWizardCategory.name">
-      </category>
-      <wizard
-            category="org.eclipse.ptp.services.ui.importWizardCategory"
-            class="org.eclipse.ptp.services.ui.wizards.ServiceConfigurationImportWizard"
-            icon="icons/obj16/service_configuration_obj.gif"
-            id="org.eclipse.ptp.services.ui.serviceConfigurationImportWizard"
-            name="%ServiceConfigurationImportWizard.name">
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <category
-            id="org.eclipse.ptp.services.ui.exportWizardCategory"
-            name="%ServiceExportWizardCategory.name">
-      </category>
-      <wizard
-            category="org.eclipse.ptp.services.ui.exportWizardCategory"
-            class="org.eclipse.ptp.services.ui.wizards.ServiceConfigurationExportWizard"
-            icon="icons/obj16/service_configuration_obj.gif"
-            id="org.eclipse.ptp.services.ui.serviceConfigurationExportWizard"
-            name="%ServiceConfigurationExportWizard.name">
-      </wizard>
-   </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 6e604cf..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 minOccurs="1" maxOccurs="unbounded">
-            <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 c5e43ab..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceConfigurationWorkbenchAdapter.java
+++ /dev/null
@@ -1,69 +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.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#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 53fc101..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceModelWorkbenchAdapterFactory.java
+++ /dev/null
@@ -1,56 +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.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.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();
-	private static final ServiceWorkbenchAdapter SERVICE_WORKBENCH_ADAPTER =
-		new ServiceWorkbenchAdapter();
-
-	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;
-			}
-			if (adaptableObject instanceof IService) {
-				return SERVICE_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 8fd1bbb..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceProviderWorkbenchAdapter.java
+++ /dev/null
@@ -1,41 +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.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceModelManager;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ptp.services.ui.ServiceModelImages;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-public class ServiceProviderWorkbenchAdapter extends WorkbenchAdapter {
-	private IServiceModelManager fManager = ServiceModelManager.getInstance();
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getImageDescriptor(java.lang.Object)
-	 */
-	@Override
-	public ImageDescriptor getImageDescriptor(Object object) {
-		return ServiceModelImages.getImageDescriptor(ServiceModelImages.IMG_SERVICE);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getLabel(java.lang.Object)
-	 */
-	@Override
-	public String getLabel(Object object) {
-		IServiceProvider provider = (IServiceProvider)object;
-		IService service = fManager.getService(provider.getServiceId());
-		return service.getName() + " Service (" + provider.getName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceWorkbenchAdapter.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceWorkbenchAdapter.java
deleted file mode 100644
index 88f918d..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/internal/ui/adapters/ServiceWorkbenchAdapter.java
+++ /dev/null
@@ -1,34 +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.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.ui.ServiceModelImages;
-import org.eclipse.ui.model.WorkbenchAdapter;
-
-public class ServiceWorkbenchAdapter extends WorkbenchAdapter {
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getImageDescriptor(java.lang.Object)
-	 */
-	@Override
-	public ImageDescriptor getImageDescriptor(Object object) {
-		return ServiceModelImages.getImageDescriptor(ServiceModelImages.IMG_SERVICE_DISABLED);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.model.WorkbenchAdapter#getLabel(java.lang.Object)
-	 */
-	@Override
-	public String getLabel(Object object) {
-		return ((IService)object).getName() + " Service"; //$NON-NLS-1$
-	}
-}
\ No newline at end of file
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 4b479da..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/IServiceProviderContributor.java
+++ /dev/null
@@ -1,58 +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
- *******************************************************************************/
-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.Composite;
-
-/**
- * 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 {
-
-
-	/**
-	 * Creates a section on the service model properties page to configure the service provider.
-	 * The composite does not have a layout manager attached.
-	 * 
-	 * @param provider
-	 * @param composite
-	 */
-	public void configureServiceProvider(IServiceProvider provider, Composite composite);
-	
-	/**
-	 * 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 e70c28b..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceConfigurationPropertyPage.java
+++ /dev/null
@@ -1,348 +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.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-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.CoreException;
-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.widgets.NewServiceModelWidget;
-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.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 NewServiceModelWidget serviceModelWidget;
-
-	/**
-	 * 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;
-		RowLayout buttonLayout;
-		Composite serviceConfigurationPane;
-		Composite buttonPane;
-
-		eventHandler = new EventHandler();
-
-		// 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);
-		propertiesPane.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// 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(new GridData(GridData.FILL_BOTH));
-
-		serviceConfigurationList = new Table(serviceConfigurationPane, SWT.SINGLE);
-		serviceConfigurationList.setLayoutData(new GridData(GridData.FILL_BOTH));
-		serviceConfigurationList.setLinesVisible(true);
-		serviceConfigurationList.addSelectionListener(eventHandler);
-
-		// Create the pane which will contain the current service model
-		serviceModelPane = new Composite(propertiesPane, SWT.NONE);
-		serviceModelPane.setLayout(new GridLayout(1, false));
-		serviceModelPane.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		serviceModelWidget = new NewServiceModelWidget(serviceModelPane, SWT.NONE);
-		serviceModelWidget.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-
-		// 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);
-
-		// 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 Ok or Apply button is pressed
-	 * 
-	 * @return Status from superclass indicating if Ok processing is to continue
-	 */
-	public boolean performOk() {
-		deleteServiceConfigurations();
-		serviceModelWidget.applyChangesToConfiguration();
-		try {
-			ServiceModelManager.getInstance().saveModelConfiguration();
-		} catch (IOException e) {
-			ServicesUIPlugin.getDefault().log(e);
-		}
-		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;
-				
-				Set<String> natures = Collections.emptySet();
-				IProject project = (IProject) getElement().getAdapter(IProject.class);
-				if(project != null) {
-					try {
-						natures = new HashSet<String>(Arrays.asList(project.getDescription().getNatureIds()));
-					} catch (CoreException e) {
-						ServicesUIPlugin.getDefault().log(e);
-					}
-				}
-				serviceModelWidget.setServiceConfiguration(selectedConfig, natures);
-			}
-		}
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelImages.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelImages.java
deleted file mode 100644
index 4f3b73b..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelImages.java
+++ /dev/null
@@ -1,120 +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
- *******************************************************************************/
-package org.eclipse.ptp.services.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-
-public class ServiceModelImages {
-
-	// ==== URLs for Icon Folders ==== 
-	public final static URL ICON_URL = ServicesUIPlugin.getDefault().getBundle().getEntry("icons/etool16/"); //$NON-NLS-1$
-	
-	// ===== Icon Files =====
-	public static final String IMG_SERVICE = "service.gif"; //$NON-NLS-1$
-	public static final String IMG_SERVICE_CATEGORY = "service-category.gif"; //$NON-NLS-1$
-	public static final String IMG_SERVICE_DISABLED = "service-disabled.gif"; //$NON-NLS-1$
-	
-	private static ImageRegistry imageRegistry = null;
-
-	static {
-		createImageDescriptor(ICON_URL, IMG_SERVICE, IMG_SERVICE);
-		createImageDescriptor(ICON_URL, IMG_SERVICE_CATEGORY, IMG_SERVICE_CATEGORY);
-		createImageDescriptor(ICON_URL, IMG_SERVICE_DISABLED, IMG_SERVICE_DISABLED);
-	}
-	
-	/** 
-	 * Create an image descriptor and add it to the registry
-	 * 
-	 * @param iconURL url for image
-	 * @param key image name
-	 * @param name file name of image
-	 * @return image descriptor for image
-	 */
-	public static ImageDescriptor createImageDescriptor(URL iconURL, String key, String name) {
-		try {
-			ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(getIconURL(iconURL, name));
-			addImageDescriptor(key, imageDescriptor);
-			return imageDescriptor;
-		} catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-	
-	/** 
-	 * Get image from the registry
-	 * 
-	 * @param key image name
-	 * @return image
-	 */
-	public static Image getImage(String key) {
-		return getImageRegistry().get(key);
-	}
-	
-	/** 
-	 * Get image descriptor from the registry
-	 * 
-	 * @param key image name
-	 * @return image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String key) {
-		return getImageRegistry().getDescriptor(key);
-	}
-	
-	/** 
-	 * Add image descriptor to registry
-	 * 
-	 * @param key image name
-	 * @param imageDescriptor
-	 */
-	private static void addImageDescriptor(String key, ImageDescriptor imageDescriptor) {
-		getImageRegistry().put(key, imageDescriptor);
-	}
-		
-	/** 
-	 * Create URL for icon
-	 * 
-	 * @param baseURL base URL for icon
-	 * @param name name of icon file
-	 * @return URL pointing to icon file
-	 * @throws MalformedURLException
-	 */
-	private static URL getIconURL(URL baseURL, String name) throws MalformedURLException {
-		if (baseURL == null) {
-			throw new MalformedURLException();
-		}
-		return new URL(baseURL, name);
-	}
-	
-	/** 
-	 * Get the image registry
-	 * 
-	 * @return image registry
-	 */
-	private static ImageRegistry getImageRegistry() {
-		if (imageRegistry == null) {
-			imageRegistry = new ImageRegistry();
-		}
-		return imageRegistry;
-	}
-}
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 194f857..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServiceModelUIManager.java
+++ /dev/null
@@ -1,148 +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
- *******************************************************************************/
-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(ServicesUIPlugin.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) {
-							ServicesUIPlugin.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(ServicesUIPlugin.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())) {
-						if(element.getAttribute(ATTR_CLASS) != null) {
-							try {
-								return (IServiceProviderContributor) element.createExecutableExtension(ATTR_CLASS);
-							} catch (Exception e) {
-								ServicesUIPlugin.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(ServicesUIPlugin.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) {
-						ServicesUIPlugin.getDefault().log(e);
-						return null;
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * @param desc
-	 * @return
-	 * @deprecated
-	 */
-	public IServiceProviderConfiguration getServiceProviderConfigurationUI(IServiceProviderDescriptor desc) {
-		IServiceProviderConfiguration config = null;
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(ServicesUIPlugin.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/ServicesUIPlugin.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServicesUIPlugin.java
deleted file mode 100644
index 2381041..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/ServicesUIPlugin.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 ServicesUIPlugin 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 ServicesUIPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public ServicesUIPlugin() {
-	}
-
-	@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 ServicesUIPlugin 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/dialogs/ServiceConfigurationSelectionDialog.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/dialogs/ServiceConfigurationSelectionDialog.java
deleted file mode 100644
index 555b5c4..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/dialogs/ServiceConfigurationSelectionDialog.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 java.util.Set;
-
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.ptp.services.ui.widgets.ServiceConfigurationSelectionWidget;
-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.Shell;
-
-/**
- * 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 displayed.
- * 
- * @author dave
- * 
- */
-public class ServiceConfigurationSelectionDialog extends TitleAreaDialog {
-	private IServiceConfiguration selectedConfig;
-
-	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);
-		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;
-
-		setTitle(Messages.ServiceConfigurationSelectionDialog_0);
-		setMessage(Messages.ServiceConfigurationSelectionDialog_1, SWT.NONE);
-		
-		serviceConfigurationPane = new Composite(parent, SWT.NONE);
-		layout = new GridLayout(1, true);
-		serviceConfigurationPane.setLayout(layout);
-		serviceConfigurationPane.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
-		Composite widget = new ServiceConfigurationSelectionWidget(serviceConfigurationPane, SWT.NONE, 
-				currentServiceConfigurations, null, false);
-		widget.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		return widget;
-	}
-
-	/**
-	 * Return the service configuration selected by the user
-	 * 
-	 * @return Selected service configuration
-	 */
-	public IServiceConfiguration getSelectedConfiguration() {
-		return selectedConfig;
-	}
-}
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/messages/Messages.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/Messages.java
deleted file mode 100644
index 433c2f8..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/Messages.java
+++ /dev/null
@@ -1,128 +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 NewServiceModelWidget_0;
-	public static String NewServiceModelWidget_1;
-	public static String NewServiceModelWidget_2;
-	public static String NewServiceModelWidget_3;
-
-	public static String RemoveServiceConfigurationAction_0;
-	public static String RemoveServiceConfigurationAction_1;
-
-	public static String SelectActiveServiceConfigurationAction_0;
-
-	public static String ServiceConfigurationExportWizard_0;
-	public static String ServiceConfigurationExportWizard_1;
-	public static String ServiceConfigurationExportWizard_4;
-	public static String ServiceConfigurationExportWizard_5;
-	public static String ServiceConfigurationExportWizard_6;
-	public static String ServiceConfigurationExportWizard_7;
-	public static String ServiceConfigurationExportWizard_8;
-	public static String ServiceConfigurationExportWizard_9;
-	public static String ServiceConfigurationExportWizard_10;
-	public static String ServiceConfigurationExportWizard_11;
-	public static String ServiceConfigurationExportWizard_13;
-	public static String ServiceConfigurationExportWizard_14;
-	public static String ServiceConfigurationExportWizard_15;
-
-	public static String ServiceConfigurationImportWizard_0;
-	public static String ServiceConfigurationImportWizard_1;
-	public static String ServiceConfigurationImportWizard_2;
-	public static String ServiceConfigurationImportWizard_3;
-	public static String ServiceConfigurationImportWizard_4;
-	public static String ServiceConfigurationImportWizard_5;
-	public static String ServiceConfigurationImportWizard_6;
-	public static String ServiceConfigurationImportWizard_7;
-	public static String ServiceConfigurationImportWizard_8;
-	public static String ServiceConfigurationImportWizard_9;
-	public static String ServiceConfigurationImportWizard_10;
-	public static String ServiceConfigurationImportWizard_11;
-	public static String ServiceConfigurationImportWizard_12;
-	public static String ServiceConfigurationImportWizard_13;
-
-	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 ServiceConfigurationSelectionWidget_0;
-	public static String ServiceConfigurationSelectionWidget_1;
-	public static String ServiceConfigurationSelectionWidget_2;
-	public static String ServiceConfigurationSelectionWidget_3;
-	public static String ServiceConfigurationSelectionWidget_4;
-	public static String ServiceConfigurationSelectionWidget_9;
-	public static String ServiceConfigurationSelectionWidget_10;
-	public static String ServiceConfigurationSelectionWidget_11;
-	public static String ServiceConfigurationSelectionWidget_12;
-	public static String ServiceConfigurationSelectionWidget_13;
-
-	public static String ServiceConfigurationSelectionWidget_14;
-
-	public static String ServiceConfigurationSelectionWidget_5;
-
-	public static String ServiceConfigurationSelectionWidget_6;
-
-	public static String ServiceConfigurationSelectionWidget_7;
-
-	public static String ServiceConfigurationSelectionWidget_8;
-	
-	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 NewServiceModelWidgetDialog_title;
-
-	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 9107e89..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/messages/messages.properties
+++ /dev/null
@@ -1,80 +0,0 @@
-NewServiceModelWidget_0=Available Services
-NewServiceModelWidget_1=Enable Service
-NewServiceModelWidget_2=Service Provider:
-NewServiceModelWidget_3=Additional Services
-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
-ServiceConfigurationExportWizard_0=Export the service configuration
-ServiceConfigurationExportWizard_1=Select the service configurations to export:
-ServiceConfigurationExportWizard_10=Export the service configuration file.
-ServiceConfigurationExportWizard_11=Export a Service Configuration
-ServiceConfigurationExportWizard_13=Service Configuration
-ServiceConfigurationExportWizard_14=Confirm Overwrite
-ServiceConfigurationExportWizard_15=File already exists. Are you sure you want to overwrite it?
-ServiceConfigurationExportWizard_4=File name:
-ServiceConfigurationExportWizard_5=Browse...
-ServiceConfigurationExportWizard_6=Service Configuration Files (*.cfg)
-ServiceConfigurationExportWizard_7=serviceConfigurations.cfg
-ServiceConfigurationExportWizard_8=Please specify the destination file.
-ServiceConfigurationExportWizard_9=You have specified a folder.
-ServiceConfigurationImportWizard_0=Importing...
-ServiceConfigurationImportWizard_1=Import service configurations from a file
-ServiceConfigurationImportWizard_10=Service Configuration
-ServiceConfigurationImportWizard_11=Import Service Configurations
-ServiceConfigurationImportWizard_12=Select service configurations to import:
-ServiceConfigurationImportWizard_13=The specified file is not a valid service configuration file.
-ServiceConfigurationImportWizard_2=File name:
-ServiceConfigurationImportWizard_3=Browse...
-ServiceConfigurationImportWizard_4=Service Configuration Files (*.cfg)
-ServiceConfigurationImportWizard_5=All Files (*.*)
-ServiceConfigurationImportWizard_6=Please specify a file to import.
-ServiceConfigurationImportWizard_7=The specified file does not exist.
-ServiceConfigurationImportWizard_8=You have specified a folder.
-ServiceConfigurationImportWizard_9=Import the service configuration file.
-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
-ServiceConfigurationSelectionWidget_0=Service Configurations:
-ServiceConfigurationSelectionWidget_1=Add...
-ServiceConfigurationSelectionWidget_2=Add Service Configuration
-ServiceConfigurationSelectionWidget_3=Enter a name for the service configuration:
-ServiceConfigurationSelectionWidget_4=Remove
-ServiceConfigurationSelectionWidget_9=Remove Service Configuration
-ServiceConfigurationSelectionWidget_10=Are you sure you want to remove the service configuration(s) {0}?
-ServiceConfigurationSelectionWidget_11=Rename
-ServiceConfigurationSelectionWidget_12=Rename Service Configuration
-ServiceConfigurationSelectionWidget_13=Enter a new name for the new service configuration:
-ServiceConfigurationSelectionWidget_14=Not Configured
-ServiceConfigurationSelectionWidget_5=Select All
-ServiceConfigurationSelectionWidget_6=Deselect All
-ServiceConfigurationSelectionWidget_7=Configuration Name
-ServiceConfigurationSelectionWidget_8=\ Service
-ServiceConfigurationWizard_1=Service Configuration Wizard
-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\!
-NewServiceModelWidgetDialog_title=Edit Service Configuration
-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 be401cf..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/preferences/ServiceConfigurationPreferencePage.java
+++ /dev/null
@@ -1,478 +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.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-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.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 = new ArrayList<IServiceConfiguration>();
-	private Map<String, IServiceConfiguration> addedServiceConfigurations = new HashMap<String, IServiceConfiguration>();
-	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());
-			addedServiceConfigurations.put(config.getId(), config);
-		}
-	}
-
-	/**
-	 * 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;
-	}
-
-	/**
-	 * Add/remove selected service configurations from the set of service
-	 * configurations known to the service model manager
-	 */
-	private void updateServiceConfigurations() {
-		for (IServiceConfiguration config : deletedServiceConfigurations) {
-			if (addedServiceConfigurations.containsKey(config.getId())) {
-				addedServiceConfigurations.remove(config.getId());
-			} else {
-				ServiceModelManager.getInstance().remove(config);
-			}
-		}
-		deletedServiceConfigurations.clear();
-		for (IServiceConfiguration config : addedServiceConfigurations.values()) {
-			ServiceModelManager.getInstance().addConfiguration(config);
-		}
-	}
-
-	/**
-	 * 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() {
-		updateServiceConfigurations();
-		super.performApply();
-	}
-
-	/**
-	 * Delete service configurations when Ok button is pressed
-	 * 
-	 * @return Status from superclass indicating if Ok processing is to continue
-	 */
-	public boolean performOk() {
-		updateServiceConfigurations();
-		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/widgets/NewServiceModelWidget.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/NewServiceModelWidget.java
deleted file mode 100644
index 00950dd..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/NewServiceModelWidget.java
+++ /dev/null
@@ -1,465 +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.widgets;
-
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.SortedSet;
-import java.util.TreeMap;
-import java.util.TreeSet;
-
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.IServiceCategory;
-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.internal.core.ServiceConfiguration;
-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.custom.StackLayout;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-public class NewServiceModelWidget extends Composite {
-	
-	// Keys for data attached to TreeItems that represent services
-	private static final String SERVICE_KEY = "service";   // IService //$NON-NLS-1$
-	private static final String DISABLED_KEY = "disabled"; // Boolean //$NON-NLS-1$
-	private static final String PROVIDER_KEY = "provider"; // IServiceProvider //$NON-NLS-1$
-	
-
-	private IServiceConfiguration configuration;
-
-	private Tree servicesTree;
-	private Button enabledCheckbox;
-	private Combo providerCombo;
-	private Composite configurationComposite;
-	private Composite providerComposite;
-	private StackLayout stackLayout;
-	
-	private Image enabledIcon;
-	private Image disabledIcon;
-	private Image configIcon;
-	
-	private Map<String,IServiceProvider> providerMap = new HashMap<String,IServiceProvider>();
-	
-	
-	public NewServiceModelWidget(Composite parent, int style) {
-		super(parent, style);
-		setLayout(new GridLayout(2, false));
-
-		Label label = new Label(this, SWT.NONE);
-		label.setLayoutData(new GridData());
-		label.setText(Messages.NewServiceModelWidget_0);
-		
-		Label filler = new Label(this, SWT.NONE); 
-		filler.setLayoutData(new GridData());
-		filler.setText(""); //$NON-NLS-1$
-		
-		Composite left = new Composite(this, SWT.NONE);
-		GridData data = new GridData(GridData.FILL_VERTICAL);
-		data.widthHint = 200;
-		left.setLayoutData(data);
-		GridLayout layout = new GridLayout(1, false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		left.setLayout(layout);
-		
-		servicesTree = new Tree(left, SWT.BORDER  | SWT.SINGLE);
-		servicesTree.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		servicesTree.addSelectionListener(new SelectionAdapter() {
-			@Override public void widgetSelected(SelectionEvent e) {
-				displayService(servicesTree.getSelection()[0]);
-			}
-		});
-		
-		providerComposite = new Composite(this, SWT.NONE);
-		providerComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		providerComposite.setLayout(new GridLayout(1, false));
-		
-		enabledCheckbox = new Button(providerComposite, SWT.CHECK);
-		enabledCheckbox.setText(Messages.NewServiceModelWidget_1);
-		enabledCheckbox.setLayoutData(new GridData());
-		enabledCheckbox.addSelectionListener(new SelectionAdapter() {
-			@Override public void widgetSelected(SelectionEvent e) {
-				boolean checked = enabledCheckbox.getSelection();
-				changeServiceState(!checked);
-			}
-		});
-		enabledCheckbox.setEnabled(false);
-		
-		Label provider = new Label(providerComposite, SWT.NONE);
-		provider.setText(Messages.NewServiceModelWidget_2);
-		provider.setLayoutData(new GridData());
-		provider.setEnabled(false);
-		
-		providerCombo = new Combo(providerComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
-		data = new GridData(GridData.FILL_HORIZONTAL);
-		data.widthHint = 250;
-		providerCombo.setLayoutData(data);
-		providerCombo.addSelectionListener(new SelectionAdapter() {
-			@Override public void widgetSelected(SelectionEvent e) {
-				IServiceProviderDescriptor[] descriptors = (IServiceProviderDescriptor[]) providerCombo.getData();
-				selectProvider(descriptors[providerCombo.getSelectionIndex()]);
-			}
-		});
-		providerCombo.setEnabled(false);
-		
-		Label separator = new Label(providerComposite, SWT.SEPARATOR | SWT.SHADOW_OUT | SWT.HORIZONTAL);
-		separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
-		configurationComposite = new Composite(providerComposite, SWT.NONE);
-		data = new GridData(GridData.FILL_BOTH);
-		data.horizontalSpan = 2;
-		configurationComposite.setLayoutData(data);
-		stackLayout = new StackLayout();
-		stackLayout.marginHeight = 0;
-		stackLayout.marginWidth = 0;
-		configurationComposite.setLayout(stackLayout);
-
-		// TODO make this better using an ImageRegistry
-		enabledIcon  = new Image(getDisplay(), getClass().getResourceAsStream("/icons/etool16/service.gif")); //$NON-NLS-1$
-		disabledIcon = new Image(getDisplay(), getClass().getResourceAsStream("/icons/etool16/service-disabled.gif")); //$NON-NLS-1$
-		configIcon   = new Image(getDisplay(), getClass().getResourceAsStream("/icons/etool16/service-category.gif")); //$NON-NLS-1$
-		
-		addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				enabledIcon.dispose();
-				disabledIcon.dispose();
-				configIcon.dispose();
-			}
-		});
-	}
-	
-	
-	
-	/**
-	 * Causes the tree to display all the services that are available
-	 * in the system. Services that are not part of the given service
-	 * configuration will be shown as disabled. Services that are part
-	 * of the given configuration will show as enabled.
-	 * 
-	 * Any changes made by the user will only be applied to the given configuration 
-	 * when the applyChangesToConfiguration() method is called.
-	 */
-	public void setServiceConfiguration(IServiceConfiguration conf) {
-		setServiceConfiguration(conf, null);
-	}
-
-
-	/**
-	 * Causes the tree to display all the services that are available
-	 * in the system. Services that are not part of the given service
-	 * configuration will be shown as disabled. Services that are part
-	 * of the given configuration will show as enabled.
-	 * 
-	 * Any changes made by the user will only be applied to the given configuration 
-	 * when the applyChangesToConfiguration() method is called.
-	 * 
-	 * Additionally the services tree will be filtered to exclude services
-	 * that do not apply to the given set of project nature IDs. This is
-	 * useful when the widget is used as part of a project properties page
-	 * as only the services that apply to the project will be shown.
-	 */
-	public void setServiceConfiguration(IServiceConfiguration configuration, Set<String> natureIds) {
-		this.configuration = configuration;
-		createTreeContent(natureIds);
-		displayService(null);
-	}
-	
-	
-	/**
-	 * Returns the service configuration object that is being displayed
-	 * by this widget. In order for the changes made by the user to be 
-	 * reflected in the configuration the applyChangesToConfiguration() method
-	 * must be called first.
-	 */
-	public IServiceConfiguration getServiceConfiguration() {
-		return configuration;
-	}
-	
-	
-	private void displayService(TreeItem serviceTreeItem) {
-		// Each tree item represents a service
-		IService service = null;
-		if(serviceTreeItem != null)
-			service = (IService) serviceTreeItem.getData(SERVICE_KEY);
-		
-		// clear everything out
-		providerCombo.removeAll();
-		for(Control child : providerComposite.getChildren())
-			child.setEnabled(service != null);
-		
-		// if the user selected a category node then clear out the composite too and quit
-		if(service == null) {
-			stackLayout.topControl = null;
-			configurationComposite.layout();
-			return;
-		}
-		
-		// get the service provider that has been selected
-		IServiceProvider provider = (IServiceProvider) serviceTreeItem.getData(PROVIDER_KEY);
-		if(provider == null && !configuration.isDisabled(service)) {
-			provider = configuration.getServiceProvider(service);
-		}
-		
-		// populate the provider combo
-		Set<IServiceProviderDescriptor> providers = service.getProviders();
-		// it's possible there are no providers
-		if (providers.size() == 0) {
-			return;
-		}
-		IServiceProviderDescriptor[] descriptors = providers.toArray(new IServiceProviderDescriptor[0]);
-		Arrays.sort(descriptors, PROVIDER_COMPARATOR);
-		
-		int selection = 0;
-		for(int i = 0; i < descriptors.length; i++) {
-			providerCombo.add(descriptors[i].getName());
-			if(provider != null && provider.getId().equals(descriptors[i].getId()))
-				selection = i;
-		}
-		providerCombo.setData(descriptors);
-		providerCombo.select(selection);
-		
-		// set the enabled/disabled state appropriately
-		boolean disabled = Boolean.TRUE.equals(serviceTreeItem.getData(DISABLED_KEY));
-		providerCombo.setEnabled(!disabled);
-		enabledCheckbox.setSelection(!disabled);
-		
-		if(disabled) {
-			// this is easier than disabling the provider composite
-			stackLayout.topControl = null;
-			configurationComposite.layout();
-		}
-		else {
-			selectProvider(descriptors[selection]);
-		}
-	}
-	
-	
-	private void selectProvider(IServiceProviderDescriptor descriptor) {
-		TreeItem serviceTreeItem = servicesTree.getSelection()[0];
-		IServiceProvider newProvider = providerMap.get(descriptor.getId());
-		if(newProvider == null) {
-			newProvider = ServiceModelManager.getInstance().getServiceProvider(descriptor);
-			providerMap.put(newProvider.getId(), newProvider);
-			
-			IService service = (IService) serviceTreeItem.getData(SERVICE_KEY);
-			IServiceProvider existingProvider = getExistingProvider(newProvider.getId(), service);
-			if(existingProvider != null) {
-				for(String key : existingProvider.keySet()) {
-					newProvider.putString(key, existingProvider.getString(key, null));
-				}
-			}
-		}
-		
-		serviceTreeItem.setData(PROVIDER_KEY, newProvider);
-		
-		Composite comp = new Composite(configurationComposite, SWT.NONE);
-		GridLayout layout = new GridLayout(1,false);
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		comp.setLayout(layout);
-		
-		ServiceModelUIManager uim = ServiceModelUIManager.getInstance();
-		IServiceProviderContributor contributor = uim.getServiceProviderContributor(descriptor);
-		
-		if(contributor != null) {
-			contributor.configureServiceProvider(newProvider, comp);
-		}
-		
-		stackLayout.topControl = comp;
-		configurationComposite.layout();
-	}
-
-	
-	/**
-	 * Returns the active provider if there is one or returns
-	 * one of the former providers if possible.
-	 */
-	private IServiceProvider getExistingProvider(String providerId, IService service) {
-		IServiceProvider setProvider = configuration.getServiceProvider(service);
-		if(setProvider != null && providerId.equals(setProvider.getId()))
-			return setProvider;
-		
-		if(configuration instanceof ServiceConfiguration) {
-			for(IServiceProvider formerProvider : ((ServiceConfiguration)configuration).getFormerServiceProviders(service)) {
-				if(providerId.equals(formerProvider.getId())) {
-					return formerProvider;
-				}
-			}
-		}
-		return null;
-	}
-	
-	
-	protected void changeServiceState(boolean disabled) {
-		TreeItem serviceTreeItem = servicesTree.getSelection()[0];
-		serviceTreeItem.setData(DISABLED_KEY, disabled);		
-		serviceTreeItem.setImage(disabled ? disabledIcon : enabledIcon);
-		displayService(serviceTreeItem);
-	}
-	
-	
-	private void createTreeContent(Set<String> filterNatureIds) {
-		servicesTree.removeAll();
-		if(configuration == null)
-			return;
-		
-		if(filterNatureIds == null)
-			filterNatureIds = Collections.emptySet();
-		
-		SortedSet<IService> defaultCategoryServices = new TreeSet<IService>(SERVICE_COMPARATOR);
-		SortedMap<IServiceCategory, SortedSet<IService>> categoryServices = new TreeMap<IServiceCategory, SortedSet<IService>>(CATEGORY_COMPARATOR);
-		
-		for(IService service : ServiceModelManager.getInstance().getServices()) {
-			if(filterOut(service.getNatures(), filterNatureIds))
-				continue;
-			
-			IServiceCategory category = service.getCategory();
-			if(category == null) {
-				defaultCategoryServices.add(service);
-			}
-			else {
-				SortedSet<IService> services = categoryServices.get(category);
-				if(services == null) {
-					services = new TreeSet<IService>(SERVICE_COMPARATOR);
-					categoryServices.put(category, services);
-				}
-				services.add(service);
-			}
-		}
-		
-		for(Map.Entry<IServiceCategory,SortedSet<IService>> entry : categoryServices.entrySet()) {
-			TreeItem parent = createTreeCategory(servicesTree, entry.getKey());
-			for(IService service : entry.getValue()) {
-				createTreeService(parent, service);
-			}
-			parent.setExpanded(true);
-		}
-		
-		if(!defaultCategoryServices.isEmpty()) {
-			TreeItem parent = createTreeCategory(servicesTree, null);
-			for(IService service : defaultCategoryServices) {
-				createTreeService(parent, service);
-			}
-			parent.setExpanded(true);
-		}
-	}
-	
-	private static boolean filterOut(Set<String> serviceIds, Set<String> filterIds) {
-		if(serviceIds.isEmpty() || filterIds.isEmpty())
-			return false;
-
-		for(String id : serviceIds) {
-			if(filterIds.contains(id)) {
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	private TreeItem createTreeCategory(Tree parent, IServiceCategory category) {
-		TreeItem item = new TreeItem(servicesTree, SWT.NONE);
-		item.setText(category == null ? Messages.NewServiceModelWidget_3 : category.getName());
-		item.setImage(configIcon);
-		return item;
-	}
-	
-	private void createTreeService(TreeItem parent, IService service) {
-		boolean disabled = configuration.isDisabled(service);
-		TreeItem child = new TreeItem(parent, SWT.NONE);
-		child.setText(service.getName());
-		child.setData(SERVICE_KEY, service);
-		child.setData(DISABLED_KEY, disabled);
-		child.setImage(disabled ? disabledIcon : enabledIcon);
-	}
-	
-	
-	public void applyChangesToConfiguration() {
-		if(configuration == null)
-			return;
-		
-		for(TreeItem categoryTreeItem : servicesTree.getItems()) {
-			for(TreeItem serviceTreeItem : categoryTreeItem.getItems()) {
-				IService service = (IService) serviceTreeItem.getData(SERVICE_KEY);
-				boolean disabled = Boolean.TRUE.equals(serviceTreeItem.getData(DISABLED_KEY));
-				
-				if(disabled) {
-					configuration.disable(service);
-				}
-				else {
-					// TODO check if the state of the new service provider is actually different from the current one
-					// no need to fire bogus change events
-					IServiceProvider serviceProvider = (IServiceProvider) serviceTreeItem.getData(PROVIDER_KEY);
-					if(serviceProvider != null)
-						configuration.setServiceProvider(service, serviceProvider);
-				}
-			}
-		}
-	}
-	
-	
-	
-	private static Comparator<IServiceCategory> CATEGORY_COMPARATOR = new Comparator<IServiceCategory>() {
-		public int compare(IServiceCategory x, IServiceCategory y) {
-			return x.getName().compareTo(y.getName());
-		}
-	};
-	
-	private static Comparator<IService> SERVICE_COMPARATOR = new Comparator<IService>() {
-		public int compare(IService x, IService y) {
-			return comparePriorities(x.getPriority(), y.getPriority(), x.getName(), y.getName());
-		}
-	};
-	
-	private static Comparator<IServiceProviderDescriptor> PROVIDER_COMPARATOR = new Comparator<IServiceProviderDescriptor>() {
-		public int compare(IServiceProviderDescriptor x, IServiceProviderDescriptor y) {
-			return comparePriorities(x.getPriority(), y.getPriority(), x.getName(), y.getName());
-		}
-	};
-	
-	private static int comparePriorities(Integer p1, Integer p2, String name1, String name2) {
-		// sort by priority but fall back on sorting alphabetically
-		if(p1 == null && p2 == null)
-			return name1.compareTo(name2);
-		if(p1 == null)
-			return -1;
-		if(p2 == null)
-			return 1;
-		if (p1.equals(p2)) {
-			return name1.compareTo(name2);
-		}
-		return p1.compareTo(p2);
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/NewServiceModelWidgetDialog.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/NewServiceModelWidgetDialog.java
deleted file mode 100644
index 4933fd5..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/NewServiceModelWidgetDialog.java
+++ /dev/null
@@ -1,71 +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:
- *    Mike Kucera (IBM Corporation) - initial API and implementation
- *******************************************************************************/ 
-package org.eclipse.ptp.services.ui.widgets;
-
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.IShellProvider;
-
-import org.eclipse.ptp.services.core.IServiceConfiguration;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Launches a dialog that contains the NewServiceModelWidget
- * with OK and Cancel buttons.
- */
-public class NewServiceModelWidgetDialog extends Dialog {
-
-	private NewServiceModelWidget serviceModelWidget;
-	private IServiceConfiguration config;
-	
-	
-	public NewServiceModelWidgetDialog(IShellProvider parentShell, IServiceConfiguration config) {
-		super(parentShell);
-		this.config = config;
-	}
-
-	public NewServiceModelWidgetDialog(Shell parentShell, IServiceConfiguration config) {
-		super(parentShell);
-		this.config = config;
-	}
-	
-	
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(Messages.NewServiceModelWidgetDialog_title);
-	}
-	
-	
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		
-		serviceModelWidget = new NewServiceModelWidget(dialogArea, SWT.NONE);
- 		serviceModelWidget.setServiceConfiguration(config);
- 		GridData data = new GridData(GridData.FILL_BOTH);
- 		data.minimumHeight = 400;
- 		serviceModelWidget.setLayoutData(data);
- 		return serviceModelWidget;
-	}
-
-
-	@Override
-	protected void okPressed() {
-		serviceModelWidget.applyChangesToConfiguration();
-		super.okPressed();
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/ServiceConfigurationSelectionWidget.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/ServiceConfigurationSelectionWidget.java
deleted file mode 100644
index 48d053c..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/ServiceConfigurationSelectionWidget.java
+++ /dev/null
@@ -1,503 +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.widgets;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.layout.PixelConverter;
-import org.eclipse.jface.layout.TableColumnLayout;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-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.ServiceModelManager;
-import org.eclipse.ptp.services.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-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.Table;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
- * Standard widget for selecting a service configuration.
- * 
- * Displays a table view of service configurations so that the user can easily
- * see what services and providers are available in the configuration.
- * 
- * Provides "Add...", "Remove", and "Rename" buttons to allow the creation,
- * removal and renaming of service configurations. These buttons can be
- * enabled/disabled by using the <code>buttons</code> constructor parameter.
- * 
- * The <code>excluded</code> constructor parameter can be used to supply a list
- * of configurations to be exclude from the list.
- * 
- * The whole control can be enabled/disabled using the <code>setEnabled</code> method.
- * 
- */
-public class ServiceConfigurationSelectionWidget extends Composite implements ISelectionProvider {
-	/**
-	 * Comparator class used to sort service configurations in ascending order
-	 * by name
-	 */
-	private class ServiceConfigurationComparator extends ViewerComparator {
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-		 */
-		public int compare(Viewer viewer, Object o1, Object o2) {
-			if (o1 instanceof IServiceConfiguration && o2 instanceof IServiceConfiguration) {
-				return ((IServiceConfiguration)o1).getName().compareToIgnoreCase(((IServiceConfiguration)o2).getName());
-			}
-			
-			return super.compare(viewer, o1, o2);
-		}
-	}
-	
-	/**
-	 * Content provider for service configurations
-	 */
-	private class ServiceConfigurationContentProvider extends WorkbenchContentProvider {
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.ui.model.BaseWorkbenchContentProvider#getChildren(java.lang.Object)
-		 */
-		@Override
-		public Object[] getChildren(Object element) {
-			List<IServiceConfiguration> children = new ArrayList<IServiceConfiguration>();
-			if (fDisplayConfigs == null) {
-				children.addAll(ServiceModelManager.getInstance().getConfigurations());
-			} else {
-				children.addAll(Arrays.asList(fDisplayConfigs));
-			}
-			if (fExcludedConfigs != null) {
-				children.removeAll(fExcludedConfigs);
-			}
-			return children.toArray();
-		}
-	}
-
-	private final static int TABLE_WIDTH = 400;
-	private final static int TABLE_HEIGHT = 250;
-	private final static int BUTTON_WIDTH = 110;
-	
-	private final ListenerList fSelectionListeners = new ListenerList();
-	private final IServiceModelManager fManager = ServiceModelManager.getInstance();
-	
-	private TableViewer fTableViewer;
-	private Table fTable;
-	private TableColumnLayout fTableLayout;
-	private Button fAddButton;
-	private Button fRemoveButton;
-	private Button fRenameButton;
-	private Button fSelectAllButton;
-	private Button fDeselectAllButton;
-	
-	private ISelection fSelection;
-	private boolean fEnabled = true;
-	private boolean fButtonsVisible = true;
-	private boolean fUseCheckboxes = false;
-	private Set<IService> fServices = null;
-	private Set<IServiceConfiguration> fExcludedConfigs = null;
-	private IServiceConfiguration[] fDisplayConfigs = null;
-	private IServiceConfiguration fSelectedConfig = null;
-
-	public ServiceConfigurationSelectionWidget(Composite parent, int style) {
-		this (parent, style, null, null, true);
-	}
-	
-	public ServiceConfigurationSelectionWidget(Composite parent, int style, 
-			Set<IServiceConfiguration> excluded, Set<IService> services, boolean enableButtons) {
-		super(parent, style);
-		
-		fServices = services;
-		fUseCheckboxes = ((style & SWT.CHECK) == SWT.CHECK);
-		
-		if (enableButtons && !fUseCheckboxes) {
-			setLayout(new GridLayout(2, false));
-		} else {
-			setLayout(new GridLayout(1, false));
-		}
-		setLayoutData(new GridData(GridData.FILL_BOTH | GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-
-		Composite tableComposite = new Composite(this, SWT.NONE);
-		fTableLayout = new TableColumnLayout();
-		tableComposite.setLayout(fTableLayout);
-		tableComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
-		
-		if (fUseCheckboxes) {
-			fTable = new Table(tableComposite, SWT.CHECK | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-			fTableViewer = new CheckboxTableViewer(fTable);
-			((CheckboxTableViewer)fTableViewer).addCheckStateListener(new ICheckStateListener() {
-				public void checkStateChanged(CheckStateChangedEvent event) {
-					updateControls();
-				}
-			});
-		} else {
-			fTableViewer = new TableViewer(tableComposite, SWT.MULTI | SWT.BORDER | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-			fTable = fTableViewer.getTable();
-		}
-		
-		fTable.setLayout(new TableLayout());
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.heightHint = TABLE_HEIGHT;
-		data.widthHint = TABLE_WIDTH;
-		fTable.setLayoutData(data);
-		
-		/*
-		 * Only add headers if there is more than one column
-		 */
-		if (fServices != null) {
-			fTable.setHeaderVisible(true);
-		}
-
-		fTableViewer.setContentProvider(new ServiceConfigurationContentProvider());
-		fTableViewer.setLabelProvider(new WorkbenchLabelProvider());
-		fTableViewer.setComparator(new ServiceConfigurationComparator());
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				notifySelection(fTableViewer.getSelection());
-				updateControls();
-			}
-		});
-		
-		createColumns();
-		
-		fTableViewer.setInput(this);
-		
-		if (enableButtons && !fUseCheckboxes) {
-			Composite buttonsComp = new Composite(this, SWT.NONE);
-			buttonsComp.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
-			buttonsComp.setLayout(new GridLayout(1, false));
-		
-			fAddButton = new Button(buttonsComp, SWT.PUSH);
-			data = new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1);
-			data.widthHint = BUTTON_WIDTH;
-			fAddButton.setLayoutData(data);
-			fAddButton.setText(Messages.ServiceConfigurationSelectionWidget_1);
-			fAddButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					InputDialog dialog = new InputDialog(fAddButton.getShell(), Messages.ServiceConfigurationSelectionWidget_2, 
-							Messages.ServiceConfigurationSelectionWidget_3, null, null);
-					if (dialog.open() == InputDialog.OK) {
-						IServiceConfiguration config = fManager.newServiceConfiguration(dialog.getValue());
-						fManager.addConfiguration(config);
-						fTableViewer.refresh();
-					}
-				}
-			});
-			
-			fRemoveButton = new Button(buttonsComp, SWT.PUSH);
-			fRemoveButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-			fRemoveButton.setText(Messages.ServiceConfigurationSelectionWidget_4);
-			fRemoveButton.setEnabled(false);
-			fRemoveButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					IStructuredSelection selection = (IStructuredSelection)fTableViewer.getSelection();
-					if (!selection.isEmpty()) {
-						Object[] configs = (Object[])selection.toArray();
-						String names = ""; //$NON-NLS-1$
-						for (int i = 0; i < configs.length; i++) {
-							if (i > 0) {
-								names += ", "; //$NON-NLS-1$
-							}
-							names += "\"" + ((IServiceConfiguration)configs[i]).getName() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
-						}
-						boolean doRemove = MessageDialog.openConfirm(fRemoveButton.getShell(), Messages.ServiceConfigurationSelectionWidget_9,
-								NLS.bind(Messages.ServiceConfigurationSelectionWidget_10, names));
-						if (doRemove) {
-							for (Object config : configs) {
-								fManager.remove((IServiceConfiguration)config);
-							}
-							fTableViewer.refresh();
-						}
-					}
-				}
-			});
-			
-			fRenameButton = new Button(buttonsComp, SWT.PUSH);
-			fRenameButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
-			fRenameButton.setText(Messages.ServiceConfigurationSelectionWidget_11);
-			fRenameButton.setEnabled(false);
-			fRenameButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					IStructuredSelection selection = (IStructuredSelection)fTableViewer.getSelection();
-					if (!selection.isEmpty()) {
-						InputDialog dialog = new InputDialog(fAddButton.getShell(), Messages.ServiceConfigurationSelectionWidget_12, 
-								Messages.ServiceConfigurationSelectionWidget_13, null, null);
-						if (dialog.open() == InputDialog.OK) {
-							IServiceConfiguration config = (IServiceConfiguration)selection.getFirstElement();
-							config.setName(dialog.getValue());
-							fTableViewer.update(config, null);
-						}
-					}
-				}
-			});
-		}
-		
-		if (enableButtons && fUseCheckboxes) {
-			Composite buttonsComp = new Composite(this, SWT.NONE);
-			buttonsComp.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false, 1, 1));
-			buttonsComp.setLayout(new GridLayout(2, false));
-			
-			fSelectAllButton = new Button(buttonsComp, SWT.PUSH);
-			data = new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1);
-			data.widthHint = BUTTON_WIDTH;
-			fSelectAllButton.setLayoutData(data);
-			fSelectAllButton.setText(Messages.ServiceConfigurationSelectionWidget_5);
-			fSelectAllButton.setEnabled(false);
-			fSelectAllButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					setAllChecked(true);
-				}
-			});
-		
-			fDeselectAllButton = new Button(buttonsComp, SWT.PUSH);
-			data = new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1);
-			data.widthHint = BUTTON_WIDTH;
-			fDeselectAllButton.setLayoutData(data);
-			fDeselectAllButton.setText(Messages.ServiceConfigurationSelectionWidget_6);
-			fDeselectAllButton.setEnabled(false);
-			fDeselectAllButton.addSelectionListener(new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent evt) {
-					setAllChecked(false);
-				}
-			});
-		}
-	
-		fExcludedConfigs = excluded;
-		fButtonsVisible = enableButtons;
-		updateControls();
-	}
-	
-	/**
-	 * Adds the listener to the collection of listeners who will
-	 * be notified when the users selects a service configuration
-	 * </p>
-	 * @param listener the listener that will be notified of the selection
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		fSelectionListeners.add(listener);
-	}
-	
-	/**
-	 * Gets the elements that have been checked in the viewer
-	 * 
-	 * @return array containing the elements that are checked
-	 */
-	public IServiceConfiguration[] getCheckedServiceConfigurations() {
-		if (fUseCheckboxes) {
-			Object[] elements = ((CheckboxTableViewer)fTableViewer).getCheckedElements();
-			return Arrays.asList(elements).toArray(new IServiceConfiguration[0]);
-		}
-		return new IServiceConfiguration[0];
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#getEnabled()
-	 */
-	@Override
-	public boolean getEnabled() {
-		return fEnabled;
-	}
-	
-	/**
-	 * Return the service configuration selected by the user
-	 * 
-	 * @return Selected service configuration
-	 */
-	public IServiceConfiguration getSelectedConfiguration() {
-		return fSelectedConfig;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-	 */
-	public ISelection getSelection() {
-		return fSelection;
-	}
-
-	/**
-	 * Removes the listener from the collection of listeners who will
-	 * be notified when a service configuration is selected by the user.
-	 *
-	 * @param listener the listener which will no longer be notified
-	 */
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		fSelectionListeners.remove(listener);
-	}
-
-	/**
-	 * Sets all elements in the viewer to the given checked state.
-	 * 
-	 * @param state
-	 */
-	public void setAllChecked(boolean state) {
-		if (fUseCheckboxes) {
-			((CheckboxTableViewer)fTableViewer).setAllChecked(state);
-			notifySelection(fTableViewer.getSelection());
-		}
-	}
-
-	/**
-	 * Set the service configurations to display in the viewer. Passing null
-	 * will display all known configurations (default).
-	 * 
-	 * @param configurations configurations to display, or null to display all
-	 */
-	public void setConfigurations(IServiceConfiguration[] configurations) {
-		fDisplayConfigs = configurations;
-		fTableViewer.refresh();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.widgets.Control#setEnabled(boolean)
-	 */
-	@Override
-	public void setEnabled(boolean enabled) {
-		fEnabled = enabled;
-		updateControls();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setSelection(ISelection selection) {
-		fSelection = selection;
-	}
-	
-	/**
-	 * Add the named column to the viewer
-	 * 
-	 * @param colName name to use for the column heading
-	 * @return the column
-	 */
-	private TableViewerColumn addColumn(String colName) {
-		TableViewerColumn column = new TableViewerColumn(fTableViewer, SWT.NONE);
-		column.getColumn().setResizable(true);
-		column.getColumn().setMoveable(true);
-		column.getColumn().setText(colName);
-		PixelConverter converter = new PixelConverter(fTableViewer.getControl());
-		int colWidth = converter.convertWidthInCharsToPixels(colName.length() + 1);
-		fTableLayout.setColumnData(column.getColumn(), new ColumnWeightData(10, colWidth));
-		return column;
-	}
-
-	/**
-	 * Create the columns in the viewer. Always creates at least one column, the service
-	 * configuration name. The other columns are determined by the set of services
-	 * passed to the constructor.
-	 */
-	private void createColumns() {
-		TableViewerColumn firstColumn = addColumn(Messages.ServiceConfigurationSelectionWidget_7);
-		firstColumn.setLabelProvider(new ColumnLabelProvider(){
-			@Override
-			public String getText(Object element) {
-				return ((IServiceConfiguration)element).getName();
-			}
-		});
-		
-		if (fServices != null) {
-			SortedSet<IService> services = new TreeSet<IService>(new Comparator<IService>() {
-				public int compare(IService o1, IService o2) {
-					return o1.getName().compareTo(o2.getName());
-				}
-			});
-			for (IService service : fServices) {
-				services.add(service);
-			}
-			
-			for (IService service : services) {
-				String name = service.getName() + Messages.ServiceConfigurationSelectionWidget_8;
-				final TableViewerColumn column = addColumn(name);
-				column.getColumn().setData(service);
-				column.setLabelProvider(new ColumnLabelProvider(){
-					@Override
-					public String getText(Object element) {
-						IServiceConfiguration config = ((IServiceConfiguration)element);
-						IService service = (IService)column.getColumn().getData();
-						IServiceProvider provider = config.getServiceProvider(service);
-						if (provider == null || provider.equals(service.getNullProvider())) {
-							return Messages.ServiceConfigurationSelectionWidget_14;
-						}
-						return provider.getName();
-					}
-				});
-			}
-		}
-	}
-	
-	/**
-	 * Notify all listeners of the selection.
-	 * 
-	 * @param e event that was generated by the selection
-	 */
-	private void notifySelection(ISelection selection) {
-		if (!selection.isEmpty()) {
-			IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-			fSelectedConfig = (IServiceConfiguration)structuredSelection.getFirstElement();
-		} else {
-			fSelectedConfig = null;
-		}
-		setSelection(selection);
-		SelectionChangedEvent event = new SelectionChangedEvent(this, getSelection());
-		for (Object listener : fSelectionListeners.getListeners()) {
-			((ISelectionChangedListener) listener).selectionChanged(event);
-		}
-	}
-	
-	/**
-	 * Update buttons when something changes
-	 */
-	private void updateControls() {
-		fTable.setEnabled(fEnabled);
-		if (!fUseCheckboxes && fButtonsVisible) {
-			fAddButton.setEnabled(fEnabled);
-			boolean enabled = fEnabled && getSelectedConfiguration() != null;
-			fRemoveButton.setEnabled(enabled);
-			fRenameButton.setEnabled(enabled);
-		} else if (fButtonsVisible) {
-			fSelectAllButton.setEnabled(fEnabled);
-			fDeselectAllButton.setEnabled(fEnabled);
-		}
-	}
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/ServiceModelWidget.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/ServiceModelWidget.java
deleted file mode 100644
index 9b7d6c1..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/widgets/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.widgets;
-
-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().disable(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/FilenameStore.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/FilenameStore.java
deleted file mode 100755
index 317342f..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/FilenameStore.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 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.Vector;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ptp.services.ui.ServicesUIPlugin;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-
-public class FilenameStore {
-	// Most recently used filename is first in the array.
-	// Least recently used filename is at the end of the list.
-	// When the list overflows, items drop off the end.
-	private static final int HISTORY_LENGTH = 10;
-
-	private static final String STORE_SECTION = "ImportDialog"; //$NON-NLS-1$
-	private static final String FILENAMES = "filenames"; //$NON-NLS-1$
-	private static final String PREVIOUS = "previous"; //$NON-NLS-1$
-
-	// If a PSF file was selected when the wizard was opened, then this is it.
-	// This is only a cache; it is not part of the history until the user has used it.
-	private static String _selectedFilename = null;
-
-	private static IDialogSettings _section;
-
-	private FilenameStore() {
-		// All-static
-	}
-
-	public static void setDefaultFromSelection(IWorkbench workbench) {
-		// Scan the workbench for a selected PSF file
-		IWorkbenchWindow wnd = workbench.getActiveWorkbenchWindow();
-		IWorkbenchPage pg = wnd.getActivePage();
-		ISelection sel = pg.getSelection();
-
-		if (!(sel instanceof IStructuredSelection)) {
-			return;
-		}
-		IStructuredSelection selection = (IStructuredSelection)sel;
-
-		Object firstElement = selection.getFirstElement();
-		if (!(firstElement instanceof IAdaptable)) {
-			return;
-		}
-		Object o = ((IAdaptable) firstElement).getAdapter(IResource.class);
-		if (o == null) {
-			return;
-		}
-		IResource resource = (IResource) o;
-
-		if (resource.getType() != IResource.FILE) {
-			return;
-		}
-
-		if (!resource.isAccessible()) {
-			return;
-		}
-
-		String extension = resource.getFileExtension();
-		if (extension == null || !extension.equalsIgnoreCase("xml")) { //$NON-NLS-1$
-			return;
-		}
-
-		IWorkspace workspace = resource.getWorkspace();
-		workspace.getRoot().getFullPath();
-
-		IPath path = resource.getLocation();
-		_selectedFilename = path.toOSString();
-	}
-
-	public static String getSuggestedDefault() {
-		if (_selectedFilename != null) {
-			return _selectedFilename;
-		}
-		return getPrevious();
-	}
-
-	private static String getPrevious() {
-		IDialogSettings section = getSettingsSection();
-		String retval = section.get(PREVIOUS);
-		if (retval == null) {
-			retval = ""; //$NON-NLS-1$
-		}
-		return retval;
-	}
-
-	public static String[] getHistory() {
-		IDialogSettings section = getSettingsSection();
-		String[] arr = section.getArray(FILENAMES);
-		if (arr == null) {
-			arr = new String[0];
-		}
-		return arr;
-	}
-
-	public static void remember(String filename) {
-		Vector<String> filenames = createVector(getHistory());
-		if (filenames.contains(filename)) {
-			// The item is in the list. Remove it and add it back at the
-			// beginning. If it already was at the beginning this will be a
-			// waste of time, but it's not even measurable so I don't care.
-			filenames.remove(filename);
-		}
-		// Most recently used filename goes to the beginning of the list
-		filenames.add(0, filename);
-
-		// Forget any overflowing items
-		while (filenames.size() > HISTORY_LENGTH) {
-			filenames.remove(HISTORY_LENGTH);
-		}
-
-		// Make it an array
-		String[] arr = (String[]) filenames.toArray(new String[filenames.size()]);
-
-		IDialogSettings section = getSettingsSection();
-		section.put(FILENAMES, arr);
-		section.put(PREVIOUS, filename);
-	}
-
-	private static Vector<String> createVector(String[] arr) {
-		Vector<String> v = new Vector<String>();
-		for (int ix = 0; ix < arr.length; ++ix) {
-			v.add(ix, arr[ix]);
-		}
-		return v;
-	}
-
-	private static IDialogSettings getSettingsSection() {
-		if (_section != null)
-			return _section;
-
-		IDialogSettings settings = ServicesUIPlugin.getDefault().getDialogSettings();
-		_section = settings.getSection(STORE_SECTION);
-		if (_section != null)
-			return _section;
-
-		_section = settings.addNewSection(STORE_SECTION);
-		return _section;
-	}
-}
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/ServiceConfigurationExportWizard.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationExportWizard.java
deleted file mode 100644
index 2ac06a6..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationExportWizard.java
+++ /dev/null
@@ -1,240 +0,0 @@
-package org.eclipse.ptp.services.ui.wizards;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-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.ptp.services.ui.widgets.ServiceConfigurationSelectionWidget;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class ServiceConfigurationExportWizard extends Wizard implements IImportWizard {
-	private class MainExportWizardPage extends WizardPage {
-
-		private String file = ""; //$NON-NLS-1$
-		private Combo fileCombo;
-		private Button browseButton;
-		private int messageType = NONE;
-		private ServiceConfigurationSelectionWidget serviceConfigWidget;
-
-		public MainExportWizardPage(String pageName, String title, ImageDescriptor titleImage) {
-			super(pageName, title, titleImage);
-			setDescription(Messages.ServiceConfigurationExportWizard_0); 
-		}
-
-		public void createControl(Composite parent) {
-			Composite workArea = new Composite(parent, SWT.NONE);
-			setControl(workArea);
-
-	        workArea.setFont(parent.getFont());
-	        workArea.setLayout(new GridLayout());
-			workArea.setLayoutData(new GridData(GridData.FILL_BOTH
-					| GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-
-			createFileSelectionArea(workArea);
-			createConfigurationsSelectionArea(workArea);
-			
-			setControl(workArea);
-			Dialog.applyDialogFont(parent);
-			updateEnablement();
-			messageType = ERROR;
-		}
-		
-		public void createFileSelectionArea(Composite workArea) {
-	        Composite composite = new Composite(workArea, SWT.NULL);
-	        composite.setFont(workArea.getFont());
-	        composite.setLayout(new GridLayout());
-	        composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 3;
-			layout.marginHeight = 0;
-			layout.marginWidth = 0;
-			composite.setLayout(layout);
-			
-			Label label = new Label(composite, SWT.NONE);
-			label.setText(Messages.ServiceConfigurationExportWizard_4);
-
-			fileCombo = new Combo(composite, SWT.DROP_DOWN);
-			GridData comboData = new GridData(GridData.FILL_HORIZONTAL);
-			comboData.verticalAlignment = GridData.CENTER;
-			comboData.grabExcessVerticalSpace = false;
-			comboData.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-			fileCombo.setLayoutData(comboData);
-			file = FilenameStore.getSuggestedDefault();
-			fileCombo.setItems(FilenameStore.getHistory());
-			fileCombo.setText(file);
-			fileCombo.addListener(SWT.Modify, new Listener() {
-				public void handleEvent(Event event) {
-					file = fileCombo.getText();				
-					updateEnablement();
-				}
-			});
-
-			browseButton = new Button(composite, SWT.PUSH);
-			browseButton.setText(Messages.ServiceConfigurationExportWizard_5); 
-			GridData data = new GridData();
-			data.horizontalAlignment = GridData.FILL;
-			int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-			data.widthHint = Math.max(widthHint, browseButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-			browseButton.setLayoutData(data);
-			browseButton.addListener(SWT.Selection, new Listener() {
-				public void handleEvent(Event event) {
-					FileDialog d = new FileDialog(getShell(), SWT.SAVE);
-					d.setFilterExtensions(new String[] {"*.cfg"}); //$NON-NLS-1$
-					d.setFilterNames(new String[] {Messages.ServiceConfigurationExportWizard_6});
-					d.setFileName(Messages.ServiceConfigurationExportWizard_7);
-					String fileName = getFileName();
-					if (fileName != null) {
-						int separator = fileName.lastIndexOf(System.getProperty("file.separator").charAt(0)); //$NON-NLS-1$
-						if (separator != -1) {
-							fileName = fileName.substring(0, separator);
-						}
-					}
-					d.setFilterPath(fileName);
-					String f = d.open();
-					if (f != null) {
-						fileCombo.setText(f);
-						file = f;
-					}
-				}
-			});
-		}
-		
-		public String getFileName() {
-			return file;
-		}
-		
-		public IServiceConfiguration[] getServiceConfigurations() {
-			return serviceConfigWidget.getCheckedServiceConfigurations();
-		}
-
-		public void setVisible(boolean visible) {
-			super.setVisible(visible);
-			if (visible) {
-				fileCombo.setFocus();
-			}
-		}
-		
-		private void createConfigurationsSelectionArea(Composite workArea) {
-	        Composite composite = new Composite(workArea, SWT.NULL);
-	        composite.setFont(workArea.getFont());
-	        composite.setLayout(new GridLayout());
-	        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 1;
-			layout.marginHeight = 0;
-			layout.marginWidth = 0;
-			composite.setLayout(layout);
-			
-			Label label = new Label(composite, SWT.NONE);
-			label.setText(Messages.ServiceConfigurationExportWizard_1);
-			
-			serviceConfigWidget = new ServiceConfigurationSelectionWidget(composite, SWT.CHECK, null, null, true);
-	        GridData data = new GridData(GridData.FILL_BOTH);
-	        data.heightHint = 100;
-	        serviceConfigWidget.setLayoutData(data);
-			serviceConfigWidget.addSelectionChangedListener(new ISelectionChangedListener() {
-				public void selectionChanged(SelectionChangedEvent event) {
-					updateEnablement();
-				}
-			});
-		}
-		
-		private void updateEnablement() {
-			boolean complete = false;
-			setMessage(null);
-			setPageComplete(false);
-			
-			if (getServiceConfigurations().length == 0) {			
-				setPageComplete(false);
-				return;
-			}
-			
-			if (file.length() == 0) {
-				setMessage(Messages.ServiceConfigurationExportWizard_8, messageType);
-				setPageComplete(false);
-				return;
-			} else {
-				// See if the file exists
-				File f = new File(file);
-				if (f.isDirectory()) {
-					setMessage(Messages.ServiceConfigurationExportWizard_9, messageType); 
-					setPageComplete(false);
-					return;
-				}
-				complete = true;
-			}
-			
-			if (complete) {
-				setErrorMessage(null);
-				setDescription(Messages.ServiceConfigurationExportWizard_10);
-			}
-				
-			setPageComplete(complete);		
-		}
-	}
-	
-	private MainExportWizardPage mainPage = 
-			new MainExportWizardPage("exportWizardPage", 
-					Messages.ServiceConfigurationExportWizard_11, null); //$NON-NLS-1$;
-	
-	public ServiceConfigurationExportWizard() {
-		setNeedsProgressMonitor(true);
-		setWindowTitle(Messages.ServiceConfigurationExportWizard_13); 
-	}
-	
-	public void addPages() {
-		addPage(mainPage);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		FilenameStore.setDefaultFromSelection(workbench);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	@Override
-	public boolean performFinish() {
-		File f = new File(mainPage.getFileName());
-		if (f.exists()) {
-			boolean result = MessageDialog.openQuestion(getShell(), Messages.ServiceConfigurationExportWizard_14, Messages.ServiceConfigurationExportWizard_15);		
-			if (!result) {
-				return false;
-			}
-		}
-		try {
-			ServiceModelManager.getInstance().exportConfigurations(mainPage.getFileName(), 
-					mainPage.getServiceConfigurations());
-		} catch (InvocationTargetException e) {
-			// TODO: error dialog?
-			return false;
-		}
-		return true;
-	}
-
-}
diff --git a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationImportWizard.java b/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationImportWizard.java
deleted file mode 100644
index 04701ac..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationImportWizard.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package org.eclipse.ptp.services.ui.wizards;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-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.ptp.services.ui.widgets.ServiceConfigurationSelectionWidget;
-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.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class ServiceConfigurationImportWizard extends Wizard implements IImportWizard {
-	private class SelectFilePage extends WizardPage {
-
-		private String file = ""; //$NON-NLS-1$
-		private Combo fileCombo;
-		private Button browseButton;
-		private ServiceConfigurationSelectionWidget fServiceWidget;
-		private int messageType = NONE;
-
-		public SelectFilePage(String pageName, String title, ImageDescriptor titleImage) {
-			super(pageName, title, titleImage);
-			setDescription(Messages.ServiceConfigurationImportWizard_1); 
-		}
-
-		public void createControl(Composite parent) {
-			Composite workArea = new Composite(parent, SWT.NONE);
-			setControl(workArea);
-
-	        workArea.setFont(parent.getFont());
-	        workArea.setLayout(new GridLayout());
-			workArea.setLayoutData(new GridData(GridData.FILL_BOTH
-					| GridData.GRAB_HORIZONTAL | GridData.GRAB_VERTICAL));
-
-			createFileSelectionArea(workArea);
-			createConfigurationsArea(workArea);
-			
-			updateEnablement();
-			Dialog.applyDialogFont(parent);
-			messageType = ERROR;
-		}
-		
-		private void createFileSelectionArea(Composite workArea) {
-			Composite composite = new Composite(workArea, SWT.NULL);
-	        composite.setLayout(new GridLayout());
-	        composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 3;
-			layout.marginHeight = 0;
-			layout.marginWidth = 0;
-			composite.setLayout(layout);
-			
-			Label label = new Label(composite, SWT.NONE);
-			label.setText(Messages.ServiceConfigurationImportWizard_2);
-
-			fileCombo = new Combo(composite, SWT.DROP_DOWN);
-			GridData comboData = new GridData(GridData.FILL_HORIZONTAL);
-			comboData.verticalAlignment = GridData.CENTER;
-			comboData.grabExcessVerticalSpace = false;
-			comboData.widthHint = IDialogConstants.ENTRY_FIELD_WIDTH;
-			fileCombo.setLayoutData(comboData);
-			file = FilenameStore.getSuggestedDefault();
-			fileCombo.setItems(FilenameStore.getHistory());
-			fileCombo.setText(file);
-			fileCombo.addListener(SWT.Modify, new Listener() {
-				public void handleEvent(Event event) {
-					file = fileCombo.getText();				
-					updateEnablement();
-				}
-			});
-
-			browseButton = new Button(composite, SWT.PUSH);
-			browseButton.setText(Messages.ServiceConfigurationImportWizard_3); 
-			GridData data = new GridData();
-			data.horizontalAlignment = GridData.FILL;
-			int widthHint = convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
-			data.widthHint = Math.max(widthHint, browseButton.computeSize(SWT.DEFAULT, SWT.DEFAULT, true).x);
-			browseButton.setLayoutData(data);
-			browseButton.addListener(SWT.Selection, new Listener() {
-				public void handleEvent(Event event) {
-					FileDialog d = new FileDialog(getShell(), SWT.OPEN);
-					d.setFilterExtensions(new String[] {"*.cfg", "*"}); //$NON-NLS-1$ //$NON-NLS-2$
-					d.setFilterNames(new String[] {Messages.ServiceConfigurationImportWizard_4, Messages.ServiceConfigurationImportWizard_5});
-					String fileName= getFileName();
-					if (fileName != null && fileName.length() > 0) {
-						int separator = fileName.lastIndexOf(System.getProperty("file.separator").charAt(0)); //$NON-NLS-1$
-						if (separator != -1) {
-							fileName= fileName.substring(0, separator);
-						}
-					} else {
-						fileName= ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
-					}
-					d.setFilterPath(fileName);
-					String f = d.open();
-					if (f != null) {
-						fileCombo.setText(f);
-						file = f;
-						updateConfigurations(file);
-					}
-				}
-			});
-		}
-		
-		private void updateConfigurations(String file) {
-			try {
-				final String filename = file;
-				getContainer().run(true, true, new IRunnableWithProgress() {
-					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-						monitor.beginTask(Messages.ServiceConfigurationImportWizard_0, 100);
-						fServiceConfigurations = fModelManager.importConfigurations(filename);
-						monitor.worked(100);
-						monitor.done();
-					}
-				});
-			} catch (InvocationTargetException e) {
-			} catch (InterruptedException e) {
-				// Do nothing
-			}
-			
-			fServiceWidget.setConfigurations(fServiceConfigurations);
-			fServiceWidget.setAllChecked(true);
-		}
-		
-		private void createConfigurationsArea(Composite workArea) {
-			Composite composite = new Composite(workArea, SWT.NONE);
-			composite.setLayout(new GridLayout());
-			composite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
-					| GridData.GRAB_VERTICAL | GridData.FILL_BOTH));
-			
-			Label label = new Label(composite, SWT.NONE);
-			label.setText(Messages.ServiceConfigurationImportWizard_12);
-			
-			fServiceWidget = new ServiceConfigurationSelectionWidget(composite, SWT.CHECK, null, null, true);
-			fServiceWidget.setConfigurations(new IServiceConfiguration[0]);
-		}
-		
-		public String getFileName() {
-			return file;
-		}
-		
-		public IServiceConfiguration[] getServiceConfigurations() {
-			return fServiceWidget.getCheckedServiceConfigurations();
-		}
-		
-		private void updateEnablement() {
-			boolean complete = false;
-			setMessage(null);
-			
-			if (file.length() == 0) {
-				setMessage(Messages.ServiceConfigurationImportWizard_6, messageType);
-				setPageComplete(false);
-				return;
-			} else {
-				// See if the file exists
-				File f = new File(file);
-				if (!f.exists()) {
-					setMessage(Messages.ServiceConfigurationImportWizard_7, messageType); 
-					setPageComplete(false);
-					return;
-				} else if (f.isDirectory()) {
-					setMessage(Messages.ServiceConfigurationImportWizard_8, messageType); 
-					setPageComplete(false);
-					return;
-				} else if (!fModelManager.isValidConfigurationFile(file)) {
-					setMessage(Messages.ServiceConfigurationImportWizard_13, messageType);
-					setPageComplete(false);
-					return;
-				}
-				complete = true;
-			}
-			
-			if (complete) {
-				setErrorMessage(null);
-				setDescription(Messages.ServiceConfigurationImportWizard_9);
-			}
-				
-			setPageComplete(complete);
-		}
-		
-		public void setVisible(boolean visible) {
-			super.setVisible(visible);
-			if (visible) {
-				fileCombo.setFocus();
-			}
-		}
-	}
-	
-	private SelectFilePage mainPage;
-	private IServiceConfiguration[] fServiceConfigurations;
-	private IServiceModelManager fModelManager = ServiceModelManager.getInstance();
-	
-	public ServiceConfigurationImportWizard() {
-		setNeedsProgressMonitor(true);
-		setWindowTitle(Messages.ServiceConfigurationImportWizard_10); 
-	}
-	
-	public void addPages() {
-		mainPage = new SelectFilePage("importMainPage", Messages.ServiceConfigurationImportWizard_11, null); //$NON-NLS-1$ 
-		addPage(mainPage);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.wizard.Wizard#performFinish()
-	 */
-	@Override
-	public boolean performFinish() {
-		for (IServiceConfiguration config : mainPage.getServiceConfigurations()) {
-			fModelManager.addConfiguration(config);
-		}
-		return true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		FilenameStore.setDefaultFromSelection(workbench);
-	}
-
-}
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 a4fbde1..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.ServicesUIPlugin;
-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 {
-						ServicesUIPlugin.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().disable(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 7b8e52c..0000000
--- a/core/org.eclipse.ptp.services.ui/src/org/eclipse/ptp/services/ui/wizards/ServiceConfigurationWizard.java
+++ /dev/null
@@ -1,172 +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.ptp.services.ui.widgets.ServiceModelWidget;
-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/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 0cee9da..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.remote.core;bundle-version="2.1.0",
- org.eclipse.cdt.core;bundle-version="5.1.0",
- org.eclipse.ptp.services.core;bundle-version="1.0.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 0f7977c..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.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;
-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.ProjectNotConfiguredException;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-
-
-/**
- * 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 fe3343b..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.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.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.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;
-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.ProjectNotConfiguredException;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-
-/**
- * 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 d75a279..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +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: 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.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",
- org.eclipse.ptp.services.core;bundle-version="1.0.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 ebfc178..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.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.ptp.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 95972a2..0000000
--- a/releng/org.eclipse.ptp.releng/build.xml
+++ /dev/null
@@ -1,545 +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.0.1/I.I200909110608/cdt-master-6.0.1-I200909110608.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.1-200909160905/RSE-SDK-3.1.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.rm.slurm-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.pldt.upc-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.mpi.mpich2.core"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.proxy"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.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/rms/org.eclipse.ptp.rm.pbs.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.proxy"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.ui"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.core"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.proxy"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.ui"/>
-		</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.upc"/>
-		</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 97abe50..0000000
--- a/releng/org.eclipse.ptp.releng/maps/ptp.map
+++ /dev/null
@@ -1,132 +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.rm.pbs=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.pbs-feature
-feature@org.eclipse.ptp.rm.slurm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.slurm-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.pbs.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.core
-plugin@org.eclipse.ptp.rm.pbs.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.pbs.ui
-plugin@org.eclipse.ptp.rm.slurm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.core
-plugin@org.eclipse.ptp.rm.slurm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.ui
-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 cfdf7f0..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.ll-feature/feature.xml
+++ /dev/null
@@ -1,74 +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.services.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <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.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.core" version="1.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.ui" version="1.0.1" 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 91c2bd3..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.pe-feature/feature.xml
+++ /dev/null
@@ -1,73 +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.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.services.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.proxy"/>
-      <import plugin="org.eclipse.ptp.utils"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <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.ptp.services.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.core" version="1.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.ui" version="1.0.1" 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 2210a3c..0000000
--- a/releng/org.eclipse.ptp.rm.mpich2-feature/feature.xml
+++ /dev/null
@@ -1,58 +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.debug.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.ptp.services.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.core"/>
-      <import plugin="org.eclipse.ptp.services.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui"/>
-   </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 76269e4..0000000
--- a/releng/org.eclipse.ptp.rm.openmpi-feature/feature.xml
+++ /dev/null
@@ -1,58 +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.ui"/>
-      <import plugin="org.eclipse.core.filesystem"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ptp.services.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.rm.core"/>
-      <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.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.pbs-feature/.project b/releng/org.eclipse.ptp.rm.pbs-feature/.project
deleted file mode 100644
index 810b6ef..0000000
--- a/releng/org.eclipse.ptp.rm.pbs-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs-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.pbs-feature/build.properties b/releng/org.eclipse.ptp.rm.pbs-feature/build.properties
deleted file mode 100644
index 8a0a77b..0000000
--- a/releng/org.eclipse.ptp.rm.pbs-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.pbs-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.pbs-feature/epl-v10.html
deleted file mode 100644
index 90f2d5e..0000000
--- a/releng/org.eclipse.ptp.rm.pbs-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.pbs-feature/feature.properties b/releng/org.eclipse.ptp.rm.pbs-feature/feature.properties
deleted file mode 100644
index 087ff75..0000000
--- a/releng/org.eclipse.ptp.rm.pbs-feature/feature.properties
+++ /dev/null
@@ -1,135 +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 PBS

-

-# "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 PBS

-

-# copyright

-copyright=\

-Copyright (c) 2009 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.pbs-feature/feature.xml b/releng/org.eclipse.ptp.rm.pbs-feature/feature.xml
deleted file mode 100644
index 62c1a9b..0000000
--- a/releng/org.eclipse.ptp.rm.pbs-feature/feature.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.pbs"
-      label="%featureName"
-      version="3.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.rm.pbs.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.services.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.remote.core" version="2.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.services.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remote.core" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remote.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.ui" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.launch" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.core" version="1.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.ui" version="1.0.1" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.pbs.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.pbs.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.pbs-feature/license.html b/releng/org.eclipse.ptp.rm.pbs-feature/license.html
deleted file mode 100644
index 15a10cf..0000000
--- a/releng/org.eclipse.ptp.rm.pbs-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 60f2576..0000000
--- a/releng/org.eclipse.ptp.rm.slurm-feature/feature.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.slurm"
-      label="%featureName"
-      version="3.0.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/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.services.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remote.core" version="2.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.core" version="1.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.services.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remote.core" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remote.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.launch" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.ui" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.ui" version="1.0.1" match="greaterOrEqual"/>
-   </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 25bb9ca..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +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.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 d3a143c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <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 70651bc..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java
+++ /dev/null
@@ -1,63 +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;
-
-
-/**
- * MPICH2 job 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 7df7d46..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.RMCorePlugin;
-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, RMCorePlugin.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, RMCorePlugin.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/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/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 c9262a2..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ServiceProvider.java
+++ /dev/null
@@ -1,97 +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.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-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;
-import org.eclipse.ptp.services.core.IServiceProviderWorkingCopy;
-
-public class MPICH2ServiceProvider extends AbstractToolRMServiceProvider implements IMPICH2ResourceManagerConfiguration {
-	private static final String TAG_VERSION_ID = "versionId"; //$NON-NLS-1$
-
-	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));
-	}
-	
-	/**
-	 * Constructor for creating a working copy of the service provider
-	 * 
-	 * @param provider provider we are making a copy from
-	 */
-	public MPICH2ServiceProvider(MPICH2ServiceProvider provider) {
-		super(provider);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.ServiceProvider#copy()
-	 */
-	@Override
-	public IServiceProviderWorkingCopy copy() {
-		return new MPICH2ServiceProvider(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerServiceProvider#createResourceManager()
-	 */
-	@Override
-	public IResourceManagerControl createResourceManager() {
-		IPUniverseControl universe = (IPUniverseControl) PTPCorePlugin.getDefault().getUniverse();
-		return new MPICH2ResourceManager(Integer.valueOf(universe.getNextResourceManagerId()), universe, this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerServiceProvider#getResourceManagerId()
-	 */
-	@Override
-	public String getResourceManagerId() {
-		return getId();
-	}
-
-	/* (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 c8b0896..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java
+++ /dev/null
@@ -1,129 +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.RMCorePlugin;
-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.getNode() == null) {
-						String nodeID = rts.getNodeIDforName(job.getHost());
-						if (nodeID == null) {
-							throw new CoreException(new Status(IStatus.ERROR, RMCorePlugin.getDefault().getBundle().getSymbolicName(), Messages.MPICH2RuntimeSystemJob_Exception_HostnamesDoNotMatch, null));
-						}
-						AttributeManager attrMrg = new AttributeManager();
-						attrMrg.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create(nodeID));
-						rts.changeProcess(process.getID(), attrMrg);
-					}
-				}
-			}
-		} 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 32527d3..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java
+++ /dev/null
@@ -1,157 +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.core.elements.IPElement;
-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);
-	}
-
-	@Override
-	public Job createRuntimeSystemJob(String jobID, String queueID, AttributeManager attrMgr) {
-		return new MPICH2RuntimeSystemJob(jobID, queueID, Messages.MPICH2RuntimeSystem_JobName, this, attrMgr);
-	}
-
-	public String getMachineID() {
-		return machineID;
-	}
-
-	public String getNodeIDforName(String hostname) {
-		return nodeNameToIDMap.get(hostname);
-	}
-
-	public String getQueueID() {
-		return queueID;
-	}
-
-	@Override
-	public AbstractEffectiveToolRMConfiguration retrieveEffectiveToolRmConfiguration() {
-		return new EffectiveMPICH2ResourceManagerConfiguration(getRmConfiguration());
-	}
-
-	public void setNodeIDForName(String hostname, String nodeID) {
-		nodeNameToIDMap.put(hostname, nodeID);
-	}
-
-	@Override
-	protected Job createContinuousMonitorJob() {
-		return null;
-	}
-
-	@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;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doFilterEvents(org.eclipse.ptp.core.elements.IPElement, boolean, org.eclipse.ptp.core.attributes.AttributeManager)
-	 */
-	@Override
-	protected void doFilterEvents(IPElement element, boolean filterChildren, AttributeManager filterAttributes)
-			throws CoreException {
-		// Not implemented yet
-	}
-
-	/*
-	 * (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
-	}
-
-	protected void setMachineID(String machineID) {
-		this.machineID = machineID;
-	}
-
-
-	protected void setQueueID(String queueID) {
-		this.queueID = queueID;
-	}
-}
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 970554a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java
+++ /dev/null
@@ -1,347 +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 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.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.rm.core.MPIJobAttributes;
-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;
-
-	public MPICH2RuntimeSystemJob(String jobID, String queueID, String name, AbstractToolRuntimeSystem rtSystem, AttributeManager attrMgr) {
-		super(jobID, queueID, name, rtSystem, attrMgr);
-	}
-
-	/**
-	 * Initialize all processes to running state.
-	 */
-	private void initializeProcesses() {
-		final MPICH2RuntimeSystem rtSystem = (MPICH2RuntimeSystem) getRtSystem();
-		final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
-		IntegerAttribute numProcsAttr = ipJob.getAttribute(JobAttributes.getNumberOfProcessesAttributeDefinition());
-		getRtSystem().createProcesses(getJobID(), numProcsAttr.getValue().intValue());
-
-		AttributeManager attrMrg = new AttributeManager();
-		attrMrg.addAttribute(ProcessAttributes.getStateAttributeDefinition().create(ProcessAttributes.State.RUNNING));
-		for (IPProcess process : ipJob.getProcesses()) {
-			rtSystem.changeProcess(process.getID(), attrMrg);
-		}
-	}
-	
-	/**
-	 * Terminate all processes.
-	 */
-	private void terminateProcesses() {
-		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()) {
-			if (ipProcess.getState() != ProcessAttributes.State.COMPLETED) {
-				ids.add(ipProcess.getID());
-			}
-		}
-
-		AttributeManager attrMrg = new AttributeManager();
-		attrMrg.addAttribute(ProcessAttributes.getStateAttributeDefinition().create(ProcessAttributes.State.COMPLETED));
-		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());
-	}
-
-	@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?
-		terminateProcesses();
-	}
-
-	@Override
-	protected void doExecutionFinished(IProgressMonitor monitor) throws CoreException {
-		terminateProcesses();
-		if (getProcess().exitValue() != 0) {
-			if (!terminateJobFlag) {
-				changeJobStatusMessage(NLS.bind(Messages.MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithExitValue, new Integer(getProcess().exitValue())));
-				changeJobStatus(MPIJobAttributes.Status.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$
-		}
-	}
-
-	@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());
-
-		initializeProcesses();
-
-		/*
-		 * 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();
-	}
-
-	@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 636d156..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +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.ui,
- 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 8db41d5..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <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.MPICH2ServiceProvider">
-      </providerContributor>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.ui.runtimeModelPresentations">
-      <runtimeModelPresentation
-            class="org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2RuntimeModelPresentation"
-            id="org.eclipse.ptp.rm.mpi.mpich2.MPICH2ServiceProvider">
-      </runtimeModelPresentation>
-   </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 c01225e..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2ProviderContributor.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;

-

-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.MPICH2ConfigurationWizardPage;

-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.Composite;

-

-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.Composite)

-	 */

-	public void configureServiceProvider(IServiceProvider provider, Composite comp) 

-	{

-		// Nothing

-	}

-

-	/* (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[2];

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

-		wizardPages[1] = new MPICH2ConfigurationWizardPage((IRMConfigurationWizard)wizard);

-		return wizardPages;

-	}

-

-}

diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2RuntimeModelPresentation.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2RuntimeModelPresentation.java
deleted file mode 100644
index 34630a8..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2RuntimeModelPresentation.java
+++ /dev/null
@@ -1,73 +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.ptp.core.attributes.StringAttribute;

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

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

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

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

-import org.eclipse.ptp.rm.ui.RMModelImages;

-import org.eclipse.ptp.ui.IRuntimeModelPresentation;

-import org.eclipse.ptp.ui.model.IElement;

-import org.eclipse.swt.graphics.Image;

-

-public class MPICH2RuntimeModelPresentation implements IRuntimeModelPresentation {

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.ui.IRuntimeModelPresentation#getImage(java.lang.Object)

-	 */

-	public Image getImage(Object object) {

-		if (object instanceof IElement) {

-			IElement element = (IElement)object;

-			IPElement pElement = element.getPElement();

-			if (pElement instanceof IPProcess) {

-				StringAttribute status = pElement.getAttribute(ProcessAttributes.getStatusAttributeDefinition());

-				if (status != null) {

-					if (element.isSelected()) {

-						return RMModelImages.procSelImages.get(status.getValue());

-					}

-					return RMModelImages.procImages.get(status.getValue());

-				}

-			}

-		} else if (object instanceof IPJob) {

-			IPJob job = (IPJob)object;

-			StringAttribute status = job.getAttribute(ProcessAttributes.getStatusAttributeDefinition());

-			if (status != null) {

-				if (job.isDebug()) {

-					return RMModelImages.jobDebugImages.get(status.getValue());

-				}

-				return RMModelImages.jobImages.get(status.getValue());

-			}

-		}

-		return null;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.ptp.ui.IRuntimeModelPresentation#getText(java.lang.Object)

-	 */

-	public String getText(Object object) {

-		IPElement element = null;

-		if (object instanceof IElement) {

-			element = ((IElement)object).getPElement();

-		} else if (object instanceof IPElement) {

-			element = (IPElement)object;

-		}

-		if (element != null) {

-			StringAttribute status = element.getAttribute(ProcessAttributes.getStatusAttributeDefinition());

-			if (status != null) {

-				return status.getValue();

-			}

-		}

-		return null;

-	}

-

-}

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 fa77222..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.RMCorePlugin;
-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, RMCorePlugin.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, RMCorePlugin.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 f27e8be..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.BaseRMLaunchConfigurationDynamicTab;
-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
-BaseRMLaunchConfigurationDynamicTab {
-
-	Composite control;
-	Button useArgsDefaultsButton;
-	Text argsText;
-
-	class WidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener
-	implements ICheckStateListener {
-		public WidgetListener(BaseRMLaunchConfigurationDynamicTab 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(BaseRMLaunchConfigurationDynamicTab 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 f478dcd..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.BaseRMLaunchConfigurationDynamicTab;
-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 BaseRMLaunchConfigurationDynamicTab {
-
-	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(BaseRMLaunchConfigurationDynamicTab 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(BaseRMLaunchConfigurationDynamicTab 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 17964cb..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.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.pbs.core/.classpath b/rms/org.eclipse.ptp.rm.pbs.core/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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/rms/org.eclipse.ptp.rm.pbs.core/.project b/rms/org.eclipse.ptp.rm.pbs.core/.project
deleted file mode 100644
index 6e72647..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs.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.pbs.core/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.pbs.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6401daa..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Aug 31 20:51:32 CDT 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/rms/org.eclipse.ptp.rm.pbs.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.pbs.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 2671bcd..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

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

-Bundle-Version: 3.0.0.qualifier

-Bundle-Activator: org.eclipse.ptp.rm.pbs.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.services.core;bundle-version="1.0.0",

- org.eclipse.ptp.proxy.protocol,

- org.eclipse.ptp.core,

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

- org.eclipse.ptp.rm.core;bundle-version="1.0.1"

-Bundle-ActivationPolicy: lazy

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

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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Import-Package: org.eclipse.ptp.rm.core.rmsystem,

- org.eclipse.ptp.rm.core.rtsystem

diff --git a/rms/org.eclipse.ptp.rm.pbs.core/about.html b/rms/org.eclipse.ptp.rm.pbs.core/about.html
deleted file mode 100644
index 3106f3a..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.core/build.properties b/rms/org.eclipse.ptp.rm.pbs.core/build.properties
deleted file mode 100644
index 6f20375..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.core/plugin.properties b/rms/org.eclipse.ptp.rm.pbs.core/plugin.properties
deleted file mode 100644
index f10f91f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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 PBS Core
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/plugin.xml b/rms/org.eclipse.ptp.rm.pbs.core/plugin.xml
deleted file mode 100644
index 6494301..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

-

-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/Activator.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/Activator.java
deleted file mode 100644
index 199bceb..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/Activator.java
+++ /dev/null
@@ -1,60 +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.pbs.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.pbs.core"; //$NON-NLS-1$

-

-	// 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.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSAttributes.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSAttributes.java
deleted file mode 100644
index 2195863..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSAttributes.java
+++ /dev/null
@@ -1,15 +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.pbs.core;

-

-public class PBSAttributes {

-

-}

diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSJobAttributes.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSJobAttributes.java
deleted file mode 100644
index ef8bdae..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSJobAttributes.java
+++ /dev/null
@@ -1,156 +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.rm.pbs.core;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-
-
-/**
- * Job attributes
- */
-public class PBSJobAttributes {
-	private static final String ACCOUNT_NAME_ATTR_ID = "Account_Name"; //$NON-NLS-1$
-	private static final String CHECKPOINT_ATTR_ID = "Checkpoint"; //$NON-NLS-1$
-	private static final String COMMENT_ATTR_ID = "comment"; //$NON-NLS-1$
-	private static final String DEPEND_ATTR_ID = "depend"; //$NON-NLS-1$
-	private static final String ERROR_PATH_ATTR_ID = "Error_Path"; //$NON-NLS-1$
-	private static final String EXECUTION_TIME_ATTR_ID = "Execution_Time"; //$NON-NLS-1$
-	private static final String GROUP_LIST_ATTR_ID = "group_list"; //$NON-NLS-1$
-	private static final String HOLD_TYPES_ATTR_ID = "Hold_Types"; //$NON-NLS-1$
-	private static final String JOB_NAME_ATTR_ID = "Job_Name"; //$NON-NLS-1$
-	private static final String JOIN_PATH_ATTR_ID = "Join_Path"; //$NON-NLS-1$
-	private static final String KEEP_FILES_ATTR_ID = "Keep_Files"; //$NON-NLS-1$
-	private static final String MAIL_POINTS_ATTR_ID = "Mail_Points"; //$NON-NLS-1$
-	private static final String MAIL_USERS_ATTR_ID = "Mail_Users"; //$NON-NLS-1$
-	private static final String NO_STDIO_SOCKETS_ATTR_ID = "no_stdio_sockets"; //$NON-NLS-1$
-	private static final String OUTPUT_PATH_ATTR_ID = "Output_Path"; //$NON-NLS-1$
-	private static final String PRIORITY_ATTR_ID = "Priority"; //$NON-NLS-1$
-	private static final String RERUNNABLE_ATTR_ID = "Rerunnable"; //$NON-NLS-1$
-	private static final String RES_ARCH_ATTR_ID = "Resource_List.arch"; //$NON-NLS-1$
-	private static final String RES_CPUT_ATTR_ID = "Resource_List.cput"; //$NON-NLS-1$
-	private static final String RES_FILE_ATTR_ID = "Resource_List.file"; //$NON-NLS-1$
-	private static final String RES_HOST_ATTR_ID = "Resource_List.host"; //$NON-NLS-1$
-	private static final String RES_MEM_ATTR_ID = "Resource_List.mem"; //$NON-NLS-1$
-	private static final String RES_MPIPROCS_ATTR_ID = "Resource_List.mpiprocs"; //$NON-NLS-1$
-	private static final String RES_NCPUS_ATTR_ID = "Resource_List.ncpus"; //$NON-NLS-1$
-	private static final String RES_NICE_ATTR_ID = "Resource_List.nice"; //$NON-NLS-1$
-	private static final String RES_NODES_ATTR_ID = "Resource_List.nodes"; //$NON-NLS-1$
-	private static final String RES_NODECT_ATTR_ID = "Resource_List.nodect"; //$NON-NLS-1$
-	private static final String RES_OMPTHREADS_ATTR_ID = "Resource_List.ompthreads"; //$NON-NLS-1$
-	private static final String RES_PCPUT_ATTR_ID = "Resource_List.pcput"; //$NON-NLS-1$
-	private static final String RES_PMEM_ATTR_ID = "Resource_List.pmem"; //$NON-NLS-1$
-	private static final String RES_PVMEM_ATTR_ID = "Resource_List.pvmem"; //$NON-NLS-1$
-	private static final String RES_RESC_ATTR_ID = "Resource_List.resc"; //$NON-NLS-1$
-	private static final String RES_VMEM_ATTR_ID = "Resource_List.vmem"; //$NON-NLS-1$
-	private static final String RES_WALLTIME_ATTR_ID = "Resource_List.walltime"; //$NON-NLS-1$
-	private static final String RES_MPPE_ATTR_ID = "Resource_List.mppe"; //$NON-NLS-1$
-	private static final String RES_MPPT_ATTR_ID = "Resource_List.mppt"; //$NON-NLS-1$
-	private static final String RES_PF_ATTR_ID = "Resource_List.pf"; //$NON-NLS-1$
-	private static final String RES_PMPPT_ATTR_ID = "Resource_List.pmppt"; //$NON-NLS-1$
-	private static final String RES_PNCPUS_ATTR_ID = "Resource_List.pncpus"; //$NON-NLS-1$
-	private static final String RES_PPF_ATTR_ID = "Resource_List.ppf"; //$NON-NLS-1$
-	private static final String RES_PROCS_ATTR_ID = "Resource_List.procs"; //$NON-NLS-1$
-	private static final String RES_PSDS_ATTR_ID = "Resource_List.psds"; //$NON-NLS-1$
-	private static final String RES_SDS_ATTR_ID = "Resource_List.sds"; //$NON-NLS-1$
-	private static final String SHELL_PATH_LIST_ATTR_ID = "Shell_Path_List"; //$NON-NLS-1$
-	private static final String STAGEIN_ATTR_ID = "stagein"; //$NON-NLS-1$
-	private static final String STAGEOUT_ATTR_ID = "stageout"; //$NON-NLS-1$
-	private static final String UMASK_ATTR_ID = "umask"; //$NON-NLS-1$
-	private static final String USER_LIST_ATTR_ID = "User_List"; //$NON-NLS-1$
-	private static final String VARIABLE_LIST_ATTR_ID = "Variable_List"; //$NON-NLS-1$
-
-	private static final IAttributeDefinition<?,?,?>[] attrDefs = new IAttributeDefinition[]{
-				new StringAttributeDefinition(ACCOUNT_NAME_ATTR_ID, ACCOUNT_NAME_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(CHECKPOINT_ATTR_ID, CHECKPOINT_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(COMMENT_ATTR_ID, COMMENT_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(DEPEND_ATTR_ID, DEPEND_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(ERROR_PATH_ATTR_ID, ERROR_PATH_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(EXECUTION_TIME_ATTR_ID, EXECUTION_TIME_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(GROUP_LIST_ATTR_ID, GROUP_LIST_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(HOLD_TYPES_ATTR_ID, HOLD_TYPES_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(JOB_NAME_ATTR_ID, JOB_NAME_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(JOIN_PATH_ATTR_ID, JOIN_PATH_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(KEEP_FILES_ATTR_ID, KEEP_FILES_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(MAIL_POINTS_ATTR_ID, MAIL_POINTS_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(MAIL_USERS_ATTR_ID, MAIL_USERS_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(NO_STDIO_SOCKETS_ATTR_ID, NO_STDIO_SOCKETS_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(OUTPUT_PATH_ATTR_ID, OUTPUT_PATH_ATTR_ID, "", true, ""),
-				new IntegerAttributeDefinition(PRIORITY_ATTR_ID, PRIORITY_ATTR_ID, "", true, 0),
-				new StringAttributeDefinition(RERUNNABLE_ATTR_ID, RERUNNABLE_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(RES_ARCH_ATTR_ID, RES_ARCH_ATTR_ID, "System architecture", true, ""),
-				new StringAttributeDefinition(RES_CPUT_ATTR_ID, RES_CPUT_ATTR_ID, "Maximum, aggregate CPU time required by all processes", true, ""),
-				new StringAttributeDefinition(RES_FILE_ATTR_ID, RES_FILE_ATTR_ID, "Maximum disk space requirements for any single file to be created", true, ""),
-				new StringAttributeDefinition(RES_HOST_ATTR_ID, RES_HOST_ATTR_ID, "Name of requested host/node", true, ""),
-				new StringAttributeDefinition(RES_MEM_ATTR_ID, RES_MEM_ATTR_ID, "Maximum amount of physical memory (RAM)", true, ""),
-				new IntegerAttributeDefinition(RES_MPIPROCS_ATTR_ID, RES_MPIPROCS_ATTR_ID, "Number of MPI processes for this chunk", true, 0),
-				new IntegerAttributeDefinition(RES_NCPUS_ATTR_ID, RES_NCPUS_ATTR_ID, "Number of CPUs (processors)", true, 0),
-				new IntegerAttributeDefinition(RES_NICE_ATTR_ID, RES_NICE_ATTR_ID, "Requested job priority", true, 0),
-				new StringAttributeDefinition(RES_NODES_ATTR_ID, RES_NODES_ATTR_ID, "Number and/or type of nodes", true, ""),
-				new IntegerAttributeDefinition(RES_NODECT_ATTR_ID, RES_NODECT_ATTR_ID, "Number of chunks in resource request from selection directive, or number of vnodes requested from node specification", true, 0),
-				new IntegerAttributeDefinition(RES_OMPTHREADS_ATTR_ID, RES_OMPTHREADS_ATTR_ID, "Number of OpenMP threads for this chunk", true, 0),
-				new StringAttributeDefinition(RES_PCPUT_ATTR_ID, RES_PCPUT_ATTR_ID, "Per-process maximum CPU time", true, ""),
-				new StringAttributeDefinition(RES_PMEM_ATTR_ID, RES_PMEM_ATTR_ID, "Per-process maximum amount of physical memory", true, ""),
-				new StringAttributeDefinition(RES_PVMEM_ATTR_ID, RES_PVMEM_ATTR_ID, "Per-process maximum amount of virtual memory", true, ""),
-				new StringAttributeDefinition(RES_RESC_ATTR_ID, RES_RESC_ATTR_ID, "Single-node variable resource specification string", true, ""),
-				new StringAttributeDefinition(RES_VMEM_ATTR_ID, RES_VMEM_ATTR_ID, "Maximum, aggregate amount of virtual memory used by all concurrent processes", true, ""),
-				new StringAttributeDefinition(RES_WALLTIME_ATTR_ID, RES_WALLTIME_ATTR_ID, "Maximum amount of real time (wall-clock elapsed time)", true, ""),
-				new IntegerAttributeDefinition(RES_MPPE_ATTR_ID, RES_MPPE_ATTR_ID, "Number of processing elements used by a single process", true, 0),
-				new StringAttributeDefinition(RES_MPPT_ATTR_ID, RES_MPPT_ATTR_ID, "Maximum wallclock time used on the MPP", true, ""),
-				new StringAttributeDefinition(RES_PF_ATTR_ID, RES_PF_ATTR_ID, "Maximum number of file system blocks that can be used by all process", true, ""),
-				new StringAttributeDefinition(RES_PMPPT_ATTR_ID, RES_PMPPT_ATTR_ID, "Maximum amount of wall clock time used on the MPP by a single process", true, ""),
-				new IntegerAttributeDefinition(RES_PNCPUS_ATTR_ID, RES_PNCPUS_ATTR_ID, "Maximum number of processors used by any single process", true, 0),
-				new StringAttributeDefinition(RES_PPF_ATTR_ID, RES_PPF_ATTR_ID, "Maximum number of file system blocks that can be used by a single process", true, ""),
-				new IntegerAttributeDefinition(RES_PROCS_ATTR_ID, RES_PROCS_ATTR_ID, "Maximum number of processes", true, 0),
-				new StringAttributeDefinition(RES_PSDS_ATTR_ID, RES_PSDS_ATTR_ID, "Maximum number of data blocks on the SDS (secondary data storage) for any process", true, ""),
-				new StringAttributeDefinition(RES_SDS_ATTR_ID, RES_SDS_ATTR_ID, "Maximum number of data blocks on the SDS (secondary data storage)", true, ""),
-				new StringAttributeDefinition(SHELL_PATH_LIST_ATTR_ID, SHELL_PATH_LIST_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(STAGEIN_ATTR_ID, STAGEIN_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(STAGEOUT_ATTR_ID, STAGEOUT_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(UMASK_ATTR_ID, UMASK_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(USER_LIST_ATTR_ID, USER_LIST_ATTR_ID, "", true, ""),
-				new StringAttributeDefinition(VARIABLE_LIST_ATTR_ID, VARIABLE_LIST_ATTR_ID, "", true, ""),
-			};
-	
-	public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
-		return attrDefs;
-	}
-}
-
-/*
- Resource_List.arch			string		System architecture
- Resource_List.cput			time		Maximum, aggregate CPU time required by all processes
- Resource_List.file			size		Maximum disk space requirements for any single file to be created
- Resource_List.host			string		Name of requested host/node
- Resource_List.mem			size		Maximum amount of physical memory (RAM)
- Resource_List.mpiprocs		int			Number of MPI processes for this chunk
- Resource_List.ncpus		int			Number of CPUs (processors)
- Resource_List.nice			int			Requested job priority
- Resource_List.nodes		string		Number and/or type of nodes
- Resource_List.nodect		int			Number of chunks in resource request from selection directive, or number of vnodes requested from node specification
- Resource_List.ompthreads	int			Number of OpenMP threads for this chunk.
- Resource_List.pcput		time		Per-process maximum CPU time
- Resource_List.pmem			size		Per-process maximum amount of physical memory
- Resource_List.pvmem		size		Per-process maximum amount of virtual memory
- Resource_List.resc			string		Single-node variable resource specification string
- Resource_List.vmem			size		Maximum, aggregate amount of virtual memory used by all concurrent processes
- Resource_List.walltime		time		Maximum amount of real time (wall-clock elapsed time)
- Resource_List.mppe			int			The number of processing elements used by a single process
- Resource_List.mppt			time		Maximum wallclock time used on the MPP.
- Resource_List.pf			size		Maximum number of file system blocks that can be used by all process
- Resource_List.pmppt		time		Maximum amount of wall clock time used on the MPP by a single process
- Resource_List.pncpus		int			Maximum number of processors used by any single process
- Resource_List.ppf			size		Maximum number of file system blocks that can be used by a single process
- Resource_List.procs		int			Maximum number of processes
- Resource_List.psds			size		Maximum number of data blocks on the SDS (secondary data storage) for any process
- Resource_List.sds			size		Maximum number of data blocks on the SDS (secondary data storage)
-*/
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSPreferenceManager.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSPreferenceManager.java
deleted file mode 100644
index a9e6691..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/PBSPreferenceManager.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 API and implementation

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

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

-

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

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

-import org.eclipse.ptp.rm.core.RMPreferenceConstants;

-

-public class PBSPreferenceManager {

-	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(RMPreferenceConstants.PROXY_PATH, server);

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

-	}

-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/Messages.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/Messages.java
deleted file mode 100644
index 585a09e..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/Messages.java
+++ /dev/null
@@ -1,30 +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.pbs.core.messages;

-

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

-

-public class Messages extends NLS {

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

-

-	public static String PBSJobAttributes_0;

-	public static String PBSJobAttributes_1;

-	

-	static {

-		// initialize resource bundle

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

-	}

-

-	private Messages() {

-		// Prevent instances.

-	}

-}

-

diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/messages.properties b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/messages.properties
deleted file mode 100644
index 6a7b2c1..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-PBSJobAttributes_0=Number of Nodes

-PBSJobAttributes_1=Job Time Limit

diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/IPBSResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/IPBSResourceManagerConfiguration.java
deleted file mode 100644
index f4a00aa..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/IPBSResourceManagerConfiguration.java
+++ /dev/null
@@ -1,49 +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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.rmsystem;
-
-import org.eclipse.ptp.rm.core.rmsystem.IRemoteResourceManagerConfiguration;
-
-public interface IPBSResourceManagerConfiguration extends IRemoteResourceManagerConfiguration {
-
-	/**
-	 * @return the pbsdArgs
-	 */
-	public String getPBSdArgs();
-
-	/**
-	 * @return the pbsdPath
-	 */
-	public String getPBSdPath();
-	
-	/**
-	 * @return the useDefaults
-	 */
-	public boolean getUseDefaults();
-
-	/**
-	 * @param pbsdArguments
-	 *            the pbsdArgs to set
-	 */
-	public void setPBSdArgs(String pbsdArgs);
-	
-	/**
-	 * @param pbsdPath
-	 *            the pbsdPath to set
-	 */
-	public void setPBSdPath(String pbsdPath);
-
-	/**
-	 * @param useDefaults
-	 *            the useDefaults to set
-	 */
-	public void setUseDefaults(boolean useDefaults);
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManager.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManager.java
deleted file mode 100644
index caaebc4..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManager.java
+++ /dev/null
@@ -1,164 +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.pbs.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.pbs.core.rtsystem.PBSProxyRuntimeClient;

-import org.eclipse.ptp.rm.pbs.core.rtsystem.PBSRuntimeSystem;

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

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

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

-

-public class PBSResourceManager extends AbstractRuntimeResourceManager {

-

-	private Integer PBSRMID;

-	

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

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

-		PBSRMID = 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() {

-		IPBSResourceManagerConfiguration config = (IPBSResourceManagerConfiguration) getConfiguration();

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

-		PBSProxyRuntimeClient runtimeProxy = new PBSProxyRuntimeClient(config, PBSRMID);

-		return new PBSRuntimeSystem(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);

-	}

- 	

- 	/* (non-Javadoc)

- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateRM(org.eclipse.ptp.core.attributes.AttributeManager)

- 	 */

- 	@Override

- 	protected boolean doUpdateRM(AttributeManager attrs) {

- 		return updateRM(attrs);

- 	}

-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSProxyRuntimeClient.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSProxyRuntimeClient.java
deleted file mode 100644
index 0273034..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSProxyRuntimeClient.java
+++ /dev/null
@@ -1,22 +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.pbs.core.rtsystem;

-

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

-import org.eclipse.ptp.rm.pbs.core.rmsystem.IPBSResourceManagerConfiguration;

-

-public class PBSProxyRuntimeClient extends AbstractRemoteProxyRuntimeClient {

-	public PBSProxyRuntimeClient(IPBSResourceManagerConfiguration config, 

-			int baseModelId) {

-		super(config, baseModelId);

-	}

-}

diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystem.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystem.java
deleted file mode 100644
index d1d0266..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystem.java
+++ /dev/null
@@ -1,21 +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.pbs.core.rtsystem;

-

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

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

-

-public class PBSRuntimeSystem extends AbstractRemoteProxyRuntimeSystem {

-	public PBSRuntimeSystem(PBSProxyRuntimeClient proxy, AttributeDefinitionManager manager) {

-		super(proxy, manager);

-	}

-}

diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/.cproject b/rms/org.eclipse.ptp.rm.pbs.proxy/.cproject
deleted file mode 100644
index 841b658..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.proxy/.project b/rms/org.eclipse.ptp.rm.pbs.proxy/.project
deleted file mode 100644
index eb70ac2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/.project
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs.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.pbs.proxy/AUTHORS b/rms/org.eclipse.ptp.rm.pbs.proxy/AUTHORS
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/AUTHORS
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/COPYING b/rms/org.eclipse.ptp.rm.pbs.proxy/COPYING
deleted file mode 100644
index d75058f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.proxy/ChangeLog b/rms/org.eclipse.ptp.rm.pbs.proxy/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/ChangeLog
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/INSTALL b/rms/org.eclipse.ptp.rm.pbs.proxy/INSTALL
deleted file mode 100644
index 5c0c42f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-See README for build/install instructions.
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/MANIFEST.MF
deleted file mode 100644
index 0f75139..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,82 +0,0 @@
-Manifest-Version: 1.0

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

-Bundle-ManifestVersion: 2

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

-Bundle-Name: %pluginName

-Bundle-Version: 3.0.0.qualifier

-Bundle-Vendor: %providerName

-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.pbs.proxy/META-INF/eclipse.inf b/rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/eclipse.inf
deleted file mode 100644
index 92ffed2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.proxy/Makefile.am b/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.am
deleted file mode 100644
index c6beafb..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-bin_PROGRAMS =	ptp_pbs_proxy
-
-ptp_pbs_proxy_SOURCES =	src/ptp_pbs_proxy.c 
-ptp_pbs_proxy_CFLAGS =	-g $(AM_CFLAGS)
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.in b/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.in
deleted file mode 100644
index 0a275e2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.in
+++ /dev/null
@@ -1,586 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-bin_PROGRAMS = ptp_pbs_proxy$(EXEEXT)
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am__dirstamp = $(am__leading_dot)dirstamp
-am_ptp_pbs_proxy_OBJECTS = src/ptp_pbs_proxy-ptp_pbs_proxy.$(OBJEXT)
-ptp_pbs_proxy_OBJECTS = $(am_ptp_pbs_proxy_OBJECTS)
-ptp_pbs_proxy_LDADD = $(LDADD)
-ptp_pbs_proxy_LINK = $(CCLD) $(ptp_pbs_proxy_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(ptp_pbs_proxy_SOURCES)
-DIST_SOURCES = $(ptp_pbs_proxy_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PBSDIR = @PBSDIR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-ptp_pbs_proxy_SOURCES = src/ptp_pbs_proxy.c 
-ptp_pbs_proxy_CFLAGS = -g $(AM_CFLAGS)
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-src/$(am__dirstamp):
-	@$(MKDIR_P) src
-	@: > src/$(am__dirstamp)
-src/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/$(DEPDIR)
-	@: > src/$(DEPDIR)/$(am__dirstamp)
-src/ptp_pbs_proxy-ptp_pbs_proxy.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-ptp_pbs_proxy$(EXEEXT): $(ptp_pbs_proxy_OBJECTS) $(ptp_pbs_proxy_DEPENDENCIES) 
-	@rm -f ptp_pbs_proxy$(EXEEXT)
-	$(ptp_pbs_proxy_LINK) $(ptp_pbs_proxy_OBJECTS) $(ptp_pbs_proxy_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f src/ptp_pbs_proxy-ptp_pbs_proxy.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-src/ptp_pbs_proxy-ptp_pbs_proxy.o: src/ptp_pbs_proxy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_pbs_proxy_CFLAGS) $(CFLAGS) -MT src/ptp_pbs_proxy-ptp_pbs_proxy.o -MD -MP -MF src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Tpo -c -o src/ptp_pbs_proxy-ptp_pbs_proxy.o `test -f 'src/ptp_pbs_proxy.c' || echo '$(srcdir)/'`src/ptp_pbs_proxy.c
-@am__fastdepCC_TRUE@	mv -f src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Tpo src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ptp_pbs_proxy.c' object='src/ptp_pbs_proxy-ptp_pbs_proxy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_pbs_proxy_CFLAGS) $(CFLAGS) -c -o src/ptp_pbs_proxy-ptp_pbs_proxy.o `test -f 'src/ptp_pbs_proxy.c' || echo '$(srcdir)/'`src/ptp_pbs_proxy.c
-
-src/ptp_pbs_proxy-ptp_pbs_proxy.obj: src/ptp_pbs_proxy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_pbs_proxy_CFLAGS) $(CFLAGS) -MT src/ptp_pbs_proxy-ptp_pbs_proxy.obj -MD -MP -MF src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Tpo -c -o src/ptp_pbs_proxy-ptp_pbs_proxy.obj `if test -f 'src/ptp_pbs_proxy.c'; then $(CYGPATH_W) 'src/ptp_pbs_proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/ptp_pbs_proxy.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Tpo src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ptp_pbs_proxy.c' object='src/ptp_pbs_proxy-ptp_pbs_proxy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_pbs_proxy_CFLAGS) $(CFLAGS) -c -o src/ptp_pbs_proxy-ptp_pbs_proxy.obj `if test -f 'src/ptp_pbs_proxy.c'; then $(CYGPATH_W) 'src/ptp_pbs_proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/ptp_pbs_proxy.c'; fi`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-rm -f src/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf src/$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf src/$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/NEWS b/rms/org.eclipse.ptp.rm.pbs.proxy/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/NEWS
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/README b/rms/org.eclipse.ptp.rm.pbs.proxy/README
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/README
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/about.html b/rms/org.eclipse.ptp.rm.pbs.proxy/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.proxy/aclocal.m4 b/rms/org.eclipse.ptp.rm.pbs.proxy/aclocal.m4
deleted file mode 100644
index d898164..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/aclocal.m4
+++ /dev/null
@@ -1,908 +0,0 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
-
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/compile b/rms/org.eclipse.ptp.rm.pbs.proxy/compile
deleted file mode 100755
index 1b1d232..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/compile
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/config.guess b/rms/org.eclipse.ptp.rm.pbs.proxy/config.guess
deleted file mode 100755
index 396482d..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/config.guess
+++ /dev/null
@@ -1,1500 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2006-07-02'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/config.h.in b/rms/org.eclipse.ptp.rm.pbs.proxy/config.h.in
deleted file mode 100644
index e414213..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/config.h.in
+++ /dev/null
@@ -1,61 +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 `torque' library (-ltorque). */
-#undef HAVE_LIBTORQUE
-
-/* 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 <pbs_ilf.h> header file. */
-#undef HAVE_PBS_ILF_H
-
-/* 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 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
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/config.sub b/rms/org.eclipse.ptp.rm.pbs.proxy/config.sub
deleted file mode 100755
index fab0aa3..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/config.sub
+++ /dev/null
@@ -1,1616 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2006-09-20'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/configure b/rms/org.eclipse.ptp.rm.pbs.proxy/configure
deleted file mode 100755
index bcf6891..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/configure
+++ /dev/null
@@ -1,6127 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for org.eclipse.ptp.pbs 3.0.0.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='org.eclipse.ptp.pbs'
-PACKAGE_TARNAME='org-eclipse-ptp-pbs'
-PACKAGE_VERSION='3.0.0'
-PACKAGE_STRING='org.eclipse.ptp.pbs 3.0.0'
-PACKAGE_BUGREPORT=''
-
-ac_unique_file="src/ptp_pbs_proxy.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-build
-build_cpu
-build_vendor
-build_os
-PBSDIR
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-RANLIB
-CPP
-GREP
-EGREP
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures org.eclipse.ptp.pbs 3.0.0 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/org-eclipse-ptp-pbs]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of org.eclipse.ptp.pbs 3.0.0:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pbs              Specify the top dir of installed PBS rms.[REQUIRED]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-org.eclipse.ptp.pbs configure 3.0.0
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by org.eclipse.ptp.pbs $as_me 3.0.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-am__api_version='1.10'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='org-eclipse-ptp-pbs'
- VERSION='3.0.0'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		{ { echo "$as_me:$LINENO: error: utils directory not found" >&5
-echo "$as_me: error: utils directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-
-PROXY="../org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
-	PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
-	if test ! -d $PROXY; then
-		{ { echo "$as_me:$LINENO: error: proxy directory not found" >&5
-echo "$as_me: error: proxy directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-
-
-
-# Check whether --with-pbs was given.
-if test "${with_pbs+set}" = set; then
-  withval=$with_pbs;
-else
-  with_pbs=no
-fi
-
-
-PBSDIR=
-if test "x$with_pbs" != xno; then
-  PBSDIR=$with_pbs
-
-else
-  { { echo "$as_me:$LINENO: error: The top installation directory of PBS must be specified via \"--with-pbs=DIR\"." >&5
-echo "$as_me: error: The top installation directory of PBS must be specified via \"--with-pbs=DIR\"." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
-fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-CFLAGS="$CFLAGS -Wall -I$UTILS/include -I$PROXY/include -I$PBSDIR/include"
-LIBS="$LIBS -L$UTILS -L$PROXY -L$PBSDIR/lib"
-
-
-
-
-{ echo "$as_me:$LINENO: checking for bitset_new in -lutils" >&5
-echo $ECHO_N "checking for bitset_new in -lutils... $ECHO_C" >&6; }
-if test "${ac_cv_lib_utils_bitset_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutils  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bitset_new ();
-int
-main ()
-{
-return bitset_new ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_utils_bitset_new=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_utils_bitset_new=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_utils_bitset_new" >&5
-echo "${ECHO_T}$ac_cv_lib_utils_bitset_new" >&6; }
-if test $ac_cv_lib_utils_bitset_new = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUTILS 1
-_ACEOF
-
-  LIBS="-lutils $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for proxy_svr_init in -lproxysvr" >&5
-echo $ECHO_N "checking for proxy_svr_init in -lproxysvr... $ECHO_C" >&6; }
-if test "${ac_cv_lib_proxysvr_proxy_svr_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lproxysvr  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char proxy_svr_init ();
-int
-main ()
-{
-return proxy_svr_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_proxysvr_proxy_svr_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_proxysvr_proxy_svr_init=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_proxysvr_proxy_svr_init" >&5
-echo "${ECHO_T}$ac_cv_lib_proxysvr_proxy_svr_init" >&6; }
-if test $ac_cv_lib_proxysvr_proxy_svr_init = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPROXYSVR 1
-_ACEOF
-
-  LIBS="-lproxysvr $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for pbs_connect in -ltorque" >&5
-echo $ECHO_N "checking for pbs_connect in -ltorque... $ECHO_C" >&6; }
-if test "${ac_cv_lib_torque_pbs_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltorque  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pbs_connect ();
-int
-main ()
-{
-return pbs_connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_torque_pbs_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_torque_pbs_connect=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_torque_pbs_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_torque_pbs_connect" >&6; }
-if test $ac_cv_lib_torque_pbs_connect = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTORQUE 1
-_ACEOF
-
-  LIBS="-ltorque $LIBS"
-
-fi
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in pbs_ifl.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  { { echo "$as_me:$LINENO: error: pbs_ifl.h not found" >&5
-echo "$as_me: error: pbs_ifl.h not found" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-done
-
-
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_signal=int
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_signal=void
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-
-ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by org.eclipse.ptp.pbs $as_me 3.0.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-org.eclipse.ptp.pbs config.status 3.0.0
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-PBSDIR!$PBSDIR$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-RANLIB!$RANLIB$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
-  if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/configure.in b/rms/org.eclipse.ptp.rm.pbs.proxy/configure.in
deleted file mode 100644
index 0250bf7..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/configure.in
+++ /dev/null
@@ -1,79 +0,0 @@
-dnl
-dnl
-
-AC_PREREQ([2.50])
-
-AC_INIT([org.eclipse.ptp.pbs], [3.0.0])
-AC_CONFIG_SRCDIR([src/ptp_pbs_proxy.c])
-
-AM_INIT_AUTOMAKE([subdir-objects])
-
-AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_BUILD
-
-dnl
-dnl Eclipse adds version number to end of package when deploying via update site
-dnl
-
-UTILS="../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="../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 PBS
-
-AC_ARG_WITH([pbs], AS_HELP_STRING([--with-pbs],
-	[Specify the top dir of installed PBS rms.@<:@REQUIRED@:>@]),[],[with_pbs=no])
-
-PBSDIR=
-AS_IF([test "x$with_pbs" != xno],[AC_SUBST([PBSDIR],[$with_pbs])],
-       AC_MSG_ERROR([The top installation directory of PBS must be specified via "--with-pbs=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$PBSDIR/include"
-LIBS="$LIBS -L$UTILS -L$PROXY -L$PBSDIR/lib"
-
-dnl
-dnl Check for libraries.
-dnl
-
-AC_CHECK_LIB([utils], [bitset_new])
-AC_CHECK_LIB([proxysvr], [proxy_svr_init])
-AC_CHECK_LIB([torque],[pbs_connect])
-
-dnl
-dnl Check for header files.
-dnl
-
-AC_HEADER_STDC
-AC_CHECK_HEADERS([pbs_ifl.h],[],
-				[AC_MSG_ERROR([pbs_ifl.h not found])])
-
-dnl
-dnl Check for types
-dnl
-AC_TYPE_SIGNAL
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/depcomp b/rms/org.eclipse.ptp.rm.pbs.proxy/depcomp
deleted file mode 100755
index ca5ea4e..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/depcomp
+++ /dev/null
@@ -1,584 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2006-10-15.18
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/install-sh b/rms/org.eclipse.ptp.rm.pbs.proxy/install-sh
deleted file mode 100755
index 4fbbae7..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/install-sh
+++ /dev/null
@@ -1,507 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-10-14.15
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-posix_glob=
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chmodcmd=$chmodprog
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-        shift
-        shift
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dstarg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dstarg"
-      shift # fnord
-    fi
-    shift # arg
-    dstarg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix=/ ;;
-	-*) prefix=./ ;;
-	*)  prefix= ;;
-      esac
-
-      case $posix_glob in
-        '')
-	  if (set -f) 2>/dev/null; then
-	    posix_glob=true
-	  else
-	    posix_glob=false
-	  fi ;;
-      esac
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob && set -f
-      set fnord $dstdir
-      shift
-      $posix_glob && set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-	       || {
-		 echo "$0: cannot unlink or rename $dst" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dst"
-	 }
-    } || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/missing b/rms/org.eclipse.ptp.rm.pbs.proxy/missing
deleted file mode 100755
index 1c8ff70..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/missing
+++ /dev/null
@@ -1,367 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2006-05-10.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/plugin.properties b/rms/org.eclipse.ptp.rm.pbs.proxy/plugin.properties
deleted file mode 100644
index 716943f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/plugin.properties
+++ /dev/null
@@ -1,11 +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
-#
-###############################################################################
-
-pluginName=PTP PBS Proxy Agent
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_proxy.c b/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_proxy.c
deleted file mode 100644
index 4535fc8..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_proxy.c
+++ /dev/null
@@ -1,1657 +0,0 @@
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include "config.h"
-
-#include <getopt.h>
-#include <unistd.h>
-#include <stdbool.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <pwd.h>
-#include <regex.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/select.h>
-
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "handler.h"
-#include "list.h"
-#include "hash.h"
-#include "args.h"
-#include "rangeset.h"
-#include "pbs_ifl.h"
-
-#define WIRE_PROTOCOL_VERSION	"2.0"
-
-/*
- * PBS Resources
- *
- * arch			string		System architecture
- * cput			time		Maximum, aggregate CPU time required by all processes
- * file			size		Maximum disk space requirements for any single file to be created
- * host			string		Name of requested host/node
- * mem			size		Maximum amount of physical memory (RAM)
- * mpiprocs		int			Number of MPI processes for this chunk
- * ncpus		int			Number of CPUs (processors)
- * nice			int			Requested job priority
- * nodes		string		Number and/or type of nodes
- * nodect		int			Number of chunks in resource request from selection directive, or number of vnodes requested from node specification
- * ompthreads	int			Number of OpenMP threads for this chunk.
- * pcput		time		Per-process maximum CPU time
- * pmem			size		Per-process maximum amount of physical memory
- * pvmem		size		Per-process maximum amount of virtual memory
- * resc			string		Single-node variable resource specification string
- * vmem			size		Maximum, aggregate amount of virtual memory used by all concurrent processes
- * walltime		time		Maximum amount of real time (wall-clock elapsed time)
- * mppe			int			The number of processing elements used by a single process
- * mppt			time		Maximum wallclock time used on the MPP.
- * pf			size		Maximum number of file system blocks that can be used by all process
- * pmppt		time		Maximum amount of wall clock time used on the MPP by a single process
- * pncpus		int			Maximum number of processors used by any single process
- * ppf			size		Maximum number of file system blocks that can be used by a single process
- * procs		int			Maximum number of processes
- * psds			size		Maximum number of data blocks on the SDS (secondary data storage) for any process
- * sds			size		Maximum number of data blocks on the SDS (secondary data storage)
- *
- * Job Attributes
- *
- * Account_Name
- * Checkpoint
- * depend
- * Error_Path
- * Execution_Time
- * group_list
- * Hold_Types
- * Job_Name
- * Join_Path
- * Keep_Files
- * Mail_Points
- * Mail_Users
- * no_stdio_sockets
- * Output_Path
- * Priority
- * Rerunnable
- * Resource_List[.resource]
- * Shell_Path_List
- * stagein
- * stageout
- * umask
- * User_List
- * Variable_List
- * comment
- *
- * Read-only Job Attributes
- *
- * accounting_id
- * alt_id
- * array
- * array_id
- * array_index
- * array_indices_remaining
- * array_indices_submitted
- * array_state_count
- * ctime
- * etime
- * exec_host
- * egroup
- * euser
- * hashname
- * interactive
- * Job_Owner
- * job_state
- * mtime
- * qtime
- * queue
- * resources_used
- * run_count
- * schedselect
- * server
- * session_id
- *
- * Queue Attributes
- * acl_groups			string	""		The list of groups which may submit jobs to the queue
- * acl_group_enable 	boolean	false	Only allow jobs submitted from groups specified by the acl_groups parameter
- * acl_group_sloppy		boolean	false	acl_groups will be checked against all groups of which the job user is a member
- * acl_hosts			string	""		List of hosts that may submit jobs to the queue
- * acl_host_enable		boolean	false	Only allow jobs submitted from hosts specified by the acl_hosts parameter
- * acl_logic_or			boolean	false	User and group acls are logically OR'd together
- * acl_users			string	""		The list of users who may submit jobs to the queue
- * acl_user_enable		boolean	false	Only allow jobs submitted from users specified by the acl_users parameter
- * disallowed_types		string	""		List of job "types" that are not allowed in this queue
- * enabled				boolean	false 	The queue accepts new job submissions
- * keep_completed		integer	0		The number of seconds jobs should be held in the Completed state after exiting
- * kill_delay			integer	2		The number of seconds between sending a SIGTERM and a SIGKILL to a job being cancelled
- * max_queuable			integer	+INF	The maximum number of jobs allowed in the queue at any given time
- * max_running			integer	+INF	The maximum number of jobs in the queue allowed to run at any given time
- * max_user_queuable	integer	+INF	The maximum number of jobs, per user, allowed in the queue at any given time
- * max_user_run			integer	+INF	The maximum number of jobs, per user, in the queue allowed to run at any given time
- * priority				integer	+INF	The priority value associated with the queue.  DEFAULT: 0	qmgr -c "set queue batch priority=20"
- * queue_type			enum	e	 	The queue type (e=execution, r=route)
- * resources_available	string	""		The cumulative resources available to all jobs running in the queue
- * resources_default	string	""		Default resource requirements for jobs submitted to the queue
- * resources_max		string	""		The maximum resource limits for jobs submitted to the queue
- * resources_min		string	""		The minimum resource limits for jobs submitted to the queue
- * route_destinations	string	""		The potential destination queues for jobs submitted to the associated routing queue
- * started				boolean	false	Jobs in the queue are allowed to execute
- */
-/*
- * 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
-
-/*
- * RTEV_ERROR codes are used internally in the PBS specific plugin
- */
-#define RTEV_ERROR_INIT			RTEV_OFFSET + 1000
-#define RTEV_ERROR_FINALIZE		RTEV_OFFSET + 1001
-#define RTEV_ERROR_SUBMIT		RTEV_OFFSET + 1002
-#define RTEV_ERROR_JOB			RTEV_OFFSET + 1003
-#define RTEV_ERROR_SERVER		RTEV_OFFSET + 1004
-#define RTEV_ERROR_NATTR		RTEV_OFFSET + 1007
-#define RTEV_ERROR_SIGNAL		RTEV_OFFSET + 1009
-#define RTEV_ERROR_FILTER		RTEV_OFFSET + 1010
-#define RTEV_ERROR_START_EVENTS	RTEV_OFFSET + 1011
-
-#define JOB_NAME_FMT			"job%02d"
-#define PBS_QUEUE_ATTR			"queue"
-#define PBS_POLL_INTERVAL		60000000 /* 60 seconds */
-#define PROXY_TIMEOUT			20000	 /* 20 ms */
-
-#define DEFAULT_HASH_SIZE				8192
-#define DEFAULT_FILTER_HASH_SIZE		32
-#define DEFAULT_FILTER_ATTR_HASH_SIZE	32
-#define DEFAULT_HOST					"localhost"
-#define DEFAULT_PROXY					"tcp"
-
-int PBS_Initialize(int, int, char **);
-int PBS_ModelDef(int, int, char **);
-int PBS_StartEvents(int, int, char **);
-int PBS_StopEvents(int, int, char **);
-int PBS_SubmitJob(int, int, char **);
-int PBS_TerminateJob(int, int, char **);
-int PBS_Quit(int, int, char **);
-int PBS_FilterEvents(int, int, char **);
-
-enum job_state {
-	JOB_CREATED,
-	JOB_NORMAL,
-	JOB_TERMINATING,
-	JOB_TERMINATED
-};
-typedef enum job_state	job_state;
-
-struct ptp_machine {
-	int		id;
-	char *	name;
-	List *	nodes;
-};
-typedef struct ptp_machine	ptp_machine;
-
-struct ptp_node {
-	int	 	id;
-	int		number;
-	char *	name;
-	char *	state;
-	char *	user;
-	char *	group;
-	char *	mode;
-};
-typedef struct ptp_node	ptp_node;
-
-struct ptp_process {
-	int		id;
-	int		node_id;
-	int		task_id;
-	int		pid;
-};
-typedef struct ptp_process	ptp_process;
-
-struct ptp_queue {
-	int		id;
-	char *	name;
-};
-typedef struct ptp_queue ptp_queue;
-
-struct ptp_job {
-	int 			ptp_jobid;		/* job ID as known by PTP */
-	char * 			pbs_jobid;		/* PBS job ID */
-	char *			jobsubid;		/* submission ID of job */
-	ptp_queue *		queue;			/* queue this job is in */
-	int				num_procs;		/* number of procs requested for program (debugger uses num_procs+1) */
-	bool			debug;			/* job is debug job */
-	job_state		state;			/* job state */
-	bool			iof;			/* job has i/o forwarding */
-	ptp_process **	procs;			/* procs for this job */
-	rangeset *		set;			/* range set of proc IDs */
-};
-typedef struct ptp_job ptp_job;
-
-struct ptp_filter {
-	Hash *	hash;		/* attributes to filter */
-	int		num_attrs;	/* number of attributes in hash */
-	bool	children;	/* apply filter to children */
-};
-typedef struct ptp_filter	ptp_filter;
-
-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 			proxy_state = STATE_INIT;
-static proxy_svr *	conn;
-static List *		gJobList;
-static Hash *		gJobHash;
-static Hash *		gFilters;
-static List *		gMachineList;
-static List *		gQueueList;
-static int			ptp_signal_exit;
-static int			debug_level = 0; /* 0 is off */
-static RETSIGTYPE	(*saved_signals[NSIG])(int);
-static int			stream;
-static char *		gUserName;
-
-extern char *		pbs_server;
-
-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[] = {
-	PBS_Quit,
-	PBS_Initialize,
-	PBS_ModelDef,
-	PBS_StartEvents,
-	PBS_StopEvents,
-	PBS_SubmitJob,
-	PBS_TerminateJob,
-	PBS_FilterEvents
-};
-
-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'}, 
-	{"debug",			required_argument,	NULL, 	'd'}, 
-	{NULL,				0,					NULL,	0}
-};
-
-/*
- * Generate a model element ID
- */
-static int
-generate_id(void)
-{
-	return gBaseID + gLastID++;
-}
-
-/*
- * Create a new machine.
- */
-static ptp_machine *
-new_machine(char *name)
-{
-	ptp_machine *	m = (ptp_machine *)malloc(sizeof(ptp_machine));
-	m->id = generate_id();
-	m->name = strdup(name);
-	m->nodes = NewList();
-    AddToList(gMachineList, (void *)m);
-    return m;
-}
-
-static void
-free_machine(ptp_machine *m)
-{
-	RemoveFromList(gMachineList, (void *)m);
-	free(m->name);
-	free(m);
-}
-
-/*
- * Create a new node.
- */
-static ptp_node *
-new_node(ptp_machine *mach, char *name, char *state, char *user, char *group, char *mode)
-{
-	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++;
-	if (name != NULL)
-		n->name = strdup(name);
-	if (state != NULL)
-		n->state = strdup(state);
-	if (user != NULL)
-		n->user = strdup(user);
-	if (group != NULL)
-		n->group = strdup(group);
-	if (mode != NULL)
-		n->mode = strdup(mode);
-    AddToList(mach->nodes, (void *)n);
-    return n;
-}
-
-/*
- * Very expensive!
- */
-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.
- */
-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));
-	p->id = generate_id();
-	p->node_id = node_id;
-	p->task_id = task_id;
-	p->pid = pid;
-    job->procs[task_id] = p;
-    insert_in_rangeset(job->set, p->id);
-    return p;
-}
-
-static void
-free_process(ptp_process *p)
-{
-	free(p);
-}
-
-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];
-}
-
-static ptp_queue *
-new_queue(char *name) {
-	ptp_queue *	q = (ptp_queue *)malloc(sizeof(ptp_queue));
-	q->id = generate_id();
-	q->name = strdup(name);
-	AddToList(gQueueList, (void *)q);
-	return q;
-}
-
-static void
-free_queue(ptp_queue *q)
-{
-	free(q->name);
-	free(q);
-}
-
-static ptp_queue *
-find_queue_by_id(int id)
-{
-	ptp_queue *	q;
-
-	for (SetList(gQueueList); (q = (ptp_queue *)GetListElement(gQueueList)) != NULL; ) {
-		if (q->id == id) {
-			return q;
-		}
-	}
-	return NULL;
-}
-
-static ptp_queue *
-find_queue_by_name(char *name)
-{
-	ptp_queue *	q;
-
-	for (SetList(gQueueList); (q = (ptp_queue *)GetListElement(gQueueList)) != NULL; ) {
-		if (strcmp(q->name, name) == 0) {
-			return q;
-		}
-	}
-	return NULL;
-}
-
-/*
- * Find the name of the queue from the PBS job attributes
- */
-static char *
-find_pbs_queue_name(struct attrl *attrs)
-{
-	struct attrl *attr;
-
-	for (attr = attrs; attr != NULL; attr = attr->next) {
-		if (strcmp(attr->name, PBS_QUEUE_ATTR) == 0) {
-			return attr->value;
-		}
-	}
-
-	return NULL;
-}
-
-/*
- * Keep a list of the jobs that we have created. If they are
- * debug jobs, keep the debug jobid as well.
- */
-static ptp_job *
-new_job(int num_procs, bool debug, ptp_queue *queue, char *jobsubid, char *pbs_jobid)
-{
-	ptp_job *	j = (ptp_job *)malloc(sizeof(ptp_job));
-	j->queue = queue;
-	j->ptp_jobid = generate_id();
-	j->pbs_jobid = strdup(pbs_jobid);
-	j->jobsubid = NULL;
-	if (jobsubid != NULL) {
-		j->jobsubid = strdup(jobsubid);
-	}
-    j->num_procs = 0;
-    j->procs = NULL;
-    j->debug = debug;
-    j->state = JOB_CREATED;
-    j->iof = 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);
-    HashInsert(gJobHash, HashCompute(pbs_jobid, strlen(pbs_jobid)), (void *)j);
-    return j;
-}
-
-static void
-free_job(ptp_job *j)
-{
-	int	i;
-	
-	RemoveFromList(gJobList, (void *)j);
-	HashRemove(gJobHash, HashCompute(j->pbs_jobid, strlen(j->pbs_jobid)));
-	free(j->pbs_jobid);
-	free(j->jobsubid);
-	for (i = 0; i < j->num_procs; i++) {
-		if (j->procs[i] != NULL)
-			free_process(j->procs[i]);
-	}
-	if (j->procs != NULL) {
-		free(j->procs);
-	}
-	free_rangeset(j->set);
-	free(j);
-}
-
-/*
- * Find a job on the list using the PTP job ID
- */
-static ptp_job *
-find_job_by_id(int jobid)
-{
-	ptp_job *	j;
-	
-	for (SetList(gJobList); (j = (ptp_job *)GetListElement(gJobList)) != NULL; ) {
-		if (j->ptp_jobid == jobid) {
-			return j;
-		}
-	}
-	return NULL;
-}
-
-static int
-get_pbs_attr_count(struct attrl *attrs)
-{
-	int 			count = 0;
-	struct attrl *	attr;
-
-	for (attr = attrs; attr != NULL; attr = attr->next) {
-		count++;
-	}
-
-	return count;
-}
-
-static void
-add_pbs_attributes(proxy_msg *m, struct attrl *attrs)
-{
-	struct attrl *attr;
-
-	for (attr = attrs; attr != NULL; attr = attr->next) {
-		proxy_add_string_attribute(m, attr->name, attr->value);
-	}
-}
-
-static void
-shutdown_pbs()
-{
-	pbs_disconnect(stream);
-}
-
-static void
-sendOKEvent(int trans_id)
-{
-	proxy_svr_queue_msg(conn, proxy_ok_event(trans_id));
-}
-
-static void
-sendShutdownEvent(int trans_id)
-{
-	proxy_svr_queue_msg(conn, 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(conn, 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);
-	if (debug_level > 0) {
-		fprintf(stderr, "sendErrorEvent(%d, %d, ", trans_id, code);
-		vfprintf(stderr, fmt, ap);
-		fprintf(stderr, ")\n");
-		fflush(stderr);
-	}
-	proxy_svr_queue_msg(conn, 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(conn, proxy_submitjob_error_event(trans_id, jobSubId, RTEV_ERROR_SUBMIT, msg));
-}
-
-static void
-sendJobTerminateErrorEvent(int trans_id, int id, char *msg)
-{
-	char *	job_id;
-	
-	asprintf(&job_id, "%d", id);
-	
-	proxy_svr_queue_msg(conn, 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(conn, proxy_new_machine_event(trans_id, rm_id, machine_id, name, MACHINE_STATE_UP));
-	
-	free(machine_id);
-	free(rm_id);
-}
-
-static void
-sendNewQueueEvent(int trans_id, int id, char *name, struct attrl *attrs)
-{
-	char *		rm_id;
-	char *		queue_id;
-	proxy_msg *	m;
-
-	asprintf(&rm_id, "%d", gBaseID);
-	asprintf(&queue_id, "%d", id);
-
-	m = proxy_new_queue_event(trans_id, rm_id, queue_id, name, QUEUE_STATE_NORMAL, get_pbs_attr_count(attrs));
-	add_pbs_attributes(m, attrs);
-	proxy_svr_queue_msg(conn, m);
-
-	free(queue_id);
-	free(rm_id);
-}
-
-static int
-num_node_attrs(ptp_node *node)
-{
-	int	cnt = 0;
-	if (node->number >= 0)
-		cnt++;
-	return cnt;	
-}
-
-/*
- * NOTE: sending a NODE_NUMBER_ATTR will enable the node number ruler in the machines view.
- */
-static void
-add_node_attrs(proxy_msg *m, ptp_node *node)
-{
-	if (node->number >= 0)
-		proxy_add_int_attribute(m, NODE_NUMBER_ATTR, node->number);
-}
-
-static ptp_filter *
-new_filter()
-{
-	ptp_filter *	f = (ptp_filter *)malloc(sizeof(ptp_filter));
-
-	f->hash = HashCreate(DEFAULT_FILTER_ATTR_HASH_SIZE);
-	f->num_attrs = 0;
-	f->children = false;
-
-	return f;
-}
-
-static void
-add_filter_attribute(ptp_filter *f, char *attr)
-{
-	char *	name = proxy_copy_attribute_name_filter(attr);
-	char *	value = proxy_get_attribute_value_str(attr);
-
-	if (name != NULL && value != NULL) {
-		regex_t *	reg = (regex_t *)malloc(sizeof(regex_t));
-		int idx = HashCompute(name, strlen(name));
-		if (regcomp(reg, value, REG_EXTENDED|REG_NOSUB) == 0) {
-			HashInsert(f->hash, idx, reg);
-			f->num_attrs++;
-		} else {
-			free(reg);
-		}
-		free(name);
-	}
-}
-
-static void
-free_filter(ptp_filter *f)
-{
-	HashDestroy(f->hash, free);
-	free(f);
-}
-
-static bool
-match_filter_str(int id, bool is_child, struct attrl *attrs)
-{
-	struct attrl *	attr;
-	ptp_filter *	f = (ptp_filter *)HashSearch(gFilters, id);
-
-	if (f != NULL && (f->children | !is_child)) {
-		for (attr = attrs; attr != NULL; attr = attr->next) {
-			regex_t	*	reg = (regex_t *)HashFind(f->hash, attr->name);
-			if (reg != NULL && regexec(reg, attr->value, 0, NULL, 0) != 0) {
-				return false;
-			}
-		}
-	}
-
-	return true;
-}
-
-void
-update_filter(int id, ptp_filter *nf)
-{
-	ptp_filter *	f = (ptp_filter *)HashSearch(gFilters, id);
-
-	if (f != NULL) {
-		/*
-		 * If no attributes specified, remove existing filter otherwise
-		 * remove current filter and replace with new
-		 */
-		HashRemove(gFilters, id);
-		free_filter(f);
-
-		if (nf->num_attrs == 0) {
-			free_filter(nf);
-			return;
-		}
-	}
-
-	HashInsert(gFilters, id, (void *)nf);
-}
-
-static void
-sendNewJobEvent(int trans_id, ptp_job *j)
-{
-	char *		job_id;
-	char *		queue_id;
-	proxy_msg *	m;
-
-	asprintf(&job_id, "%d", j->ptp_jobid);
-	asprintf(&queue_id, "%d", j->queue->id);
-
-	m = proxy_new_job_event(trans_id, queue_id, job_id, j->pbs_jobid, JOB_STATE_INIT, j->jobsubid);
-	proxy_svr_queue_msg(conn, m);
-
-	free(job_id);
-	free(queue_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, n->state, num_node_attrs(n));
-		add_node_attrs(m, n);
-		free(node_id);
-	}
-	
-	proxy_svr_queue_msg(conn, m);
-	
-	free(machine_id);
-}
-
-static void
-sendNewProcessEvent(int trans_id, int jobid, ptp_process *p, char *state)
-{
-	proxy_msg *	m;
-	char *		job_id;
-	char *		proc_id;
-	char *		name;
-	
-	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);
-	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(conn, m);
-	
-	free(job_id);
-	free(proc_id);
-	free(name);
-}
-
-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(conn, m);
-}
-
-static void
-sendRMAttributesEvent(int trans_id, struct attrl *attr)
-{
-	proxy_msg *	m;
-	char *rm_id;
-
-	asprintf(&rm_id, "%d", gBaseID);
-
-	m = proxy_rm_change_event(trans_id, rm_id, get_pbs_attr_count(attr));
-	add_pbs_attributes(m, attr);
-	proxy_svr_queue_msg(conn, m);
-
-	free(rm_id);
-}
-	
-static void
-sendJobChangeEvent(int trans_id, ptp_job *j, struct attrl *attrs)
-{
-	char *	job_id;
-	proxy_msg *	m;
-
-	asprintf(&job_id, "%d", j->ptp_jobid);
-	m = proxy_job_change_event(trans_id, job_id, get_pbs_attr_count(attrs));
-	add_pbs_attributes(m, attrs);
-	proxy_svr_queue_msg(conn, m);
-	free(job_id);
-}
-
-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(conn, m);
-	
-	free(job_id);
-}
-
-static void
-sendProcessChangeEvent(int trans_id, ptp_process *p, int node_id, int task_id, int pid)
-{
-	int			cnt = 0;
-	char *		proc_id;
-	proxy_msg *	m;
-	
-	if (p->node_id != node_id || p->task_id != task_id || p->pid != pid) {
-		if (p->node_id != node_id) {
-			cnt++;	
-		}
-		if (p->task_id != task_id) {
-			cnt++;	
-		}
-		if (p->pid != pid) {
-			cnt++;	
-		}
-		
-		asprintf(&proc_id, "%d", p->id);
-
-		m = proxy_process_change_event(trans_id, proc_id, cnt);
-		
-		if (p->node_id != node_id) {
-			p->node_id = node_id;
-			proxy_add_int_attribute(m, ELEMENT_ID_ATTR, node_id);	
-		}
-		if (p->task_id != task_id) {
-			p->task_id = task_id;
-			proxy_add_int_attribute(m, PROC_INDEX_ATTR, task_id);	
-		}
-		if (p->pid != pid) {
-			p->pid = pid;
-			proxy_add_int_attribute(m, PROC_PID_ATTR, pid);	
-		}
-		
-		proxy_svr_queue_msg(conn, m);
-		
-		free(proc_id);
-	}
-}
-
-/*
- * TODO: optimize this so that we don't send one event for
- * every process, even if the output is identical.
- */
-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(conn, m);
-	
-	free(proc_id);	
-}
-
-/*
- * Set initial filter on queues
- */
-static void
-initialize_queue_filter(ptp_queue *q)
-{
-	char *			attr;
-	ptp_filter *	f = new_filter();
-
-	f->children = true;
-	asprintf(&attr, "Job_OwnerFilter=%s@.*", gUserName);
-	add_filter_attribute(f, attr);
-	update_filter(q->id, f);
-	free(attr);
-}
-
-/******************************
- * START OF DISPATCH ROUTINES *
- ******************************/
-int
-PBS_Initialize(int trans_id, int nargs, char **args)
-{
-	int						i;
-	ptp_machine *			mach;
-	struct batch_status *	s;
-	struct batch_status *	status;
-	
-	if (debug_level > 0) {
-		fprintf(stderr, "PBS_Initialize (%d):\n", trans_id); fflush(stderr);
-	}
-	
-	if (proxy_state != STATE_INIT) {
-		sendErrorEvent(trans_id, RTEV_ERROR_INIT, "already initialized");
-		return PROXY_RES_OK;
-	}
-	
-	/*
-	 * Process arguments for the init command
-	 */
-	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_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]);
-		}
-	}
-
-	/*
-	 * It's an error if no base ID was supplied
-	 */
-	if (gBaseID < 0) {
-		sendErrorEvent(trans_id, RTEV_ERROR_INIT, "no base ID supplied");
-		return PROXY_RES_OK;
-	}
-	
-	stream = pbs_connect(NULL);
-	if (stream < 0) {
-		sendErrorEvent(trans_id, RTEV_ERROR_INIT, "could not connect to PBS daemon");
-		return PROXY_RES_OK;
-	}
-
-	status = pbs_statserver(stream, NULL, NULL);
-	if (status == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_INIT, pbs_geterrmsg(stream));
-		return PROXY_RES_OK;
-	}
-
-	/*
-	 * Create the server machine
-	 */
-	mach = new_machine(status->name);
-
-	pbs_statfree(status);
-
-	/*
-	 * Get queues and queue attributes
-	 */
-	status = pbs_statque(stream, NULL, NULL, NULL);
-	if (status == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_INIT, pbs_geterrmsg(stream));
-		return PROXY_RES_OK;
-	}
-
-	for (s=status; s != NULL; s = s->next) {
-		ptp_queue * q = new_queue(s->name);
-		initialize_queue_filter(q);
-	}
-
-	pbs_statfree(status);
-
-	proxy_state = STATE_RUNNING;
-		
-	sendOKEvent(trans_id);
-		
-	return PROXY_RES_OK;
-}
-
-/**
- * Initiate the model definition phase
- */
-int
-PBS_ModelDef(int trans_id, int nargs, char **args)
-{
-	if (debug_level > 0) {
-		fprintf(stderr, "PBS_ModelDef (%d):\n", trans_id); fflush(stderr);
-	}
-	
-	/*
-	 * Send attribute definitions
-	 */
-	/*
-	 * Send default filters
-	 */
-	sendOKEvent(trans_id);
-	return PROXY_RES_OK;
-}
-
-/**
- * Stop polling for LSF change events
- */
- int
-PBS_StopEvents(int trans_id, int nargs, char **args)
-{
-	if (debug_level > 0) {
-		fprintf(stderr, "  PBS_StopEvents (%d):\n", trans_id); fflush(stderr);
-	}
-	/* notification that start events have completed */
-	sendOKEvent(gTransID);
-	gTransID = 0;
-	sendOKEvent(trans_id);
-	return PROXY_RES_OK;	
-}
-
-/**
- * Submit a job with the given executable path and arguments (remote call from a client proxy)
- *
- * TODO - what about queues, should there be a LSF_Submit?
- */
-int
-PBS_SubmitJob(int trans_id, int nargs, char **args)
-{
-	int						i;
-	int						a;
-	int						debug = false;
-	int						num_args = 0;
-	int						num_env = 0;
-	int						debug_argc = 0;
-	char *					jobsubid = NULL;
-	char *					pbs_jobid = NULL;
-	char *					queue_name = NULL;
-	char *					full_path;
-	char *					pgm_name = NULL;
-	char *					cwd = NULL;
-	char *					exec_path = NULL;
-	char *					debug_exec_name = NULL;
-	char *					debug_exec_path = NULL;
-	char *					debug_full_path;
-	char **					debug_args = NULL;
-	char **					env = NULL;
-	ptp_queue *				queue;
-
-	if (debug_level > 0) {
-		fprintf(stderr, "  PBS_SubmitJob (%d):\n", trans_id);
-	}
-
-	for (i = 0; i < nargs; i++) {
-		if (debug_level > 0) {
-			fprintf(stderr, "\t%s\n", args[i]);
-		}
-		if (proxy_test_attribute(JOB_SUB_ID_ATTR, args[i])) {
-			jobsubid = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(QUEUE_ID_ATTR, args[i])) {
-			queue_name = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(JOB_EXEC_NAME_ATTR, args[i])) {
-			pgm_name = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(JOB_EXEC_PATH_ATTR, args[i])) {
-			exec_path = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(JOB_WORKING_DIR_ATTR, args[i])) {
-			cwd = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(JOB_PROG_ARGS_ATTR, args[i])) {
-			num_args++;
-		} else if (proxy_test_attribute(JOB_ENV_ATTR, args[i])) {
-			num_env++;
-		} else if (proxy_test_attribute(JOB_DEBUG_ARGS_ATTR, args[i])) {
-			debug_argc++;
-		} else if (proxy_test_attribute(JOB_DEBUG_FLAG_ATTR, args[i])) {
-			debug = proxy_get_attribute_value_bool(args[i]);
-		}
-	}
-
-	if (debug_level > 0) {
-		fflush(stderr);
-	}
-	
-	if (jobsubid == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_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 (queue_name == NULL) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "no queue specified");
-		return PROXY_RES_OK;
-	}
-
-	if ((queue = find_queue_by_name(queue_name)) == NULL) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "unknown queue specified");
-		return PROXY_RES_OK;
-	}
-
-	if (nargs < 1) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "incorrect arg count");
-		return PROXY_RES_OK;
-	}
-	
-	/*
-	 * Do some checking first
-	 */
-	 
-	if (pgm_name == NULL) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "Must specify a program name");
-		return PROXY_RES_OK;
-	}
-	
-	/*
-	 * Get supplied environment. It is used to locate executable if necessary.
-	 */
-	
-	if (num_env > 0) {
-		env = (char **)malloc((num_env + 1) * sizeof(char *));
-		for (i = 0, a = 0; i < nargs; i++) {
-			if (proxy_test_attribute(JOB_ENV_ATTR, args[i]))
-				env[a++] = strdup(proxy_get_attribute_value_str(args[i]));
-		}
-		env[a] = NULL;
-	}
-		
-	/*
-	 * If no path is specified, then try to locate executable.
-	 */		
-	if (exec_path == NULL) {
-		full_path = pgm_name;
-	} else {
-		asprintf(&full_path, "%s/%s", exec_path, pgm_name);
-	}
-	
-	if (access(full_path, X_OK) < 0) {
-		sendJobSubErrorEvent(trans_id, jobsubid, strerror(errno));
-		return PROXY_RES_OK;
-	}
-	
-	if (debug) {		
-		debug_argc++;
-		debug_args = (char **)malloc((debug_argc+1) * sizeof(char *));
-		for (i = 0, a = 1; i < nargs; i++) {
-			if (proxy_test_attribute(JOB_DEBUG_ARGS_ATTR, args[i])) {
-				debug_args[a++] = proxy_get_attribute_value_str(args[i]);
-			} else if (proxy_test_attribute(JOB_DEBUG_EXEC_NAME_ATTR, args[i])) {
-				debug_exec_name = proxy_get_attribute_value_str(args[i]);
-			} else if (proxy_test_attribute(JOB_DEBUG_EXEC_PATH_ATTR, args[i])) {
-				debug_exec_path = proxy_get_attribute_value_str(args[i]);
-			}
-		}
-		debug_args[a] = NULL;
-		
-		/*
-		 * If no path is specified, then try to locate executable.
-		 */		
-		if (debug_exec_path == NULL) {
-			debug_full_path = debug_exec_name;
-		} 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));
-			return PROXY_RES_OK;
-		}
-
-		debug_args[0] = strdup(debug_full_path);
-	}
-
-	/* app_jobid = pbs_submit(stream, ...); */
-	
-	if (pbs_jobid == NULL) {
-		sendJobSubErrorEvent(trans_id, jobsubid, pbs_geterrmsg(stream));
-		return PROXY_RES_OK;
-	}
-	
-	new_job(0, false, queue, jobsubid, pbs_jobid);
-
-	/*
-	 * Send ok for job submission.
-	 */	
-	sendOKEvent(trans_id);
-	
-	return PROXY_RES_OK;
-}
-
-/* 
- * terminate a job, given a jobid 
- */
-int
-PBS_TerminateJob(int trans_id, int nargs, char **args)
-{
-	int			i;
-	int			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])) {
-			jobid = proxy_get_attribute_value_int(args[i]);
-		}
-	}
-	
-	if (jobid < 0) {
-		sendJobTerminateErrorEvent(trans_id, jobid, "Invalid job ID");
-		return PROXY_RES_OK;
-	}
-	
-	if ((j = find_job_by_id(jobid)) != NULL) {
-		if (j->state == JOB_TERMINATING) {
-			sendJobTerminateErrorEvent(trans_id, jobid, "Job termination already requested");
-			return PROXY_RES_OK;
-		}
-		
-		j->state = JOB_TERMINATING;
-
-		/* pbs_terminate(j->pbs_jobid); */
-		
-		sendOKEvent(trans_id);
-	}
-	
-	return PROXY_RES_OK;
-}
-
-/*
- * Enables sending of events. The first thing that must be sent is a
- * description of the model. This comprises new model element events
- * for each element in the model. Once the model description has been
- * sent, model change events will be sent as detected.
- * 
- */
- int
-PBS_StartEvents(int trans_id, int nargs, char **args)
-{
-	ptp_machine *			mach;
-	struct batch_status *	s;
-	struct batch_status *	status;
-	
-	if (debug_level > 0) {
-		fprintf(stderr, "  PBS_StartEvents (%d):\n", trans_id); fflush(stderr);
-	}
-
-	if (proxy_state != STATE_RUNNING) {
-		sendErrorEvent(trans_id, RTEV_ERROR_START_EVENTS, "must call INIT first");
-		return PROXY_RES_OK;
-	}
-
-	gTransID = trans_id;
-	
-	/*
-	 * Send the RM attributes
-	 */
-	status = pbs_statserver(stream, NULL, NULL);
-	if (status == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_START_EVENTS, pbs_geterrmsg(stream));
-		return PROXY_RES_OK;
-	}
-
-	sendRMAttributesEvent(trans_id, status->attribs);
-
-	/*
-	 * Send the machines
-	 */
-	for (SetList(gMachineList); (mach = (ptp_machine *)GetListElement(gMachineList)) != NULL; ) {
-		sendNewMachineEvent(trans_id, mach->id, mach->name);
-	}
-
-	pbs_statfree(status);
-
-	/*
-	 * Send queues and queue attributes
-	 */
-	status = pbs_statque(stream, NULL, NULL, NULL);
-	if (status == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_START_EVENTS, pbs_geterrmsg(stream));
-		return PROXY_RES_OK;
-	}
-
-	for (s=status; s != NULL; s = s->next) {
-		ptp_queue * q = find_queue_by_name(s->name);
-		if (q != NULL) {
-			sendNewQueueEvent(trans_id, q->id, q->name, s->attribs);
-		}
-	}
-
-	pbs_statfree(status);
-
-	if (debug_level > 0) {
-		fprintf(stderr, "  end PBS_StartEvents (%d):\n", trans_id); fflush(stderr);
-	}
-
-	return PROXY_RES_OK;
-}
-
-int
-PBS_Quit(int trans_id, int nargs, char **args)
-{
-	int old_state = proxy_state;
-	
-	if (debug_level > 0) {
-		fprintf(stderr, "PBS_Quit called!\n"); fflush(stderr);
-	}
-	
-	proxy_state = STATE_SHUTTING_DOWN;
-
-	if (old_state == STATE_RUNNING) {
-		shutdown_pbs();
-	}
-	
-	sendShutdownEvent(trans_id);
-	
-	return PROXY_RES_OK;
-}
-
-int
-PBS_FilterEvents(int trans_id, int nargs, char **args)
-{
-	int				i;
-	int				id = 0;
-	bool			filter_children = false;
-	ptp_filter *	f;
-
-	if (debug_level > 0) {
-		fprintf(stderr, "  PBS_FilterEvents (%d):\n", trans_id); fflush(stderr);
-	}
-
-	f = new_filter();
-
-	for (i = 0; i < nargs; i++) {
-		if (proxy_test_attribute(ELEMENT_ID_ATTR, args[i])) {
-			id = atoi(proxy_get_attribute_value_str(args[i]));
-		} else if (proxy_test_attribute(FILTER_CHILDREN_ATTR, args[i])) {
-			filter_children = proxy_get_attribute_value_bool(args[i]);
-		} else {
-			add_filter_attribute(f, args[i]);
-		}
-	}
-
-	if (id == 0) {
-		sendErrorEvent(trans_id, RTEV_ERROR_FILTER, "no element ID specified");
-		return PROXY_RES_OK;
-	}
-
-	f->children = filter_children;
-
-	update_filter(id, f);
-
-	return PROXY_RES_OK;
-}
-
-static int
-poll_pbs()
-{
-	int						new_jobs = 0;
-	int						changed_jobs = 0;
-	int						removed_jobs = 0;
-	HashEntry *				h;
-	Hash *					tmpJobHash;
-	ptp_job *				j;
-	struct batch_status *	status;
-	struct batch_status *	s;
-
-	status = pbs_statjob(stream, NULL, NULL, NULL);
-	if (status < 0) {
-		if (debug_level > 0) {
-			fprintf(stderr, "pbs_statjob: %s\n", pbs_geterrmsg(stream));
-		}
-		return -1;
-	}
-
-	/*
-	 * Create tmp job hash
-	 * Create tmp job list
-	 * foreach (job in status) {
-	 * 	add job and attributes to tmp job hash
-	 *  if (job not in job hash) {
-	 *  	add to tmp job list
-	 *  }
-	 * }
-	 * foreach (job in job hash) {
-	 * 	if job does not exist in tmp hash, remove job
-	 * }
-	 * foreach (job in tmp job list) {
-	 * 	add to job hash
-	 * }
-	 */
-	tmpJobHash = HashCreate(DEFAULT_HASH_SIZE);
-
-	for (s = status; s != NULL; s = s->next) {
-		int idx = HashCompute(s->name, strlen(s->name));
-		HashInsert(tmpJobHash, idx, (void *)s);
-	}
-
-	for (HashSet(gJobHash); (h = HashGet(gJobHash)) != NULL; ) {
-		j = (ptp_job *)h->h_data;
-		if (HashFind(tmpJobHash, j->pbs_jobid) == NULL) {
-			sendJobStateChangeEvent(gTransID, j->ptp_jobid, JOB_STATE_TERMINATED);
-			//sendRemoveJobEvent(gTransID, j);
-			removed_jobs++;
-		}
-	}
-
-	for (HashSet(tmpJobHash); (h = HashGet(tmpJobHash)) != NULL; ) {
-		j = (ptp_job *)HashSearch(gJobHash, h->h_hval);
-		s = (struct batch_status *)h->h_data;
-		if (j == NULL) {
-			char * queue_name = NULL;
-			ptp_queue * queue = NULL;
-
-			queue_name = find_pbs_queue_name(s->attribs);
-
-			if (queue_name == NULL || ((queue = find_queue_by_name(queue_name)) == NULL)) {
-				break;
-			}
-
-			/*
-			 * Check for queue filters
-			 */
-			if (match_filter_str(queue->id, true, s->attribs)) {
-				j = new_job(0, false, queue, NULL, s->name);
-
-				if (debug_level > 0) {
-					fprintf(stderr, "creating new job for %s\n", s->name); fflush(stderr);
-				}
-			} else if (debug_level > 0) {
-				fprintf(stderr, "filtered job %s\n", s->name); fflush(stderr);
-			}
-		}
-		if (j->state == JOB_CREATED) {
-			sendNewJobEvent(gTransID, j);
-			j->state = JOB_NORMAL;
-			new_jobs++;
-		}
-		changed_jobs++;
-	}
-
-	if (debug_level > 0) {
-		fprintf(stderr, "poll_pbs: new=%d, changed=%d, removed=%d\n", new_jobs, changed_jobs, removed_jobs); fflush(stderr);
-	}
-
-	HashDestroy(tmpJobHash, NULL);
-
-	return 0;
-}
-
-static void
-initialize()
-{
-	struct passwd *	pw;
-
-	gJobList = NewList();
-	gJobHash = HashCreate(DEFAULT_HASH_SIZE);
-	gMachineList = NewList();
-	gQueueList = NewList();
-	gFilters = HashCreate(DEFAULT_FILTER_HASH_SIZE);
-
-	pw = getpwuid(getuid());
-	if (pw != NULL) {
-		gUserName = strdup(pw->pw_name);
-	}
-}
-
-static int
-server(char *name, char *host, int port)
-{
-	int				rc = 0;
-	int				poll_timeout = 0;
-	struct timeval	timeout = {0, PROXY_TIMEOUT};
-	
-	initialize();
-	
-	if (proxy_svr_init(name, &timeout, &helper_funcs, &command_tab, &conn) != PROXY_RES_OK) {
-		if (debug_level > 0) {
-			fprintf(stderr, "proxy failed to initialized\n"); fflush(stderr);
-		}
-		return 0;
-	}
-	
-	if (proxy_svr_connect(conn, host, port) == PROXY_RES_OK) {
-		if (debug_level > 0) {
-			fprintf(stderr, "proxy connected\n"); fflush(stderr);
-		}
-		
-		while (ptp_signal_exit == 0 && proxy_state != STATE_SHUTDOWN) {
-			if (proxy_state == STATE_SHUTTING_DOWN) {
-				proxy_state = STATE_SHUTDOWN;
-			}
-			if (gTransID > 0) {
-				if ((poll_timeout -= PROXY_TIMEOUT) <= 0) {
-					if (poll_pbs() < 0) {
-						break;
-					}
-					poll_timeout = PBS_POLL_INTERVAL;
-				}
-			}
-			if (proxy_svr_progress(conn) != PROXY_RES_OK) {
-				break;
-			}
-		}
-		
-		if (ptp_signal_exit != 0) {
-			if (ptp_signal_exit != SIGCHLD && proxy_state != STATE_SHUTTING_DOWN
-					&& proxy_state != STATE_SHUTDOWN) {
-				shutdown_pbs();
-			}
-			/* our return code = the signal that fired */
-			rc = ptp_signal_exit;
-		}
-	} else if (debug_level > 0) {
-		fprintf(stderr, "proxy connection failed\n"); fflush(stderr);
-	}
-	
-	proxy_svr_finish(conn);
-	
-	return rc;
-}
-
-RETSIGTYPE
-ptp_signal_handler(int sig)
-{
-		int	ret;
-		if (sig == SIGCHLD)
-			wait(&ret);
-		ptp_signal_exit = sig;
-		if(sig >= 0 && sig < NSIG) {
-			RETSIGTYPE (*saved_signal)(int) = saved_signals[sig];
-			if(saved_signal != SIG_ERR && saved_signal != SIG_IGN && saved_signal != SIG_DFL) {
-				saved_signal(sig);
-			}
-		}
-}
-
-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:d:", 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;
-	case 'd':
-		debug_level = (int)strtol(optarg, NULL, 10);
-		break;
-	default:
-		fprintf(stderr, "%s [--proxy=proxy] [--host=host_name] [--port=port] [--debug=level]\n", argv[0]);
-		return 1;
-	}
-	
-	/* 
-	 * signal can happen any time after handlers are installed, so
-	 * make sure we catch it
-	 */
-	ptp_signal_exit = 0;
-	
-#if 0
-	/* setup our signal handlers */
-	saved_signals[SIGINT] = signal(SIGINT, ptp_signal_handler);
-	saved_signals[SIGHUP] = signal(SIGHUP, ptp_signal_handler);
-	saved_signals[SIGILL] = signal(SIGILL, ptp_signal_handler);
-	saved_signals[SIGSEGV] = signal(SIGSEGV, ptp_signal_handler);
-	saved_signals[SIGTERM] = signal(SIGTERM, ptp_signal_handler);
-	saved_signals[SIGQUIT] = signal(SIGQUIT, ptp_signal_handler);
-	saved_signals[SIGABRT] = signal(SIGABRT, ptp_signal_handler);
-	saved_signals[SIGCHLD] = signal(SIGCHLD, ptp_signal_handler);
-	
-	if(saved_signals[SIGINT] != SIG_ERR && saved_signals[SIGINT] != SIG_IGN && saved_signals[SIGINT] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGINT was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-	if(saved_signals[SIGHUP] != SIG_ERR && saved_signals[SIGHUP] != SIG_IGN && saved_signals[SIGHUP] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGHUP was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-	if(saved_signals[SIGILL] != SIG_ERR && saved_signals[SIGILL] != SIG_IGN && saved_signals[SIGILL] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGILL was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-	if(saved_signals[SIGSEGV] != SIG_ERR && saved_signals[SIGSEGV] != SIG_IGN && saved_signals[SIGSEGV] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGSEGV was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}	
-	if(saved_signals[SIGTERM] != SIG_ERR && saved_signals[SIGTERM] != SIG_IGN && saved_signals[SIGTERM] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGTERM was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-	if(saved_signals[SIGQUIT] != SIG_ERR && saved_signals[SIGQUIT] != SIG_IGN && saved_signals[SIGQUIT] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGQUIT was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-	if(saved_signals[SIGABRT] != SIG_ERR && saved_signals[SIGABRT] != SIG_IGN && saved_signals[SIGABRT] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGABRT was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}	
-	if(saved_signals[SIGCHLD] != SIG_ERR && saved_signals[SIGABRT] != SIG_IGN && saved_signals[SIGCHLD] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGABRT was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-#endif
-	rc = server(proxy_str, host, port);
-	
-	return rc;
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/.classpath b/rms/org.eclipse.ptp.rm.pbs.ui/.classpath
deleted file mode 100644
index 0329adc..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/.classpath
+++ /dev/null
@@ -1,12 +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">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/ptp/rm/remote/core/*"/>
-			<accessrule kind="accessible" pattern="org/eclipse/rm/remote/ui/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/.project b/rms/org.eclipse.ptp.rm.pbs.ui/.project
deleted file mode 100644
index 20ea7cb..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs.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.pbs.ui/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.pbs.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4cba101..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Aug 31 21:13:46 CDT 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/rms/org.eclipse.ptp.rm.pbs.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.pbs.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 72cbbe2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.ui;singleton:=true

-Bundle-Version: 3.0.0.qualifier

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

-Bundle-Vendor: %pluginProvider

-Bundle-Localization: plugin

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.debug.core,

- 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.remote.core;bundle-version="3.0.0",

- org.eclipse.ptp.remote.ui,

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

- org.eclipse.ptp.rm.pbs.core,

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

- org.eclipse.ptp.launch;bundle-version="3.0.0",

- org.eclipse.ptp.rm.ui;bundle-version="1.0.1"

-Bundle-ActivationPolicy: lazy

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

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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Import-Package: org.eclipse.ptp.rm.core.rmsystem

diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/about.html b/rms/org.eclipse.ptp.rm.pbs.ui/about.html
deleted file mode 100644
index 3106f3a..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.ui/build.properties b/rms/org.eclipse.ptp.rm.pbs.ui/build.properties
deleted file mode 100644
index ce5cf86..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.ui/plugin.properties b/rms/org.eclipse.ptp.rm.pbs.ui/plugin.properties
deleted file mode 100644
index 1306ec5..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName=PTP PBS UI

-pluginProvider=Eclipse.org

diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/plugin.xml b/rms/org.eclipse.ptp.rm.pbs.ui/plugin.xml
deleted file mode 100644
index ad1af86..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/plugin.xml
+++ /dev/null
@@ -1,36 +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.pbs.ui.preferences.PBSPreferencePage"

-            id="org.eclipse.ptp.pbs.ui.preferences.PBSPreferencePage"

-            name="PBS">

-      </page>

-   </extension>

-   <extension

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

-      <launchConfiguration

-            class="org.eclipse.ptp.rm.pbs.ui.launch.PBSRMLaunchConfigurationFactory"

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

-   </extension>

-   <extension

-         point="org.eclipse.ptp.services.core.providers">

-      <provider

-            class="org.eclipse.ptp.rm.pbs.ui.PBSServiceProvider"

-            id="org.eclipse.ptp.rm.pbs.PBSServiceProvider"

-            name="PBS"

-            serviceId="org.eclipse.ptp.core.LaunchService">

-      </provider>

-   </extension>

-   <extension

-         point="org.eclipse.ptp.services.ui.providerContributors">

-      <providerContributor

-            class="org.eclipse.ptp.rm.pbs.ui.PBSProviderContributor"

-            id="org.eclipse.ptp.rm.pbs.PBSServiceProvider">

-      </providerContributor>

-   </extension>

-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/Activator.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/Activator.java
deleted file mode 100644
index 94399bf..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/Activator.java
+++ /dev/null
@@ -1,73 +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.pbs.ui;

-

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

-import org.eclipse.ptp.rm.pbs.core.PBSPreferenceManager;

-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.pbs.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);

-		PBSPreferenceManager.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.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSProviderContributor.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSProviderContributor.java
deleted file mode 100644
index 86f92bc..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSProviderContributor.java
+++ /dev/null
@@ -1,53 +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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ptp.rm.pbs.ui.wizards.PBSResourceManagerConfigurationWizardPage;
-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.Composite;
-
-public class PBSProviderContributor implements IServiceProviderContributor 
-{
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.ui.IServiceProviderContributor#configureServiceProvider(org.eclipse.ptp.services.core.IServiceProvider, org.eclipse.swt.widgets.Composite)
-	 */
-	public void configureServiceProvider(IServiceProvider provider, Composite comp) 
-	{
-		// Nothing
-	}
-
-	/* (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 PBSResourceManagerConfigurationWizardPage((IRMConfigurationWizard)wizard);
-		return wizardPages;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSServiceProvider.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSServiceProvider.java
deleted file mode 100644
index 583f79b..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSServiceProvider.java
+++ /dev/null
@@ -1,139 +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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui;
-
-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.core.rmsystem.AbstractRemoteResourceManagerServiceProvider;
-import org.eclipse.ptp.rm.pbs.core.PBSPreferenceManager;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.IPBSResourceManagerConfiguration;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManager;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.IServiceProviderWorkingCopy;
-
-
-/**
- * Service provider for IBM Parallel Environment
- */
-public class PBSServiceProvider extends AbstractRemoteResourceManagerServiceProvider implements IPBSResourceManagerConfiguration{
-	private static final String TAG_PBSD_PATH = "pbsdPath"; //$NON-NLS-1$
-	private static final String TAG_PBSD_ARGS = "pbsdArgs"; //$NON-NLS-1$
-	private static final String TAG_PBSD_DEFAULTS = "pbsdDefaults"; //$NON-NLS-1$
-	public static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	
-	private Preferences preferences = PBSPreferenceManager.getPreferences();
-
-	public PBSServiceProvider() {
-		super();
-		setDescription("PBS Resource Manager"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Constructor for creating a working copy of the service provider
-	 * 
-	 * @param provider provider we are making a copy from
-	 */
-	public PBSServiceProvider(IServiceProvider provider) {
-		super(provider);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.ServiceProvider#copy()
-	 */
-	@Override
-	public IServiceProviderWorkingCopy copy() {
-		return new PBSServiceProvider(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerServiceProvider#createResourceManager()
-	 */
-	@Override
-	public IResourceManagerControl createResourceManager() {
-		IPUniverseControl universe = (IPUniverseControl) PTPCorePlugin.getDefault().getUniverse();
-		return new PBSResourceManager(Integer.valueOf(universe.getNextResourceManagerId()), universe, this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.pbs.core.rmsystem.IPBSResourceManagerConfiguration#getPBSdArgs()
-	 */
-	public String getPBSdArgs() {
-		return getString(TAG_PBSD_ARGS, preferences.getString(EMPTY_STRING));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.pbs.core.rmsystem.IPBSResourceManagerConfiguration#getPBSdPath()
-	 */
-	public String getPBSdPath() {
-		return getString(TAG_PBSD_PATH, preferences.getString(EMPTY_STRING));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerServiceProvider#getResourceManagerId()
-	 */
-	@Override
-	public String getResourceManagerId() {
-		return getId();
-	}
-	
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.pbs.core.rmsystem.IPBSResourceManagerConfiguration#getUseDefaults()
-	 */
-	public boolean getUseDefaults() {
-		return getBoolean(TAG_PBSD_DEFAULTS, true);
-	}
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#isConfigured()
-	 */
-	public boolean isConfigured() {
-		return true;
-	}
-	
-	/*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#setDefaultNameAndDesc()
-     */
-    public void setDefaultNameAndDesc()
-    {
-		String name = "PBS"; //$NON-NLS-1$
-		String conn = getConnectionName();
-		if (conn != null && !conn.equals("")) { //$NON-NLS-1$
-		    name += "@" + conn; //$NON-NLS-1$
-		}
-		setName(name);
-		setDescription("PBS Resource Manager"); //$NON-NLS-1$
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.pbs.core.rmsystem.IPBSResourceManagerConfiguration#setPBSdArgs(java.lang.String)
-	 */
-	public void setPBSdArgs(String pbsdArgs) {
-		putString(TAG_PBSD_ARGS, pbsdArgs);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.pbs.core.rmsystem.IPBSResourceManagerConfiguration#setPBSdPath(java.lang.String)
-	 */
-	public void setPBSdPath(String pbsdPath) {
-		putString(TAG_PBSD_PATH, pbsdPath);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.pbs.core.rmsystem.IPBSResourceManagerConfiguration#setUseDefaults(boolean)
-	 */
-	public void setUseDefaults(boolean useDefaults) {
-		putBoolean(TAG_PBSD_DEFAULTS, useDefaults);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 0344dc5..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,458 +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.pbs.ui.launch;

-

-import java.util.Map;

-

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

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

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

-import org.eclipse.jface.viewers.CellEditor;

-import org.eclipse.jface.viewers.CheckStateChangedEvent;

-import org.eclipse.jface.viewers.CheckboxTableViewer;

-import org.eclipse.jface.viewers.ColumnLabelProvider;

-import org.eclipse.jface.viewers.ColumnViewerEditor;

-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;

-import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;

-import org.eclipse.jface.viewers.EditingSupport;

-import org.eclipse.jface.viewers.FocusCellOwnerDrawHighlighter;

-import org.eclipse.jface.viewers.ICheckStateListener;

-import org.eclipse.jface.viewers.IStructuredContentProvider;

-import org.eclipse.jface.viewers.TableViewerColumn;

-import org.eclipse.jface.viewers.TableViewerEditor;

-import org.eclipse.jface.viewers.TableViewerFocusCellManager;

-import org.eclipse.jface.viewers.TextCellEditor;

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerSorter;

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

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

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

-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.launch.ui.extensions.RMLaunchValidation;

-import org.eclipse.ptp.rm.pbs.core.PBSJobAttributes;

-import org.eclipse.ptp.rm.ui.launch.BaseRMLaunchConfigurationDynamicTab;

-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.ControlAdapter;

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

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

-import org.eclipse.swt.graphics.Image;

-import org.eclipse.swt.graphics.Rectangle;

-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.Group;

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

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

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

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

-

-public class PBSRMLaunchConfigurationDynamicTab extends BaseRMLaunchConfigurationDynamicTab {

-

-	class DataSource extends RMLaunchConfigurationDynamicTabDataSource {

-		private boolean useDefArgs;

-		private String args;

-		private boolean useDefParams;

-		private Map<String, String> params;

-

-		protected DataSource(BaseRMLaunchConfigurationDynamicTab page) {

-			super(page);

-		}

-

-		@Override

-		protected void copyFromFields() throws ValidationException {

-			useDefArgs = useArgsDefaultsButton.getSelection();

-			args = extractText(argsText);

-

-			useDefParams = useParamsDefaultsButton.getSelection();

-			params.clear();

-			for (Object object : paramsViewer.getCheckedElements()) {

-//				if (object instanceof Parameter) {

-//					Parameter param = (Parameter) object;

-//					params.put(param.getName(), param.getValue());

-//				}

-			}

-		}

-

-		@Override

-		protected void copyToFields() {

-			applyText(argsText, args);

-			useArgsDefaultsButton.setSelection(useDefArgs);

-			useParamsDefaultsButton.setSelection(useDefParams);

-

-//			if (info != null) {

-//				for (Entry<String, String> param : params.entrySet()) {

-//					Parameter p = info.getParameter(param.getKey());

-//					if (p != null) {

-//						p.setValue(param.getValue());

-//						paramsViewer.setChecked(p, true);

-//						paramsViewer.update(p, null);

-//					}

-//				}

-//			}

-		}

-

-		@Override

-		protected void copyToStorage() {

-//			getConfigurationWorkingCopy().setAttribute(

-//					OpenMPILaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,

-//					useDefArgs);

-//			getConfigurationWorkingCopy().setAttribute(

-//					OpenMPILaunchConfiguration.ATTR_ARGUMENTS, args);

-//			getConfigurationWorkingCopy().setAttribute(

-//					OpenMPILaunchConfiguration.ATTR_USEDEFAULTPARAMETERS,

-//					useDefParams);

-//			getConfigurationWorkingCopy().setAttribute(

-//					OpenMPILaunchConfiguration.ATTR_PARAMETERS, params);

-		}

-

-		@Override

-		protected void loadDefault() {

-//			args = OpenMPILaunchConfigurationDefaults.ATTR_ARGUMENTS;

-//			useDefArgs = OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS;

-//			useDefParams = OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTPARAMETERS;

-//			params = OpenMPILaunchConfigurationDefaults.ATTR_PARAMETERS;

-

-		}

-

-		@Override

-		protected void loadFromStorage() {

-//			try {

-//				args = getConfiguration().getAttribute(

-//						OpenMPILaunchConfiguration.ATTR_ARGUMENTS,

-//						OpenMPILaunchConfigurationDefaults.ATTR_ARGUMENTS);

-//				useDefArgs = getConfiguration()

-//				.getAttribute(

-//						OpenMPILaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,

-//						OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS);

-//				useDefParams = getConfiguration()

-//				.getAttribute(

-//						OpenMPILaunchConfiguration.ATTR_USEDEFAULTPARAMETERS,

-//						OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTPARAMETERS);

-//				params = getConfiguration().getAttribute(

-//						OpenMPILaunchConfiguration.ATTR_PARAMETERS,

-//						OpenMPILaunchConfigurationDefaults.ATTR_PARAMETERS);

-//			} catch (CoreException e) {

-//				// TODO handle exception?

-//			}

-		}

-

-		@Override

-		protected void validateLocal() throws ValidationException {

-//			if (!useDefArgs && args == null)

-//				throw new ValidationException(

-//						Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyArguments);

-//			if (!useDefParams) {

-//				for (Object object : paramsViewer.getCheckedElements()) {

-//					if (object instanceof Parameter) {

-//						Parameter param = (Parameter) object;

-//						if (param.getValue().equals("")) //$NON-NLS-1$

-//							throw new ValidationException(

-//									Messages.AdvancedOpenMpiRMLaunchConfigurationDynamicTab_Validation_EmptyParameter);

-//					}

-//				}

-//			}

-		}

-	}

-

-	class WidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener implements ICheckStateListener {

-		public WidgetListener(BaseRMLaunchConfigurationDynamicTab dynamicTab) {

-			super(dynamicTab);

-		}

-

-		public void checkStateChanged(CheckStateChangedEvent event) {

-			if (isEnabled()) {

-				Object source = event.getSource();

-				if (source == paramsViewer) {

-					fireContentsChanged();

-					updateControls();

-				}

-			}

-		}

-

-		@Override

-		protected void doWidgetSelected(SelectionEvent e) {

-			if (e.getSource() == paramsViewer) {

-				updateControls();

-			} else {

-				super.doWidgetSelected(e);

-			}

-		}

-	}

-	protected Composite control;

-	protected Button useArgsDefaultsButton;

-	protected Text argsText;

-	protected Button useParamsDefaultsButton;

-	protected CheckboxTableViewer paramsViewer;

-	protected Table paramsTable;

-	protected AttributeManager attributes = new AttributeManager();

-

-	public PBSRMLaunchConfigurationDynamicTab(IResourceManager rm) {

-		IAttributeDefinition<?,?,?>[] attrDefs = PBSJobAttributes.getDefaultAttributeDefinitions();

-		for (int i = 0; i < attrDefs.length; i++) {

-			try {

-				attributes.addAttribute(attrDefs[i].create());

-			} catch (IllegalValueException e) {

-				// Should not happen with default values

-			}

-		}

-	}

-

-	public void createControl(Composite parent, IResourceManager rm,

-			IPQueue queue) throws CoreException {

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

-		control.setLayout(new GridLayout());

-

-		final Group jobAttributesGroup = new Group(control, SWT.NONE);

-		jobAttributesGroup.setText("Job Attributes");

-		GridLayout layout = new GridLayout();

-		layout.numColumns = 2;

-		jobAttributesGroup.setLayout(layout);

-		jobAttributesGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL,

-				true, true));

-

-		paramsViewer = CheckboxTableViewer.newCheckList(jobAttributesGroup,

-				SWT.CHECK | SWT.FULL_SELECTION);

-		paramsViewer.setContentProvider(new IStructuredContentProvider() {

-			public void dispose() {

-				// Empty implementation.

-			}

-

-			public Object[] getElements(Object inputElement) {

-				return attributes.getAttributes();

-			}

-

-			public void inputChanged(Viewer viewer, Object oldInput,

-					Object newInput) {

-				// Empty implementation.

-			}

-		});

-		paramsViewer.setSorter(new ViewerSorter() {

-			@Override

-			public int compare(Viewer viewer, Object j1, Object j2) {

-				return ((IAttribute<?,?,?>) j1).getDefinition().getName().compareTo(

-						((IAttribute<?,?,?>) j2).getDefinition().getName());

-			}

-		});

-		paramsViewer.addCheckStateListener(getLocalListener());

-		paramsViewer.setAllChecked(false);

-

-		// Enable cursor keys in table

-		TableViewerFocusCellManager focusCellManager = new TableViewerFocusCellManager(

-				paramsViewer, new FocusCellOwnerDrawHighlighter(paramsViewer));

-		ColumnViewerEditorActivationStrategy actSupport = new ColumnViewerEditorActivationStrategy(

-				paramsViewer) {

-			@Override

-			protected boolean isEditorActivationEvent(

-					ColumnViewerEditorActivationEvent event) {

-				return event.eventType == ColumnViewerEditorActivationEvent.TRAVERSAL

-				|| event.eventType == ColumnViewerEditorActivationEvent.MOUSE_DOUBLE_CLICK_SELECTION

-				|| (event.eventType == ColumnViewerEditorActivationEvent.KEY_PRESSED && event.keyCode == SWT.CR)

-				|| event.eventType == ColumnViewerEditorActivationEvent.PROGRAMMATIC;

-			}

-		};

-		TableViewerEditor.create(paramsViewer, focusCellManager, actSupport,

-				ColumnViewerEditor.TABBING_HORIZONTAL

-				| ColumnViewerEditor.TABBING_MOVE_TO_ROW_NEIGHBOR

-				| ColumnViewerEditor.TABBING_VERTICAL

-				| ColumnViewerEditor.KEYBOARD_ACTIVATION);

-

-		paramsTable = paramsViewer.getTable();

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

-		gd.heightHint = 100;

-		paramsTable.setLayoutData(gd);

-		paramsTable.setLinesVisible(true);

-		paramsTable.setHeaderVisible(true);

-		paramsTable.setEnabled(true);

-		// Disable cell item selection

-		paramsTable.addListener(SWT.EraseItem, new Listener() {

-			/*

-			 * (non-Javadoc)

-			 * 

-			 * @see

-			 * org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)

-			 */

-			public void handleEvent(Event event) {

-				event.detail &= ~SWT.SELECTED;

-			}

-		});

-

-		addColumns();

-

-		paramsViewer.setInput(this);

-	}

-

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

-			IPQueue queue, ILaunchConfiguration configuration, String mode)

-			throws CoreException {

-		return null;

-	}

-

-	public Control getControl() {

-		return control;

-	}

-

-	@Override

-	public Image getImage() {

-		return null;

-	}

-

-	@Override

-	public String getText() {

-		return "Job Attributes";

-	}

-

-	public RMLaunchValidation setDefaults(

-			ILaunchConfigurationWorkingCopy configuration, IResourceManager rm,

-			IPQueue queue) {

-//		configuration.setAttribute(

-//				OpenMPILaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,

-//				OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS);

-//		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_ARGUMENTS,

-//				OpenMPILaunchConfigurationDefaults.ATTR_ARGUMENTS);

-//		configuration.setAttribute(

-//				OpenMPILaunchConfiguration.ATTR_USEDEFAULTPARAMETERS,

-//				OpenMPILaunchConfigurationDefaults.ATTR_USEDEFAULTPARAMETERS);

-//		configuration.setAttribute(OpenMPILaunchConfiguration.ATTR_PARAMETERS,

-//				OpenMPILaunchConfigurationDefaults.ATTR_PARAMETERS);

-		return new RMLaunchValidation(true, null);

-	}

-

-	@Override

-	public void updateControls() {

-	}

-

-	/**

-	 * Add columns to the table viewer

-	 */

-	private void addColumns() {

-		/*

-		 * Name column

-		 */

-		final TableViewerColumn column1 = new TableViewerColumn(paramsViewer,

-				SWT.NONE);

-		column1.setLabelProvider(new ColumnLabelProvider() {

-			/*

-			 * (non-Javadoc)

-			 * 

-			 * @see

-			 * org.eclipse.jface.viewers.ColumnLabelProvider#getText(java.lang

-			 * .Object)

-			 */

-			@Override

-			public String getText(Object element) {

-				if (element instanceof IAttribute<?,?,?>) {

-					String name = ((IAttribute<?,?,?>) element).getDefinition().getName();

-					return name;

-				}

-				return null;

-			}

-

-		});

-		column1.getColumn().setResizable(true);

-		column1.getColumn().setText("Attribute");

-

-		/*

-		 * Value column

-		 */

-		final TableViewerColumn column2 = new TableViewerColumn(paramsViewer,

-				SWT.NONE);

-		column2.setLabelProvider(new ColumnLabelProvider() {

-			/*

-			 * (non-Javadoc)

-			 * 

-			 * @see

-			 * org.eclipse.jface.viewers.ColumnLabelProvider#getText(java.lang

-			 * .Object)

-			 */

-			@Override

-			public String getText(Object element) {

-				if (element instanceof IAttribute<?,?,?>) {

-					return ((IAttribute<?,?,?>) element).getValueAsString();

-				}

-				return null;

-			}

-

-		});

-		column2.setEditingSupport(new EditingSupport(paramsViewer) {

-			@Override

-			protected boolean canEdit(Object element) {

-				return paramsViewer.getChecked(element);

-			}

-

-			@Override

-			protected CellEditor getCellEditor(Object element) {

-				return new TextCellEditor(paramsTable);

-			}

-

-			@Override

-			protected Object getValue(Object element) {

-				return ((IAttribute<?,?,?>) element).getValueAsString();

-			}

-

-			@Override

-			protected void setValue(Object element, Object value) {

-				try {

-					((IAttribute<?,?,?>) element).setValueAsString((String) value);

-				} catch (IllegalValueException e) {

-					return;

-				}

-				getViewer().update(element, null);

-				fireContentsChanged();

-				updateControls();

-			}

-		});

-		column2.getColumn().setResizable(true);

-		column2.getColumn().setText("Value");

-

-		paramsTable.addControlListener(new ControlAdapter() {

-			@Override

-			public void controlResized(ControlEvent e) {

-				Rectangle area = paramsTable.getClientArea();

-				// Point size = paramsTable.computeSize(SWT.DEFAULT,

-				// SWT.DEFAULT);

-				ScrollBar vBar = paramsTable.getVerticalBar();

-				int width = area.width

-					- paramsTable.computeTrim(0, 0, 0, 0).width

-					- vBar.getSize().x;

-				paramsTable.getColumn(1).setWidth(width / 3);

-				paramsTable.getColumn(0).setWidth(

-						width - paramsTable.getColumn(1).getWidth());

-			}

-		});

-

-	}

-

-	private DataSource getLocalDataSource() {

-		return (DataSource) super.getDataSource();

-	}

-

-	private WidgetListener getLocalListener() {

-		return (WidgetListener) super.getListener();

-	}

-

-	@Override

-	protected RMLaunchConfigurationDynamicTabDataSource createDataSource() {

-		return new DataSource(this);

-	}

-

-	@Override

-	protected RMLaunchConfigurationDynamicTabWidgetListener createListener() {

-		return new WidgetListener(this);

-	}

-

-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationFactory.java
deleted file mode 100644
index 450484c..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationFactory.java
+++ /dev/null
@@ -1,32 +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.pbs.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.pbs.core.rmsystem.PBSResourceManager;

-

-public class PBSRMLaunchConfigurationFactory extends

-		AbstractRMLaunchConfigurationFactory {

-

-	@Override

-	protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm) throws CoreException {

-		return new PBSRMLaunchConfigurationDynamicTab(rm);

-	}

-

-	@Override

-	public Class<? extends IResourceManager> getResourceManagerClass() {

-		return PBSResourceManager.class;

-	}

-

-}

diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/Messages.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/Messages.java
deleted file mode 100644
index 86a82d2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/Messages.java
+++ /dev/null
@@ -1,70 +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.pbs.ui.messages;

-

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

-

-public class Messages extends NLS {

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

-

-	public static String PBSResourceManagerConfigurationWizardPage_name;

-	public static String PBSResourceManagerConfigurationWizardPage_title;

-	public static String PBSResourceManagerConfigurationWizardPage_description;

-

-	public static String PBSRMLaunchConfigurationDynamicTab_0;

-	public static String PBSRMLaunchConfigurationDynamicTab_1;

-	public static String PBSRMLaunchConfigurationDynamicTab_2;

-	public static String PBSRMLaunchConfigurationDynamicTab_3;

-	public static String PBSRMLaunchConfigurationDynamicTab_4;

-	public static String PBSRMLaunchConfigurationDynamicTab_5;

-	public static String PBSRMLaunchConfigurationDynamicTab_6;

-	public static String PBSRMLaunchConfigurationDynamicTab_7;

-	public static String PBSRMLaunchConfigurationDynamicTab_8;

-	public static String PBSRMLaunchConfigurationDynamicTab_9;

-	public static String PBSRMLaunchConfigurationDynamicTab_10;

-

-	public static String PBSConfigurationWizardPage_name;

-	public static String PBSConfigurationWizardPage_title;

-	public static String PBSConfigurationWizardPage_description;

-	public static String PBSConfigurationWizardPage_defaultButton;

-	public static String PBSConfigurationWizardPage_browseButton;

-	public static String PBSConfigurationWizardPage_path;

-	public static String PBSConfigurationWizardPage_arguments;

-	public static String PBSConfigurationWizardPage_invalid;

-	public static String PBSConfigurationWizardPage_select;

-	public static String PBSConfigurationWizardPage_connection_error;

-	public static String PBSConfigurationWizardPage_connection_error_msg;

-	public static String PBSConfigurationWizardPage_numProcsInvalid;

-	public static String PBSConfigurationWizardPage_timeLimitInvalid;

-

-	public static String PBSPreferencesPage_group_pbsd;

-	public static String PBSPreferencesPage_pbsdFile_text;

-	public static String PBSPreferencesPage_Select_PBSd_FILE;

-	public static String PBSPreferencesPage_Incorrect_PBSd_file;

-	public static String PBSPreferencesPage_pbsdArgs_text;

-	public static String PBSPreferencesPage_pbsdFull_text;

-	public static String PBSPreferencesPage_group_proxy;

-	public static String PBSPreferencesPage_pbsServer_text;

-	public static String PBSPreferencesPage_Select_PBS_PROXY_FILE;

-	public static String PBSPreferencesPage_Incorrect_server_file;

-	public static String PBSPreferencesPage_manual;

-	public static String PBSPreferencesPage_browseButton;

-	

-	static {

-		// initialize resource bundle

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

-	}

-

-	private Messages() {

-		// Prevent instances.

-	}

-}

-

diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/messages.properties b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/messages.properties
deleted file mode 100644
index 4c74732..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/messages.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-PBSResourceManagerConfigurationWizardPage_name=PBS Proxy Configuration

-PBSResourceManagerConfigurationWizardPage_title=PBS Proxy Configuration

-PBSResourceManagerConfigurationWizardPage_description=Enter information to connect to an PBS proxy server

-PBSRMLaunchConfigurationDynamicTab_0=Number of Processes(-n): 

-PBSRMLaunchConfigurationDynamicTab_1=Time Limit(-t):

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

-PBSRMLaunchConfigurationDynamicTab_2=Partation Requested(-p):

-PBSRMLaunchConfigurationDynamicTab_3=Job Type(--jobtype):

-PBSRMLaunchConfigurationDynamicTab_4=true

-PBSRMLaunchConfigurationDynamicTab_5=Job Io Label(-l):

-PBSRMLaunchConfigurationDynamicTab_6=true

-PBSRMLaunchConfigurationDynamicTab_7=Job Verbose Mode(-v):

-PBSRMLaunchConfigurationDynamicTab_8=Job Nodelist(-w):

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

-

-PBSConfigurationWizardPage_name=PBSD Configuration

-PBSConfigurationWizardPage_title=PBSD Configuration

-PBSConfigurationWizardPage_description=Enter information to configure PBSD

-PBSConfigurationWizardPage_defaultButton=Use default settings

-PBSConfigurationWizardPage_browseButton=Browse

-PBSConfigurationWizardPage_path=Path to PBSD:

-PBSConfigurationWizardPage_arguments=Extra PBSD arguments:

-PBSConfigurationWizardPage_invalid=Invalid PBSD path

-PBSConfigurationWizardPage_select=Select PBSD executable

-PBSConfigurationWizardPage_connection_error=Connection Error

-PBSConfigurationWizardPage_connection_error_msg=Could not open connection

-PBSConfigurationWizardPage_numProcsInvalid=

-PBSConfigurationWizardPage_timeLimitInvalid=

-PBSPreferencesPage_group_pbsd=Open Runtime Environment Daemon

-PBSPreferencesPage_pbsdFile_text=PBSd file:

-PBSPreferencesPage_Select_PBSd_FILE=Select PBSd file

-PBSPreferencesPage_Incorrect_PBSd_file=Invalid PBS daemon file

-PBSPreferencesPage_pbsdArgs_text=PBSd arguments:

-PBSPreferencesPage_pbsdFull_text=PBSd run command:

-PBSPreferencesPage_group_proxy=PBS PTP Proxy Server

-PBSPreferencesPage_pbsServer_text=PBS|PTP proxy server file:

-PBSPreferencesPage_Select_PBS_PROXY_FILE=Select PBS|PTP Proxy server file

-PBSPreferencesPage_Incorrect_server_file=Invalid PBS|PTP proxy server file

-PBSPreferencesPage_manual=Launch PBS server manually

-PBSPreferencesPage_browseButton=Browse

-

diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/preferences/PBSPreferencePage.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/preferences/PBSPreferencePage.java
deleted file mode 100644
index bd8b85f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/preferences/PBSPreferencePage.java
+++ /dev/null
@@ -1,31 +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.pbs.ui.preferences;

-

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

-import org.eclipse.ptp.rm.pbs.core.PBSPreferenceManager;

-import org.eclipse.ptp.rm.ui.preferences.AbstractRemoteRMPreferencePage;

-

-public class PBSPreferencePage extends AbstractRemoteRMPreferencePage {

-	/* (non-Javadoc)

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

-	 */

-	public Preferences getPreferences() {

-		return PBSPreferenceManager.getPreferences();

-	}

-	

-	/* (non-Javadoc)

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

-	 */

-	public void savePreferences() {

-		PBSPreferenceManager.savePreferences();

-	}

-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSConfigurationWizardPage.java
deleted file mode 100644
index f459a1e..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSConfigurationWizardPage.java
+++ /dev/null
@@ -1,459 +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.pbs.ui.wizards;

-

-import java.lang.reflect.InvocationTargetException;

-

-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.IRemoteUIConstants;

-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.pbs.core.rmsystem.IPBSResourceManagerConfiguration;

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

-import org.eclipse.ptp.rm.pbs.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 PBSConfigurationWizardPage 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 IPBSResourceManagerConfiguration config;

-	private String pbsdPath = EMPTY_STRING;

-	private String pbsdArgs = 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 PBSConfigurationWizardPage(IRMConfigurationWizard wizard) {

-		super(wizard, Messages.PBSConfigurationWizardPage_name);

-		setTitle(Messages.PBSConfigurationWizardPage_title);

-		setDescription(Messages.PBSConfigurationWizardPage_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.setPBSdPath(pbsdPath);

-			config.setPBSdArgs(pbsdArgs);

-		}

-		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.PBSConfigurationWizardPage_defaultButton);

-		defaultButton.addSelectionListener(listener);

-		gd = new GridData(GridData.FILL_HORIZONTAL);

-		gd.horizontalSpan = 3;

-		defaultButton.setLayoutData(gd);

-

-		/*

-		 * PBSD path

-		 */

-		Label label = new Label(contents, SWT.NONE);

-		label.setText(Messages.PBSConfigurationWizardPage_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.PBSConfigurationWizardPage_browseButton, null);

-		browseButton.addSelectionListener(listener);

-		

-		/*

-		 * PBSD args

-		 */

-		label = new Label(contents, SWT.NONE);

-		label.setText(Messages.PBSConfigurationWizardPage_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 = (IPBSResourceManagerConfiguration)getConfigurationWizard().getConfiguration();

-		loadSaved();

-		updateSettings();

-		defaultSetting();

-		loading = false;

-		updatePage();	

-	}

-	

-	/**

-	 * Load the initial wizard state from the configuration settings.

-	 */

-	private void loadSaved()

-	{

-		useDefaults = config.getUseDefaults();

-		pbsdPath = config.getPBSdPath();

-		pbsdArgs = config.getPBSdArgs();

-	}

-	

-	/**

-	 * @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) {

-				pbsdPath = pathText.getText();

-			}

-			if (argsText != null) {

-				pbsdArgs = 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(pbsdPath);

-		argsText.setText(pbsdArgs);

-	}

-

-	/**

-	 * 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.PBSConfigurationWizardPage_connection_error,

-									Messages.PBSConfigurationWizardPage_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.PBSConfigurationWizardPage_connection_error,

-							Messages.PBSConfigurationWizardPage_connection_error_msg,

-							new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage()));

-				} catch (InterruptedException e) {

-					ErrorDialog.openError(getShell(), Messages.PBSConfigurationWizardPage_connection_error,

-							Messages.PBSConfigurationWizardPage_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 PBSD is probably installed in the system somewhere //$NON-NLS-1$

-			String selectedPath = fileMgr.browseFile(getControl().getShell(), Messages.PBSConfigurationWizardPage_select, initialPath, IRemoteUIConstants.OPEN);

-			if (selectedPath != null) {

-				pathText.setText(selectedPath);

-			}

-		}

-	}

-

-	/**

-	 * @return

-	 */

-	protected boolean isValidSetting() 

-	{

-		if (defaultButton != null && defaultButton.getSelection()) {

-			return true;

-		}

-		

-		if (pathText != null) {

-			String name = getFieldContent(pathText.getText());

-			if (name == null) {

-				setErrorMessage(Messages.PBSConfigurationWizardPage_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.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSResourceManagerConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSResourceManagerConfigurationWizardPage.java
deleted file mode 100644
index 9fbccbf..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSResourceManagerConfigurationWizardPage.java
+++ /dev/null
@@ -1,25 +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.pbs.ui.wizards;

-

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

-import org.eclipse.ptp.rm.ui.wizards.AbstractRemoteProxyResourceManagerConfigurationWizardPage;

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

-

-public final class PBSResourceManagerConfigurationWizardPage extends

-	AbstractRemoteProxyResourceManagerConfigurationWizardPage {

-	

-	public PBSResourceManagerConfigurationWizardPage(IRMConfigurationWizard wizard) {

-		super(wizard, Messages.PBSResourceManagerConfigurationWizardPage_name);

-		setTitle(Messages.PBSResourceManagerConfigurationWizardPage_title);

-		setDescription(Messages.PBSResourceManagerConfigurationWizardPage_description);

-	}

-}

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 f1e67a8..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

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

-Bundle-Version: 3.0.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.services.core;bundle-version="1.0.0",

- org.eclipse.ptp.proxy.protocol,

- org.eclipse.ptp.core,

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

- org.eclipse.ptp.rm.core;bundle-version="1.0.1"

-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,

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

- org.eclipse.ptp.rm.core.rtsystem

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 6494301..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

-

-</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 99a325d..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMPreferenceManager.java
+++ /dev/null
@@ -1,57 +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.Preferences;

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

-import org.eclipse.ptp.rm.core.RMPreferenceConstants;

-

-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(RMPreferenceConstants.PROXY_PATH, server);

-		preferences.setDefault(RMPreferenceConstants.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/ISLURMResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/ISLURMResourceManagerConfiguration.java
deleted file mode 100644
index f3bf5d9..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/ISLURMResourceManagerConfiguration.java
+++ /dev/null
@@ -1,49 +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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.core.rmsystem;
-
-import org.eclipse.ptp.rm.core.rmsystem.IRemoteResourceManagerConfiguration;
-
-public interface ISLURMResourceManagerConfiguration extends IRemoteResourceManagerConfiguration {
-
-	/**
-	 * @return the slurmdArgs
-	 */
-	public String getSlurmdArgs();
-
-	/**
-	 * @return the slurmdPath
-	 */
-	public String getSlurmdPath();
-	
-	/**
-	 * @return the useDefaults
-	 */
-	public boolean getUseDefaults();
-
-	/**
-	 * @param slurmdArguments
-	 *            the slurmdArgs to set
-	 */
-	public void setSlurmdArgs(String slurmdArgs);
-	
-	/**
-	 * @param slurmdPath
-	 *            the slurmdPath to set
-	 */
-	public void setSlurmdPath(String slurmdPath);
-
-	/**
-	 * @param useDefaults
-	 *            the useDefaults to set
-	 */
-	public void setUseDefaults(boolean 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/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 04f22cd..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManager.java
+++ /dev/null
@@ -1,166 +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() {

-		ISLURMResourceManagerConfiguration config = (ISLURMResourceManagerConfiguration) 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);

-	}

- 	

- 	/* (non-Javadoc)

- 	 * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateRM(org.eclipse.ptp.core.attributes.AttributeManager)

- 	 */

- 	@Override

- 	protected boolean doUpdateRM(AttributeManager attrs) {

- 		return updateRM(attrs);

- 	}

-}
\ No newline at end of file
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 fcfd815..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyCommandFactory.java
+++ /dev/null
@@ -1,109 +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.IProxyRuntimeFilterEventsCommand;

-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.ISLURMResourceManagerConfiguration;

-

-public class SLURMProxyCommandFactory implements IProxyRuntimeCommandFactory {

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

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

-

-	private IProxyRuntimeCommandFactory factory;

-	private ISLURMResourceManagerConfiguration config;

-

-	public SLURMProxyCommandFactory(ISLURMResourceManagerConfiguration config) {

-		this.factory = new ProxyRuntimeCommandFactory();

-		this.config = config;

-	}

-	

-	/* (non-Javadoc)

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

-	 */

-	public IProxyRuntimeFilterEventsCommand newProxyRuntimeFilterEventsCommand(String[] args) {

-		return factory.newProxyRuntimeFilterEventsCommand(args);

-	}

-	

-	/* (non-Javadoc)

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

-	 */

-	public IProxyRuntimeInitCommand newProxyRuntimeInitCommand(int baseId) {

-		IProxyRuntimeInitCommand cmd = factory.newProxyRuntimeInitCommand(baseId);

-		if (!config.getUseDefaults()) {

-			if (!config.getSlurmdPath().equals("")) { //$NON-NLS-1$

-				cmd.addArgument(SLURMD_PATH_ATTR + "=" + config.getSlurmdPath()); //$NON-NLS-1$

-			}

-			if (!config.getSlurmdArgs().equals("")) { //$NON-NLS-1$

-				for (String arg : config.getSlurmdArgs().split(" ")) { //$NON-NLS-1$

-					cmd.addArgument(SLURMD_ARGS_ATTR + "=" + arg); //$NON-NLS-1$

-				}

-			}

-		}

-		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 3146419..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.core.rtsystem.AbstractRemoteProxyRuntimeClient;

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

-

-public class SLURMProxyRuntimeClient extends AbstractRemoteProxyRuntimeClient {

-	public SLURMProxyRuntimeClient(ISLURMResourceManagerConfiguration 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 adca52b..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.core.rtsystem.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 154c7e8..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: 3.0.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.services.core;bundle-version="1.0.0",

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

- org.eclipse.ptp.core,

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

- org.eclipse.ptp.remote.ui,

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

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

- org.eclipse.ptp.launch;bundle-version="3.0.0",

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

- org.eclipse.ptp.rm.core;bundle-version="1.0.1",

- org.eclipse.ptp.rm.ui;bundle-version="1.0.1"

-Eclipse-LazyStart: true

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

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

-Import-Package: org.eclipse.ptp.rm.core.rmsystem,

- org.eclipse.ptp.rm.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 938e5b9..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/plugin.xml
+++ /dev/null
@@ -1,36 +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.SLURMPreferencePage"

-            name="SLURM">

-      </page>

-   </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>

-   <extension

-         point="org.eclipse.ptp.services.core.providers">

-      <provider

-            class="org.eclipse.ptp.rm.slurm.ui.SLURMServiceProvider"

-            id="org.eclipse.ptp.rm.slurm.SLURMServiceProvider"

-            name="SLURM"

-            serviceId="org.eclipse.ptp.core.LaunchService">

-      </provider>

-   </extension>

-   <extension

-         point="org.eclipse.ptp.services.ui.providerContributors">

-      <providerContributor

-            class="org.eclipse.ptp.rm.slurm.ui.SLURMProviderContributor"

-            id="org.eclipse.ptp.rm.slurm.SLURMServiceProvider">

-      </providerContributor>

-   </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/SLURMProviderContributor.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/SLURMProviderContributor.java
deleted file mode 100644
index 6419254..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/SLURMProviderContributor.java
+++ /dev/null
@@ -1,52 +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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.ui;
-
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ptp.rm.slurm.ui.wizards.SLURMResourceManagerConfigurationWizardPage;
-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.Composite;
-
-public class SLURMProviderContributor implements IServiceProviderContributor 
-{
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.ui.IServiceProviderContributor#configureServiceProvider(org.eclipse.ptp.services.core.IServiceProvider, org.eclipse.swt.widgets.Composite)
-	 */
-	public void configureServiceProvider(IServiceProvider provider, Composite comp) 
-	{
-		// Nothing
-	}
-
-	/* (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 SLURMResourceManagerConfigurationWizardPage((IRMConfigurationWizard)wizard);
-		return wizardPages;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/SLURMServiceProvider.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/SLURMServiceProvider.java
deleted file mode 100644
index 5e852dd..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/SLURMServiceProvider.java
+++ /dev/null
@@ -1,139 +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 - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.ui;
-
-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.core.rmsystem.AbstractRemoteResourceManagerServiceProvider;
-import org.eclipse.ptp.rm.slurm.core.SLURMPreferenceManager;
-import org.eclipse.ptp.rm.slurm.core.rmsystem.ISLURMResourceManagerConfiguration;
-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManager;
-import org.eclipse.ptp.services.core.IServiceProvider;
-import org.eclipse.ptp.services.core.IServiceProviderWorkingCopy;
-
-
-/**
- * Service provider for IBM Parallel Environment
- */
-public class SLURMServiceProvider extends AbstractRemoteResourceManagerServiceProvider implements ISLURMResourceManagerConfiguration{
-	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$
-	public static final String EMPTY_STRING = ""; //$NON-NLS-1$
-	
-	private Preferences preferences = SLURMPreferenceManager.getPreferences();
-	
-	public SLURMServiceProvider() {
-		super();
-		setDescription("SLURM Resource Manager"); //$NON-NLS-1$
-	}
-
-	/**
-	 * Constructor for creating a working copy of the service provider
-	 * 
-	 * @param provider provider we are making a copy from
-	 */
-	public SLURMServiceProvider(IServiceProvider provider) {
-		super(provider);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.ServiceProvider#copy()
-	 */
-	@Override
-	public IServiceProviderWorkingCopy copy() {
-		return new SLURMServiceProvider(this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerServiceProvider#createResourceManager()
-	 */
-	@Override
-	public IResourceManagerControl createResourceManager() {
-		IPUniverseControl universe = (IPUniverseControl) PTPCorePlugin.getDefault().getUniverse();
-		return new SLURMResourceManager(Integer.valueOf(universe.getNextResourceManagerId()), universe, this);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerServiceProvider#getResourceManagerId()
-	 */
-	@Override
-	public String getResourceManagerId() {
-		return getId();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.slurm.core.rmsystem.ISLURMResourceManagerConfiguration#getSlurmdArgs()
-	 */
-	public String getSlurmdArgs() {
-		return getString(TAG_SLURMD_ARGS, preferences.getString(EMPTY_STRING));
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.slurm.core.rmsystem.ISLURMResourceManagerConfiguration#getSlurmdPath()
-	 */
-	public String getSlurmdPath() {
-		return getString(TAG_SLURMD_PATH, preferences.getString(EMPTY_STRING));
-	}
-	
-    /* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.slurm.core.rmsystem.ISLURMResourceManagerConfiguration#getUseDefaults()
-	 */
-	public boolean getUseDefaults() {
-		return getBoolean(TAG_SLURMD_DEFAULTS, true);
-	}
-    
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#isConfigured()
-	 */
-	public boolean isConfigured() {
-		return true;
-	}
-	
-	/*
-     * (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("")) { //$NON-NLS-1$
-		    name += "@" + conn; //$NON-NLS-1$
-		}
-		setName(name);
-		setDescription("SLURM Resource Manager"); //$NON-NLS-1$
-    }
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.slurm.core.rmsystem.ISLURMResourceManagerConfiguration#setSlurmdArgs(java.lang.String)
-	 */
-	public void setSlurmdArgs(String slurmdArgs) {
-		putString(TAG_SLURMD_ARGS, slurmdArgs);
-	}	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.slurm.core.rmsystem.ISLURMResourceManagerConfiguration#setSlurmdPath(java.lang.String)
-	 */
-	public void setSlurmdPath(String slurmdPath) {
-		putString(TAG_SLURMD_PATH, slurmdPath);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ptp.rm.slurm.core.rmsystem.ISLURMResourceManagerConfiguration#setUseDefaults(boolean)
-	 */
-	public void setUseDefaults(boolean useDefaults) {
-		putBoolean(TAG_SLURMD_DEFAULTS, useDefaults);
-	}
-}
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 966541d..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.ui.preferences.AbstractRemoteRMPreferencePage;

-

-public class SLURMPreferencePage extends AbstractRemoteRMPreferencePage {

-	/* (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 a8618a5..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.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.IRemoteUIConstants;

-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.ISLURMResourceManagerConfiguration;

-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 ISLURMResourceManagerConfiguration 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 = (ISLURMResourceManagerConfiguration)getConfigurationWizard().getConfiguration();

-		loadSaved();

-		updateSettings();

-		defaultSetting();

-		loading = false;

-		updatePage();	

-	}

-	

-	/**

-	 * Load the initial wizard state from the configuration settings.

-	 */

-	private void loadSaved()

-	{

-		useDefaults = config.getUseDefaults();

-		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$

-			String selectedPath = fileMgr.browseFile(getControl().getShell(), Messages.SLURMConfigurationWizardPage_select, initialPath, IRemoteUIConstants.OPEN);

-			if (selectedPath != null) {

-				pathText.setText(selectedPath);

-			}

-		}

-	}

-

-	/**

-	 * @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 2cc7c97..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.slurm.ui.messages.Messages;

-import org.eclipse.ptp.rm.ui.wizards.AbstractRemoteProxyResourceManagerConfigurationWizardPage;

-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/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 16d1671..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +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: .
-Export-Package: org.eclipse.ptp.pldt.upc,
- org.eclipse.ptp.pldt.upc.actions,
- org.eclipse.ptp.pldt.upc.analysis,
- org.eclipse.ptp.pldt.upc.editorHelp,
- org.eclipse.ptp.pldt.upc.prefs,
- org.eclipse.ptp.pldt.upc.views
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);
-	}
-}