This commit was manufactured by cvs2svn to create tag 'v200907172109'.
Sprout from master 2009-07-16 18:49:43 UTC Mike Kucera <mkucera@ca.ibm.com> '[245708] indexer preferences not passed to remote indexer'
Delete:
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/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/ptpbuild
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.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.orte-feature/.project
releng/org.eclipse.ptp.rm.orte-feature/build.properties
releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
releng/org.eclipse.ptp.rm.orte-feature/feature.properties
releng/org.eclipse.ptp.rm.orte-feature/feature.xml
releng/org.eclipse.ptp.rm.orte-feature/license.html
releng/org.eclipse.ptp.rm.slurm-feature/.project
releng/org.eclipse.ptp.rm.slurm-feature/build.properties
releng/org.eclipse.ptp.rm.slurm-feature/epl-v10.html
releng/org.eclipse.ptp.rm.slurm-feature/feature.properties
releng/org.eclipse.ptp.rm.slurm-feature/feature.xml
releng/org.eclipse.ptp.rm.slurm-feature/license.html
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/MPICH2ResourceManager.java
rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java
rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java
rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/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/MPICH2UIPlugin.java
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPage.java
rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java
rms/org.eclipse.ptp.rm.slurm.core/.classpath
rms/org.eclipse.ptp.rm.slurm.core/.project
rms/org.eclipse.ptp.rm.slurm.core/META-INF/MANIFEST.MF
rms/org.eclipse.ptp.rm.slurm.core/about.html
rms/org.eclipse.ptp.rm.slurm.core/build.properties
rms/org.eclipse.ptp.rm.slurm.core/plugin.properties
rms/org.eclipse.ptp.rm.slurm.core/plugin.xml
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/Activator.java
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMAttributes.java
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMJobAttributes.java
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMPreferenceManager.java
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/Messages.java
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/messages.properties
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManager.java
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerConfiguration.java
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerFactory.java
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyCommandFactory.java
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyRuntimeClient.java
rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMRuntimeSystem.java
rms/org.eclipse.ptp.rm.slurm.proxy/.cproject
rms/org.eclipse.ptp.rm.slurm.proxy/.project
rms/org.eclipse.ptp.rm.slurm.proxy/AUTHORS
rms/org.eclipse.ptp.rm.slurm.proxy/COPYING
rms/org.eclipse.ptp.rm.slurm.proxy/ChangeLog
rms/org.eclipse.ptp.rm.slurm.proxy/INSTALL
rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/MANIFEST.MF
rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/eclipse.inf
rms/org.eclipse.ptp.rm.slurm.proxy/Makefile.am
rms/org.eclipse.ptp.rm.slurm.proxy/NEWS
rms/org.eclipse.ptp.rm.slurm.proxy/README
rms/org.eclipse.ptp.rm.slurm.proxy/about.html
rms/org.eclipse.ptp.rm.slurm.proxy/config.h.in
rms/org.eclipse.ptp.rm.slurm.proxy/configure.in
rms/org.eclipse.ptp.rm.slurm.proxy/libproxy.patch
rms/org.eclipse.ptp.rm.slurm.proxy/src/ptp_slurm_proxy.c
rms/org.eclipse.ptp.rm.slurm.ui/.classpath
rms/org.eclipse.ptp.rm.slurm.ui/.project
rms/org.eclipse.ptp.rm.slurm.ui/META-INF/MANIFEST.MF
rms/org.eclipse.ptp.rm.slurm.ui/about.html
rms/org.eclipse.ptp.rm.slurm.ui/build.properties
rms/org.eclipse.ptp.rm.slurm.ui/plugin.properties
rms/org.eclipse.ptp.rm.slurm.ui/plugin.xml
rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/Activator.java
rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/Messages.java
rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/messages.properties
rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/preferences/SLURMPreferencePage.java
rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationDynamicTab.java
rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationFactory.java
rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMConfigurationWizardPage.java
rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPage.java
rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPageFactory.java
tools/pldt/org.eclipse.ptp.pldt.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.javadiff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.classpath b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.project b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.project
deleted file mode 100644
index 73133d1..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ptp.rdt.managedbuilder.xlc.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.settings/org.eclipse.jdt.core.prefs b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 827d2b8..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Mar 30 10:27:17 EDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 106a1a5..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.ptp.rdt.managedbuilder.xlc.ui;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.ptp.rdt.managedbuilder.xlc.ui.Activator
-Bundle-Localization: plugin
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.cdt.managedbuilder.core;bundle-version="5.0.100",
- org.eclipse.cdt.managedbuilder.xlc.core;bundle-version="5.0.0",
- org.eclipse.cdt.managedbuilder.xlc.ui;bundle-version="6.0.0",
- org.eclipse.ptp.rdt.core;bundle-version="1.0.0",
- org.eclipse.core.resources;bundle-version="3.5.0",
- org.eclipse.ptp.rdt.services;bundle-version="1.0.1",
- org.eclipse.ptp.remote.core;bundle-version="2.1.0",
- org.eclipse.cdt.core;bundle-version="5.1.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.rdt.managedbuilder.xlc.ui
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/about.html b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/about.html
deleted file mode 100644
index 1f6787d..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>April 30, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/build.properties b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/build.properties
deleted file mode 100644
index 0dc34f7..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- plugin.properties
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.properties b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.properties
deleted file mode 100644
index e0efd70..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.properties
+++ /dev/null
@@ -1,436 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName = Remote XL C/C++ Managed Build UI Plugin
-providerName = Eclipse.org
-
-variableDescription = XL C/C++ Compiler Root Location
-
-#Build model names
-TargetName.xlc.exe = Remote Executable (XL C/C++)
-TargetName.xlc.so = Remote Shared Library (XL C/C++)
-TargetName.xlc.lib = Remote Static Library(XL C/C++)
-
-# Default Configuration Names
-# START NON-TRANSLATABLE
-ConfigName.Rel = Release
-ConfigName.Dbg = Debug
-# END NON-TRANSLATABLE
-
-# Generic tool-chain names
-ToolChainName.Rel=Remote XL C/C++ Tool Chain
-ToolChainName.Dbg=Remote XL C/C++ Tool Chain
-
-# Generic platform names
-PlatformName.Rel=Release Platform
-PlatformName.Dbg=Debug Platform
-
-# Generic builder names
-BuilderName.Rel=GNU Make
-BuilderName.Dbg=GNU Make
-
-# Tool names
-ToolName.compiler.xlc.c = Remote XL C Compiler
-ToolName.compiler.xlc.cpp = Remote XL C++ Compiler
-ToolName.linker.xlc.c = Remote XL C Executable Linker
-ToolName.linker.xlc.cpp = Remote XL C++ Executable Linker
-ToolName.archiver.xlc = Archiver
-ToolName.assembler.xlc = XL Assembler
-ToolName.linker.xlc.cpp.so = Remote XL C++ Shared Object Linker
-ToolName.linker.xlc.c.so = Remote XL C Shared Object Linker
-
-# Generic Category Names
-OptionCategory.Linking = Linking
-OptionCategory.Libs = Libraries and Paths
-OptionCategory.ifp = Integer and Floating Point
-OptionCategory.cc = Compiler Customization
-OptionCategory.lm = Listings and Messages
-OptionCategory.ecd = Error Checking and Debugging
-OptionCategory.Input = Input Control
-OptionCategory.Output = Output Control
-OptionCategory.Optimize=Optimization
-OptionCategory.Comp = Compatibility
-OptionCategory.Misc=Miscellaneous
-OptionCategory.Assembler=Assembler Options
-OptionCategory.General=General
-OptionCategory.objcc=Object code control
-
-
-# generic names used by multiple options
-Option.none = none
-Option.default = default
-
-# Miscellaneous options
-Option.compiler.other = Other compiler flags
-
-# Input Control options
-Option.Preproccomments = Preserve comments in pre-processed output (-C)
-Option.DefSym = Define a macro name (-D)
-Option.InclPaths = Specify an additional search path for #include s (-I)
-Option.UndefSym = Undefine a macro name (-U)
-Option.altivec = Enable compiler support for vector data types (-qaltivec)
-Option.asm = Control the interpretation of and subsequent generation of code for asm statement (-qasm)
-Option.asm.default = Default
-Option.asm.stdcpp = Standard (-qasm=stdcpp)
-Option.asm.gcc = GCC (-qasm=gcc)
-Option.Cstdinc = Specify C standard search location (-qc_stdinc)
-Option.cppstdinc = Specify C++ standard search location (-qcpp_stdinc)
-Option.qcomplexgccincl = Wrap include files in GCC pragmas (-qcomplexgccincl)
-Option.Nocplus = Don't recognize C++ comments in C source files(-qnocpluscmt)
-Option.Mbcs = Enable recognition of multi-byte characters (-qmbcs)
-Option.Digraph = Enable recognition of digraph characters (-qdigraph)
-Option.Dollar = Allow $ symbols to be used in identifiers (-qdollar)
-Option.Incdirfirst = Change the search path (-qidirfirst)
-Option.ignprag = Ignore certain pragmas (-qignprag=)
-Option.ignprag.disjoint = disjoint
-Option.ignprag.isolated = isolated
-Option.ignprag.all = all
-Option.ignprag.ibm = IBM(R)
-Option.ignprag.omp = omp
-Option.Keyword = Treat specified name as a keyword(-qkeyword)
-Option.langlvl = Language level (-qlanglvl=)
-Option.langlvl.classic = classic
-Option.langlvl.extended = extended
-Option.langlvl.saa = SAA
-Option.langlvl.saal2 = SAA Level 2
-Option.langlvl.stdc89 = C89 standard
-Option.langlvl.stdc99 = C99 standard
-Option.langlvl.extc89 = C89 with extensions
-Option.langlvl.extc99 = C99 with extensions
-Option.langlvl.ucs = UCS
-Option.Macpstr = Convert pascal string literals into null-terminated string literals (-qmacpstr)
-Option.Pascal = Recognize and accept the keyword pascal (-qpascal)
-Option.sourcetype = Override source type (-qsourcetype)
-Option.sourcetype.c = c
-Option.sourcetype.c++ = C++
-Option.sourcetype.assembler = assembler
-Option.stdframework = Search standard framework directories (-qstdframework)
-Option.frameworkdirs = Specify additional framework directories (-qframeworkdir)
-Option.Input = Don't search the default search path directories (-qnostdinc)
-Option.Warn.Syntax =Perform syntax checking without generating an object file(-qsyntaxonly)
-Option.Trigraph=Recognize tri-graph key combinations
-Option.Utf=Enable recognition of UTF literal syntax (-qutf)
-Option.plus = Compile any file as a C++ file (-+)
-Option.cinc = Insert extern "C" {} in the specified include files (-qcinc)
-Option.gcc_c_stdinc = Change GCC headers search location (-qgcc_c_stdinc)
-Option.gcc_cpp_stdinc = Change G++ headers search location (-qgcc_cpp_stdinc)
-
-# Output Control options
-
-Option.Trace=Preview the steps for compilation(-#)
-Option.bmaxdata=Maximum size of the area shared by the static data and the heap (-bmaxdata=)
-Option.c=Pass the source files through compiler component only(-c)
-Option.PreprocOnly=Preprocess the source files and create an output preprocessed source file (-E)
-Option.PreprocRemoveComments=Remove comments from preprocessed output (-C!)
-Option.M=Create an output file that contains targets for the make command (-M)
-Option.ma=Substitute inline code for calls to alloca (-ma)
-Option.o=Specify an output location for the files created by the compiler (-o)
-Option.P=Preprocess the source files and create an output preprocessed source file for each source file(-P)
-Option.Assem=Generate an assembler language file for each source file(-S)
-Option.Strip=Strip symbol table, line number information and relocation information from source file(-s)
-Option.64=Select 64-bit compiler mode(-q64)
-Option.Align=Specify what alignment rules compiler uses for compilation(-qalign)
-Option.Align.Full=full
-Option.Align.Natural=natural
-Option.Align.twobyte=two byte
-Option.Align.packed=packed
-Option.Align.bitpacked=bit packed
-Option.alloca=Substitute inline code for calls to function alloca(-qalloca)
-Option.Bitfields=Specify if bit fields are signed(-qbitfields)
-Option.Bitfields.signed = signed
-Option.Bitfields.unsigned = unsigned
-Option.Chars=Specify if chars are signed
-Option.chars.signed = signed (-qchars=signed)
-Option.chars.unsigned = unsigned (-qcharse=unsigned)
-Option.enablevmx=Enable generation of VMX instructions(-qenablevmx)
-Option.Enum=Specify the amount of storage occupied by enumerations(-qenum=)
-Option.enum.Int=Int
-Option.enum.Intlong=Intlong
-Option.enum.small=small
-Option.enum.1=1
-Option.enum.2=2
-Option.enum.4=4
-Option.enum.8=8
-Option.Pic=Generate position independent code suitable for use in libraries(-qpic=)
-Option.Pic.Small=Small
-Option.Pic.Large=Large
-Option.noro=Do not place string literals in read only storage (-qnoro)
-Option.noroconst=Do not place constant values in read only storage (-qnoroconst)
-Option.roptr=Place constant pointers in read only storage (-qroptr)
-Option.Statsym=Generate symbols for static variables (-qstatsym )
-Option.xcall=Generate code to treat static functions as external functions (-qxcall )
-Option.funcset=Place instructions for each function in a separate object file control section or csect (-qfuncset)
-Option.ppline=Enable generation of #line directive in the preprocessed output (-qppline)
-Option.upconv=Preserve the unsigned specification when performing integral promotions (-qupconv)
-Option.namemangling=Name mangling scheme for external symbol names (-qnamemangling=)
-Option.namemangling.v10.name=Name mangling scheme for external symbol names (-qnamemangling=)
-Option.namemangling.ansi = ANSI (-qnamemangling=ansi)
-Option.namemangling.v6 = VisualAge(R) C++ v6 (-qnamemangling=v6)
-Option.namemangling.v5 = VisualAge(R) C++ v5 (-qnamemangling=v5)
-Option.namemangling.v4 = VisualAge(R) C++ v4 (-qnamemangling=v4)
-Option.namemangling.v3 = Compatibility mode (-qnamemangling=v3)
-Option.namemangling.v7=IBM XL C/C++ v7 (-qnamemangling=v7)
-Option.namemangling.v8=IBM XL C/C++ v8 (-qnamemangling=v8)
-Option.namemangling.v9=IBM XL C/C++ v9 (-qnamemangling=v9)
-Option.namemangling.v10=IBM XL C/C++ v10 (-qnamemangling=v10)
-Option.objectmodel = Object model (-qobjmodel=)
-Option.objectmodel.classic = classic (-qobjmodel=classic)
-Option.objectmodel.ibm = IBM(R) (-qobjmodel=ibm)
-Option.rtti = Generate RunTime Type Information (-qrtti)
-Option.rtti.all = all (-qrrti=all)
-Option.rtti.type = type (-qrtti=type)
-Option.rtti.dynamiccast = dynamic cast (-qrtti=dynamiccast)
-Option.saveopt = Save the command line compiler options into an object file (-qsaveopt)
-Option.staticinline = Treat inline functions as static (-qstaticinline)
-Option.statsym = Add static variables to the symbol table (-qstatsym)
-Option.threaded = Enable multi-threaded execution (-qthreaded)
-Option.unique = Generate unique names for static constructor/deconstructor file compilation units (-qunique)
-Option.unique.v10 = Generate unique names for static constructor/deconstructor file compilation units (-qunique)
-Option.novftable = Do not generate virtual function table (-qnovftable)
-Option.vrsave = Maintain the VRSAVE register (-qvrsave)
-Option.weaksymbol = Generate weak symbols (-qweaksymbol)
-Option.macros=Emit macro definitions to preprocessed output (-qshowmacros)
-Option.macros.all=all (-qshowmacros=all)
-Option.macros.pre=predefined (-qshowmacros=pre)
-Option.macros.nopre=no macros (-qshowmacros=nopre)
-Options.timestamps=Suppress insert of implicit timestamps into an object file (-qnotimestamps)
-
-# Optimization options
-Option.OptLevel = Optimization level
-Option.Optimize.Optimize = -O
-Option.Optimize.Level2 = -O2
-Option.Optimize.Level3 = -O3
-Option.Optimize.Level4 = -O4
-Option.Optimize.Level5 = -O5
-Option.inlining = Function inlining
-Option.inlining.Q = inline all functions (-Q)
-Option.inlining.Qexclamation = disable inlining (-Q!)
-Option.Qplus = Specify functions to be inlined(-Q+name1:name2:...:nameN)
-Option.Qminus = Specify functions to not inline (-Q-name1:name2:...:nameN)
-Option.aggrcopy = Enable destructive copy operations for structs and unions
-Option.aggrcopy.nooverlap=no overlap (-qaggrcopy=nooverlap)
-Option.aggrcopy.overlap=overlap (-qaggrcopy=overlap)
-Option.alias= Apply aliasing instructions to compilation unit (-qalias=)
-Option.alias.addrtaken= Variables are not disjoint from pointers (-qalias=addrtaken)
-Option.alias.noaddrtaken=Variables are disjoint from pointers unless their address is taken (-qalias=notaddrtaken)
-Option.alias.allptrs=Pointers are aliased (-qalias=allptrs)
-Option.alias.noallptrs=Pointers are never aliased (-qalias=noallptrs)
-Option.alias.ansi=Pointers can only point to an object of the same type (-qalias=ansi)
-Option.alias.noansi=Pointers can point to an object of a different type (-qalias=notansi)
-Option.alias.typeptr=Pointers to different types are aliased (-qalias=typeptr)
-Option.alias.notypeptr=Pointers to different types are never aliased (-qalias=notypeptr)
-Option.optimization.arch = Specify the processor architecture to generate code and optimize for (-qarch=)
-Option.optimization.arch.ppc64 = PowerPC(R) 64-bit
-Option.optimization.arch.ppcgr = PowerPC(R) with graphics instructions
-Option.optimization.arch.ppc64gr = PowerPC(R) 64-bit with graphics instructions
-Option.optimization.arch.ppc64grsq = PowerPC(R) 64-bit with graphics and square root instructions
-Option.optimization.arch.ppc64v = PowerPC(R) 64-bit with AltiVec
-Option.optimization.tune = Specify the processor architecture to tune code for (-qtune=)
-Option.optimization.tune.auto = auto
-Option.optimization.assert = Assert program behaviours (-qassert=)
-Option.optimization.Cache = Specify the cache configuration (-qcache=option1:option2:...:optionN)
-Option.compact = Avoid transformations that lead to code expansion (-qcompact)
-Option.optimization.dataimported = Name the variables to be imported (-qdataimported=name1:name2:...:nameN)
-Option.optimization.datalocal = Name the variables which are local (-qdatalocal=name1:name2:...:nameN)
-Option.directstorage = Write-through enabled or cache-inhibited storage may be referenced (-qdirectstorage)
-Option.optimization.exceptionhandling = Exception handling
-Option.optimization.exceptionhandling.eh = Enable exception handling (-qeh)
-Option.optimization.exceptionhandling.noeh = Disable exception handling (-qnoeh)
-Option.optimization.exceptionhandling.v5 = VisualAge(R) C++ v5.0 compatibility
-Option.optimization.exceptionhandling.v6 = VisualAge(R) C++ v6.0 compatibility
-Option.fdpr = Include data required by fdpr utility (-qfdpr)
-Option.optimization.hot = Perform high-order loop analysis and transformations during optimization (-qhot=)
-Option.ignerrno = Perform optimizations which assume errno is not modified by system calls (-qignerrno)
-Option.optimization.inline = Attempt to inline functions (-qinline=)
-Option.optimization.ipa = Customize interprocedural analysis optimizations(-qipa=)
-Option.optimization.isolatedcall = Functions in source file that have no side effects (-qisolated_call=name1:name2:...:nameN)
-Option.optimization.keepinlines =
-Option.largepage = Exploit large page heaps available on POWER4(TM) systems running AIX(R) 5.1D or later (-qlargepage)
-Option.libansi = Assume all functions in the name of ansi C function are system functions (-qlibansi)
-Option.pdf1 = Tune optimizations through Profile Directed Feedback: first run (-qpdf1)
-Option.pdf2 = Tune optimizations through Profile Directed Feedback: second run (-qpdf2)
-Option.optimization.Prefetch = Disable generation of prefetching instructions in compiled code (-qnoprefetch)
-Option.optimization.procimported = Mark functions as imported (-qprocimported=)
-Option.optimization.proclocal = Mark functions as local (-qlocal=)
-Option.optimization.procimported = Mark functions as imported (-qprocimported=)
-Option.optimization.procunknown = Mark functions as unknown (-qprocunknown=)
-Option.optimization.showpdf = Add additional call and block count profiling information to the executable (-qshowpdf)
-Option.optimization.smallstack = Reduce the size of the stack frame (-qsmallstack)
-Option.optimization.smp = Enable parallelization of code (-qsmp)
-Option.optimization.smp.v10 = Specify parallelization of code (-qsmp=name1:name2:...:nameN)
-Option.optimization.smp.v10.tooltip=Possible values: nostackcheck, opt, norec_locks, noomp, nonested_par, \nexplicit, auto, omp, nested_par, noauto, noexplicit, noopt, rec_locks, \nschedule=(runtime | auto | affinity=n | dynamic=n | guided=n | static=n), stackcheck, threshold=n
-Option.optimization.Spill = Specify the register allocation spill area (-qspill=)
-Option.optimization.Strict=Turn off aggressive optimizations (-qstrict)
-Option.optimization.Strict.v10 = Specify the optimizations (-qstrict=name1:name2:...:nameN)
-Option.optimization.Strict.v10.tooltip=Possible values: all, none, precision, noprecision, exceptions, noexceptions, \nieeefp, noieeefp, nans, nonans, infinities, noinfinities, subnormals, nosubnormals, \nzerosigns, nozerosigns, operationprecision, nooperationprecision, order, noorder, \nassociation, noassociation, reductionorder, noreductionorder, guards, noguards, library, nolibrary
-Option.optimization.loopinduction = Loop induction settings
-Option.optimization.strict_induction = Strict induction
-Option.optimization.nostrict_induction = No induction
-Option.optimization.tocdata = Mark data as local
-Option.optimization.w = Specify options to pass to specific compiler components (-W)
-
-# Linker Options
-Option.Linking.b = Control how shared objects are processed by the editor (-b)
-Option.linking.brtl = Enable runtime linking for the output file (-brtl)
-Option.linking.bundle =
-Option.Linking.bundle_loader
-Option.Linking.e = Set the entry name for the shared executable(-e )
-Option.Linking.f =
-Option.linking.G = Create a shared object enabled for runtime linking (-G)
-Option.Linking.L = Search the path directory for the library files specified by the -lkey option (-L)
-Option.Linking.l = Search the specified library file(-l)
-Option.linking.r = Produce a relocatable object (-r)
-Option.Linking.Z = Specify a prefix for library search path (-Z)
-Option.linking.inlglue = Generate fast external linkage (-qinlglue)
-Option.linking.lib = Link with standard system libraries (-qlib)
-Option.Linking.mkshrobj = Create a shared object from generated object files (-qmkshrobj)
-Option.Linking.priority = Specify the priority level for initialization of static objects (-qpriority)
-Option.Linker.EnableRun=Enable Run time linking (-brtl)
-Option.Linker.NoStartFiles=Do not use standard start files (-nostartfiles)
-Option.Linker.NoDefLibs=Do not use default libraries (-nodefaultlibs)
-Option.Linker.NoStdLibs=No startup or default libs (-nostdlib)
-Option.Linker.Strip=Strip all symbol information (-s)
-Option.Linker.Strip.debug=Strip debug symbol information (-S)
-Option.Linker.Static=No shared libraries (-bstatic)
-Option.Linker.WLinker=Other options (-Wl, [option1,option2,...optionN])
-Option.Linker.Flags=Other linker flags
-Option.Libs=Libraries (-l)
-Option.Libsearch=Library search path (-L)
-Option.UserObjs=Other objects
-Option.Linker.Shared=Shared (-qmkshrobj)
-Option.Linker.SOName=Shared object name (-o=)
-Option.Linker.Implib=Import Library name (-Wl,--out-implib=)
-Option.Linker.Defname=DEF file name (-Wl,--output-def=)
-Option.linking.bundle = Create a bundle (-bundle)
-Option.linking.bundle_loader = Specify the name of bundle loader program (-bundle_loader=)
-Option.linking.f = Specify file containing a list of object files for the compiler to pass to the linker (-f)
-Option.linking.expfile = Save all the exported symbols in the designated file (-qexpfile=)
-
-#Archiver options
-Option.Archiver.Flags=Other archiver flags
-
-# Integer and Floating Point options
-Option.y = Specify compile time rounding mode (-y)
-Option.y.n = n
-Option.y.m = m
-Option.y.p = p
-Option.y.z = z
-Option.float = Specify floating point options (-qfloat=)
-Option.flttrap = Trap floating point exceptions (-qflttrap=)
-Option.longlong = Allow long long integer types in the program
-Option.longlong.longlong = Allow long long (-qlonglong)
-Option.longlong.nolonglong = Do not allow long long (-qnolonglong)
-Option.rndflt = Control compile-time rounding mode of floating point expressions( -qrndflt)
-Option.rndflt.nearest = Nearest
-Option.rndflt.minusinf = Minus infinity
-Option.rndflt.plusinf = Plus infinity
-Option.rndflt.zero = Zero
-Option.dfp = Decimal floating-point support for types and literals
-Option.dfp.enabled = Enabled (-qdfp)
-Option.dfp.disabled = Disabled (-qnodfp)
-
-# Compiler Customization options
-Option.B = Determine substitute program path name (-B)
-Option.F = Specify alternate configuration file (-F)
-Option.t = Add prefix to designated programs (-t)
-Option.maxmem = Amount of memory used during optimization (-qmaxmem=)
-Option.path = Alternate program name for compiler components (-qpath=)
-Option.tls = Specify the thread local storage model (-qtls=)
-Option.tls.unsupported=unsupported
-Option.tls.default=default
-Option.tls.global-dynamic=global-dynamic
-Option.tls.initial-exec=initial-exec
-Option.tls.local-dynamic=local-dynamic
-Option.tls.local-exec=local-exec
-Option.tls.notls=No tls
-
-# Listings and Messages options
-Option.V = Report information on the progress of compilation (-V)
-Option.Warn.nowarn = Suppress warnings and low-level messages (-w)
-Option.Warn.Pedandic=Pedantic (-pedantic)
-Option.Warn.PedErrors=Pedantic warnings as errors (-pedantic-errors)
-Option.Warn.nowarn=Inhibit all warnings (-w)
-Option.Warn.allwarn=All warnings (-Wall)
-Option.Warn.toerrs=Warnings as errors (-Werror)
-Option.attr = Produce a compiler listing (-qattr)
-Option.attr.noattr = Does not produce an attribute listing for identifiers in program (-qnoattr)
-Option.attr.fullattr = Report attributes of all identifiers (-qattr=full)
-Option.attr.attr = Report attributes of only used identifiers (-qattr)
-Option.flag = Specify the minimum severity level of the diagnostic messages (-qflag=)
-Option.format = Warn of possible problems with string input and output format specifications (-qformat=)
-Option.halt = Instruct the compiler to stop after compilation if it encounters errors of specified severity or higher (-qhalt=)
-Option.halt.information = Information (-qhalt=i)
-Option.halt.warning = Warning (-qhalt=w)
-Option.halt.error = Error (-qhalt=e)
-Option.halt.severeError = Severe error (-qhalt=s)
-Option.halt.unrecoverableError = Unrecoverable error (-qhalt=u)
-Option.info = Produce informational messages (-qinfo=)
-Option.list = Produce a compiler listing that includes an object listing (-qlist)
-Option.listopt = Produce a compiler listing that displays all options in effect(-qlistopt)
-Option.phsinfo = Report the time taken in each compilation phase (-qphsinfo)
-Option.noprint = Suppress all listings (-qnoprint )
-Option.report = Instruct the compiler to produce transformation reports (-qreport)
-Option.showinc = Show all included files in the source listing (-qshowinc)
-Option.source = Produce a compiler listing and include the source code (-qsource)
-Option.srcmsg = Add the corresponding source code lines to the diagnostic messages in stderr file (-qsrcmsg)
-Option.suppress = Suppress the specified informational or warning messages (-qsuppress=)
-Option.tabsize = Change the tab-size (-qtabsize=)
-Option.xref = Produce a cross reference listing of identifiers (-qxref)
-Option.xref.noxref = Do not report identifiers in the program (-qnoxref)
-Option.xref.fullxref = Report all the identifiers in the program (-qxref = full)
-Option.xref.xref = Report only those identifiers which are used (-qxref)
-Option.warnfourcharconsts = Enable warning of four-character constants in source
-Option.report = Produce listing files that show how sections of code have been optimized (-qreport)
-
-# Error Checking and Debugging
-Option.g = Generate debugging information (-g)
-Option.optdebug = Enable debugging of optimized code (-qoptdebug)
-Option.DebugLevel=Debug Level
-Option.Debug.Min=Minimal (-g1)
-Option.Debug.Def=Default (-g)
-Option.Debug.Max=Maximum (-g3)
-Option.Debug.Other=Other debugging flags
-Option.Debug.gprof=Generate gprof information (-pg)
-Option.Debug.prof=Generate prof information (-p)
-Option.Debug.Unref=Include information about unreferenced symbols (-qdbxextra)
-Option.p = Generate prof information (-p)
-Option.pg = Generate gprof information (-pg)
-Option.check = Generate code which performs certain types of runtime checking (-qcheck)
-Option.dbxextra = Include all typedefs, structs, unions, enums for debugging (-qdbxextra)
-Option.extchk = Generate bind-time type checking information and check for compile time consistency (-qextchk)
-Option.fullpath = Preserve absolute path name of source files used with -g option (-qfullpath)
-Option.genproto = Produce ANSI prototypes from K&R definitions
-Option.genproto = Generate prototypes with parameter names
-Option.genproto.parmgenproto = Include parameter names in prototypes
-Option.heapdebug = Enable debug versions of memory management functions (-qheapdebug)
-Option.initauto = Initialize the automatic variables (-qinitauto=)
-Option.linedebug = Generate line number and source file name info for the debugger (-qlinedebug)
-Option.maxerr = Halt compilation after this many errors (-qmaxerr=)
-Option.proto = All functions are prototyped (-qproto)
-
-
-# Assembler options
-Option.Xlc.Assembler.Flags=Other assembler flags
-Option.Xlc.Assembler.warn.suppress=Suppress warnings (-W)
-Option.Xlc.Assembler.version=Announce version (-v)
-
-
-# XL C/C++ Preference page
-XLCompilerPreferencePage.name = XL C/C++ Compiler
-XLCompilerPropertyPage.name = XL C/C++ Compiler
-
-
-
-
-Bundle-Vendor = Eclipse.org
-Bundle-Name = XL C/C++ Remote Managed Build Support
-builder.name = Remote GNU Make
-extension.name = Remote XL C/C++ Per Project Profile
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.xml b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.xml
deleted file mode 100644
index feb60f0..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/plugin.xml
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
- <managedBuildRevision
- fileVersion="4.0.0">
- </managedBuildRevision>
- <builder
- commandLauncher="org.eclipse.ptp.rdt.core.remotemake.RemoteCommandLauncher"
- id="org.eclipse.ptp.rdt.managedbuilder.xlc.ui.builder1"
- isAbstract="false"
- isVariableCaseSensitive="false"
- name="%builder.name"
- superClass="cdt.managedbuild.target.gnu.builder">
- </builder>
- <projectType
- buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
- id="org.eclipse.ptp.rdt.managedbuild.target.xlc.exe"
- isAbstract="false"
- isTest="false"
- name="%TargetName.xlc.exe"
- projectEnvironmentSupplier="org.eclipse.ptp.rdt.managedbuilder.xlc.ui.RemoteProjectEnvironmentSupplier"
- projectMacroSupplier="org.eclipse.cdt.managedbuilder.xlc.ui.XLCProjectMacroSupplier">
- <configuration
- name="%ConfigName.Dbg"
- artifactExtension="exe"
- cleanCommand="rm -rf"
- errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
- id="org.eclipse.ptp.rdt.managedbuild.config.xlc.exe.debug">
- <toolChain
- archList="all"
- configurationEnvironmentSupplier="org.eclipse.cdt.managedbuilder.xlc.aix.AixConfigurationEnvironmentSupplier"
- id="org.eclipse.ptp.rdt.managedbuild.toolchain.xlc.exe.debug"
- name="%ToolChainName.Dbg"
- osList="all"
- targetTool="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.debug;org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.debug">
- <targetPlatform
- id="org.eclipse.ptp.rdt.managedbuild.target.xlc.platform.exe.debug"
- name="%PlatformName.Dbg"
- binaryParser="org.eclipse.cdt.core.XCOFF32"
- osList="all"
- archList="all">
- </targetPlatform>
- <builder
- superClass="org.eclipse.ptp.rdt.managedbuilder.xlc.builder.base"
- id="org.eclipse.ptp.rdt.managedbuilder.xlc.builder.exe.debug">
- </builder>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.compiler.exe.debug"
- superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.compiler.base">
- <option
- id="org.eclipse.ptp.rdt.xlc.cpp.compiler.exe.debug.option.optimization.level"
- defaultValue="xlc.c.compiler.optimization.level.none"
- superClass="xlc.c.compiler.option.optimization.level">
- </option>
- <option
- id="org.eclipse.ptp.rdt.xlc.cpp.compiler.exe.debug.option.debugging.g"
- defaultValue="true"
- superClass="xlc.c.compiler.option.ecd.g">
- </option>
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.compiler.exe.debug"
- superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.compiler.base">
- <option
- id="org.eclipse.ptp.rdt.xlc.c.compiler.exe.debug.option.optimization.level"
- defaultValue="xlc.c.optimization.level.none"
- superClass="xlc.c.compiler.option.optimization.level">
- </option>
- <option
- id="org.eclipse.ptp.rdt.xlc.c.compiler.exe.debug.option.debugging.g"
- defaultValue="true"
- superClass="xlc.c.compiler.option.ecd.g">
- </option>
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.debug"
- superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.base">
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.debug"
- superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.base">
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.assembler.exe.debug"
- superClass="cdt.managedbuild.tool.xlc.assembler">
- </tool>
- </toolChain>
- </configuration>
- <configuration
- name="%ConfigName.Rel"
- artifactExtension="exe"
- cleanCommand="rm -rf"
- errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
- id="org.eclipse.ptp.rdt.managedbuild.config.xlc.exe.release">
- <toolChain
- archList="all"
- id="org.eclipse.ptp.rdt.managedbuild.toolchain.xlc.exe.release"
- name="%ToolChainName.Rel"
- osList="all"
- targetTool="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.release;org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.release">
- <targetPlatform
- id="org.eclipse.ptp.rdt.managedbuild.target.xlc.platform.exe.release"
- name="%PlatformName.Rel"
- binaryParser="org.eclipse.cdt.core.XCOFF32"
- osList="all"
- archList="all">
- </targetPlatform>
- <builder
- superClass="org.eclipse.ptp.rdt.managedbuilder.xlc.builder.base"
- id="org.eclipse.ptp.rdt.managedbuilder.xlc.builder.release">
- </builder>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.compiler.exe.release"
- superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.compiler.base">
- <option
- id="org.eclipse.ptp.rdt.xlc.cpp.compiler.exe.release.option.optimization.level"
- defaultValue="xlc.c.optimization.level.Level5"
- superClass="xlc.c.compiler.option.optimization.level">
- </option>
- <option
- id="org.eclipse.ptp.rdt.xlc.cpp.compiler.exe.release.option.debugging.g"
- defaultValue="false"
- superClass="xlc.c.compiler.option.ecd.g">
- </option>
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.compiler.exe.release"
- superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.compiler.base">
- <option
- id="org.eclipse.ptp.rdt.xlc.c.compiler.exe.release.option.optimization.level"
- defaultValue="xlc.c.optimization.level.Level5"
- superClass="xlc.c.compiler.option.optimization.level">
- </option>
- <option
- id="org.eclipse.ptp.rdt.xlc.c.compiler.exe.release.option.debugging.g"
- defaultValue="false"
- superClass="xlc.c.compiler.option.ecd.g">
- </option>
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.release"
- superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.base">
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.release"
- superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.base">
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.assembler.exe.release"
- superClass="org.eclipse.ptp.rdt.managedbuild.tool.xlc.assembler.exe.base">
- </tool>
- </toolChain>
-
- </configuration>
- </projectType>
- <toolChain
- archList="all"
- configurationEnvironmentSupplier="RemoteConfigurationEnvironmentSupplier"
- id="org.eclipse.ptp.rdt.managedbuild.toolchain.xlc.base"
- name="%ToolChainName.Dbg"
- osList="all"
- targetTool="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.debug;org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.debug">
- <builder
- superClass="org.eclipse.ptp.rdt.managedbuilder.xlc.ui.builder1"
- id="org.eclipse.ptp.rdt.managedbuilder.xlc.builder.base">
- </builder>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.compiler.base"
- superClass="cdt.managedbuild.tool.xlc.cpp.compiler">
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.compiler.base"
- superClass="cdt.managedbuild.tool.xlc.c.compiler">
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.c.linker.exe.base"
- superClass="cdt.managedbuild.tool.xlc.c.linker">
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.cpp.linker.exe.base"
- superClass="cdt.managedbuild.tool.xlc.cpp.linker">
- </tool>
- <tool
- id="org.eclipse.ptp.rdt.managedbuild.tool.xlc.assembler.exe.base"
- superClass="cdt.managedbuild.tool.xlc.assembler">
- </tool>
- </toolChain>
- </extension>
- <extension
- id="RemoteXLCPerProjectProfile"
- name="%extension.name"
- point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
- <scannerInfoCollector
- class="org.eclipse.ptp.rdt.core.remotemake.ProjectDescriptionCollector"
- scope="project"/>
- <!-- The ScannerInfoProvider search for the information needed by the profile and send it to the ScannerInfoCollector -->
- <scannerInfoProvider providerId="org.eclipse.ptp.rdt.managedbuilder.xlc.ui.specsFile">
- <!-- Specifies the compiler command that returns the information about standard include directories and standard definitions -->
- <!-- The compiler command used will be always a C compiler command -->
- <!-- The output for C or C++ projects will be different as the ScannerInfoProvider substitute the ${specs_file} variable below with a dummy "c" file or "cpp" file -->
- <run
- arguments="-E -v ${specs_file_path}"
- command="${XL_compilerRoot}/xlC"
- class="org.eclipse.ptp.rdt.core.remotemake.RemoteSpecsRunSIProvider">
- </run>
- <!-- Specifies the parser for the output generated by the compiler with the above command line -->
- <scannerInfoConsoleParser
- class="org.eclipse.cdt.make.xlc.core.scannerconfig.XlCSpecsConsoleParser">
- </scannerInfoConsoleParser>
- </scannerInfoProvider>
- </extension>
-
-</plugin>
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/RemoteConfigurationEnvironmentSupplier.java b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/RemoteConfigurationEnvironmentSupplier.java
deleted file mode 100644
index a48d2ea..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/RemoteConfigurationEnvironmentSupplier.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.managedbuilder.core.IConfiguration;
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable;
-import org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier;
-import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider;
-import org.eclipse.cdt.managedbuilder.internal.envvar.BuildEnvVar;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.ptp.rdt.core.RDTLog;
-import org.eclipse.ptp.rdt.core.serviceproviders.IRemoteExecutionServiceProvider;
-import org.eclipse.ptp.rdt.core.services.IRDTServiceConstants;
-import org.eclipse.ptp.rdt.services.core.IService;
-import org.eclipse.ptp.rdt.services.core.IServiceConfiguration;
-import org.eclipse.ptp.rdt.services.core.IServiceProvider;
-import org.eclipse.ptp.rdt.services.core.ProjectNotConfiguredException;
-import org.eclipse.ptp.rdt.services.core.ServiceModelManager;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-
-
-/**
- * Supplies remote environment variables on a per-configuration basis.
- * Right now it actually doesn't take into account service model configurations, so this just
- * acts the same as the RemoteProjectEnvironmentSupplier at the moment.
- *
- * @author crecoskie
- *
- */
-@SuppressWarnings("restriction")
-public class RemoteConfigurationEnvironmentSupplier implements
- IConfigurationEnvironmentVariableSupplier {
-
- /* (non-Javadoc)
- * @see org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier#getVariable(java.lang.String, org.eclipse.cdt.managedbuilder.core.IConfiguration, org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider)
- */
- public IBuildEnvironmentVariable getVariable(String variableName,
- IConfiguration configuration, IEnvironmentVariableProvider provider) {
- Map<String, String> envMap = getRemoteEnvironment(configuration.getManagedProject());
- String value = envMap.get(variableName) == null ? new String() : envMap.get(variableName);
- IBuildEnvironmentVariable envVar = new BuildEnvVar(variableName, value);
- return envVar;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.cdt.managedbuilder.envvar.IConfigurationEnvironmentVariableSupplier#getVariables(org.eclipse.cdt.managedbuilder.core.IConfiguration, org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider)
- */
- public IBuildEnvironmentVariable[] getVariables(
- IConfiguration configuration, IEnvironmentVariableProvider provider) {
- List<IBuildEnvironmentVariable> vars = new LinkedList<IBuildEnvironmentVariable>();
- Map<String, String> remoteEnvMap = null;
-
- remoteEnvMap = getRemoteEnvironment(configuration.getManagedProject());
-
- if (remoteEnvMap != null) {
- for (String var : remoteEnvMap.keySet()) {
- String value = remoteEnvMap.get(var);
-
- IBuildEnvironmentVariable buildEnvVar = new BuildEnvVar(var,
- value);
- vars.add(buildEnvVar);
- }
-
- return vars.toArray(new IBuildEnvironmentVariable[0]);
- }
-
- else
- return new IBuildEnvironmentVariable[0];
- }
-
- /**
- * @param project
- * @param remoteEnvMap
- * @return
- */
- private Map<String, String> getRemoteEnvironment(IManagedProject project) {
- IProject iProj = (IProject) project.getOwner();
- Map<String, String> remoteEnvMap = new HashMap<String, String>();
-
- ServiceModelManager smm = ServiceModelManager.getInstance();
-
- try {
- IServiceConfiguration serviceConfig = smm
- .getActiveConfiguration(iProj);
- IService buildService = smm
- .getService(IRDTServiceConstants.SERVICE_BUILD);
- IServiceProvider serviceProvider = serviceConfig
- .getServiceProvider(buildService);
- IRemoteExecutionServiceProvider executionProvider = null;
- if (serviceProvider instanceof IRemoteExecutionServiceProvider) {
- executionProvider = (IRemoteExecutionServiceProvider) serviceProvider;
- }
-
- if (executionProvider != null) {
-
- IRemoteServices remoteServices = executionProvider
- .getRemoteServices();
-
- IRemoteConnection connection = executionProvider
- .getConnection();
-
- if (!connection.isOpen()) {
- try {
- connection.open(null);
- } catch (RemoteConnectionException e) {
- RDTLog.logError(e);
- }
- }
-
- List<String> command = new LinkedList<String>();
-
- IRemoteProcessBuilder processBuilder = remoteServices
- .getProcessBuilder(connection, command);
-
- remoteEnvMap = processBuilder.environment();
-
- }
- } catch (ProjectNotConfiguredException e) {
- // We can get here when the environment supplier is called during
- // project creation, since the service model is not yet setup.
- // Swallow the error.
- }
- return remoteEnvMap;
- }
-
-}
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/Activator.java b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/Activator.java
deleted file mode 100644
index 1e67eb2..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.ptp.rdt.managedbuilder.xlc.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.ptp.rdt.managedbuilder.xlc.ui";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/RemoteProjectEnvironmentSupplier.java b/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/RemoteProjectEnvironmentSupplier.java
deleted file mode 100644
index 59378d7..0000000
--- a/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui/src/org/eclipse/ptp/rdt/managedbuilder/xlc/ui/RemoteProjectEnvironmentSupplier.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rdt.managedbuilder.xlc.ui;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.managedbuilder.internal.envvar.BuildEnvVar;
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable;
-import org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider;
-import org.eclipse.cdt.managedbuilder.envvar.IProjectEnvironmentVariableSupplier;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.ptp.rdt.core.RDTLog;
-import org.eclipse.ptp.rdt.core.serviceproviders.IRemoteExecutionServiceProvider;
-import org.eclipse.ptp.rdt.core.services.IRDTServiceConstants;
-import org.eclipse.ptp.rdt.services.core.IService;
-import org.eclipse.ptp.rdt.services.core.IServiceConfiguration;
-import org.eclipse.ptp.rdt.services.core.IServiceProvider;
-import org.eclipse.ptp.rdt.services.core.ProjectNotConfiguredException;
-import org.eclipse.ptp.rdt.services.core.ServiceModelManager;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-
-/**
- * Supplies environment variables from the remote system.
- *
- * @author crecoskie
- *
- */
-@SuppressWarnings("restriction")
-public class RemoteProjectEnvironmentSupplier implements
- IProjectEnvironmentVariableSupplier {
-
- /* (non-Javadoc)
- * @see org.eclipse.cdt.managedbuilder.envvar.IProjectEnvironmentVariableSupplier#getVariable(java.lang.String, org.eclipse.cdt.managedbuilder.core.IManagedProject, org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider)
- */
- public IBuildEnvironmentVariable getVariable(String variableName,
- IManagedProject project, IEnvironmentVariableProvider provider) {
- Map<String, String> envMap = getRemoteEnvironment(project);
- String value = envMap.get(variableName) == null ? new String() : envMap.get(variableName);
- IBuildEnvironmentVariable envVar = new BuildEnvVar(variableName, value);
- return envVar;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.cdt.managedbuilder.envvar.IProjectEnvironmentVariableSupplier#getVariables(org.eclipse.cdt.managedbuilder.core.IManagedProject, org.eclipse.cdt.managedbuilder.envvar.IEnvironmentVariableProvider)
- */
- public IBuildEnvironmentVariable[] getVariables(IManagedProject project,
- IEnvironmentVariableProvider provider) {
-
- List<IBuildEnvironmentVariable> vars = new LinkedList<IBuildEnvironmentVariable>();
- Map<String, String> remoteEnvMap = null;
-
- remoteEnvMap = getRemoteEnvironment(project);
-
- if (remoteEnvMap != null) {
- for (String var : remoteEnvMap.keySet()) {
- String value = remoteEnvMap.get(var);
-
- IBuildEnvironmentVariable buildEnvVar = new BuildEnvVar(var,
- value);
- vars.add(buildEnvVar);
- }
-
- return vars.toArray(new IBuildEnvironmentVariable[0]);
- }
-
- else
- return new IBuildEnvironmentVariable[0];
-
- }
-
- /**
- * @param project
- * @param remoteEnvMap
- * @return
- */
- private Map<String, String> getRemoteEnvironment(IManagedProject project) {
- IProject iProj = (IProject) project.getOwner();
- Map<String, String> remoteEnvMap = new HashMap<String, String>();
-
- ServiceModelManager smm = ServiceModelManager.getInstance();
-
- try {
- IServiceConfiguration serviceConfig = smm
- .getActiveConfiguration(iProj);
- IService buildService = smm
- .getService(IRDTServiceConstants.SERVICE_BUILD);
- IServiceProvider serviceProvider = serviceConfig
- .getServiceProvider(buildService);
- IRemoteExecutionServiceProvider executionProvider = null;
- if (serviceProvider instanceof IRemoteExecutionServiceProvider) {
- executionProvider = (IRemoteExecutionServiceProvider) serviceProvider;
- }
-
- if (executionProvider != null) {
-
- IRemoteServices remoteServices = executionProvider
- .getRemoteServices();
-
- IRemoteConnection connection = executionProvider
- .getConnection();
-
- if (!connection.isOpen()) {
- try {
- connection.open(null);
- } catch (RemoteConnectionException e) {
- RDTLog.logError(e);
- }
- }
-
- List<String> command = new LinkedList<String>();
-
- IRemoteProcessBuilder processBuilder = remoteServices
- .getProcessBuilder(connection, command);
-
- remoteEnvMap = processBuilder.environment();
-
- }
- } catch (ProjectNotConfiguredException e) {
- // We can get here when the environment supplier is called during
- // project creation, since the service model is not yet setup.
- // Swallow the error.
- }
- return remoteEnvMap;
- }
-}
-
-
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath b/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath
deleted file mode 100644
index 3aaeea8..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="test"/>
- <classpathentry kind="src" path="suite"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.project b/rdt/org.eclipse.ptp.rdt.ui.tests/.project
deleted file mode 100644
index f21926c..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ptp.rdt.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs b/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f9482f2..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Nov 19 13:50:59 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index f8a5ddf..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests Plug-in
-Bundle-SymbolicName: org.eclipse.ptp.rdt.ui.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: com.ibm.icu;bundle-version="3.8.1",
- org.eclipse.ptp.rdt.core;bundle-version="1.0.0",
- org.eclipse.ptp.rdt.core.tests;bundle-version="1.0.0",
- org.eclipse.ptp.rdt.ui;bundle-version="1.0.0",
- org.eclipse.cdt.ui.tests;bundle-version="5.0.2",
- org.eclipse.cdt.ui;bundle-version="5.0.2",
- org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.ptp.rdt.services;bundle-version="1.0.1",
- org.eclipse.cdt.core;bundle-version="5.0.2",
- org.eclipse.cdt.core.tests;bundle-version="5.0.1",
- org.junit;bundle-version="3.8.2",
- org.eclipse.ui;bundle-version="3.4.0",
- org.eclipse.core.resources;bundle-version="3.4.0",
- org.eclipse.jface.text;bundle-version="3.4.0",
- org.eclipse.ui.editors;bundle-version="3.4.0"
-Export-Package: org.eclipse.ptp.rdt.ui.tests.navigation,
- org.eclipse.ptp.rdt.ui.tests.suite
-Bundle-Activator: org.eclipse.ptp.rdt.ui.tests.RDTUITestPlugin
-Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.ui.part
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties b/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties
deleted file mode 100644
index 0a56acc..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = test/,\
- suite/
-output.. = bin/
-bin.includes = META-INF/,\
- .
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c b/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c
deleted file mode 100644
index ed3b53d..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#import "test.h"
-
-int main(int argc, char **argv) {
-
-}
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h b/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h
deleted file mode 100644
index e69de29..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/fixtures/navigation_test_project/test.h
+++ /dev/null
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java b/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java
deleted file mode 100644
index 49c77c6..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.eclipse.ptp.rdt.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class RDTUITestPlugin extends AbstractUIPlugin {
-
-
- private static RDTUITestPlugin plugin;
-
- public RDTUITestPlugin() {
- super();
- plugin = this;
- }
-
- public static RDTUITestPlugin getDefault() {
- return plugin;
- }
-}
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java b/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java
deleted file mode 100644
index db76260..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIBasicTestSuite.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rdt.ui.tests.suite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-
-/**
- * Tests that do not require a connection to a remote server.
- */
-public class UIBasicTestSuite extends TestCase {
- public static Test suite() {
- TestSuite suite = new TestSuite(UIBasicTestSuite.class.getName());
- // TODO add some tests
- return suite;
- }
-}
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java b/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java
deleted file mode 100644
index 7b468b7..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/suite/UIConnectionTestSuite.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rdt.ui.tests.suite;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.ptp.rdt.ui.tests.navigation.NavigationTests;
-
-
-/**
- * Tests that require a connection to be run,
- * this suite must be launched from a ConnectionSuite.
- */
-public class UIConnectionTestSuite extends TestCase {
- public static Test suite() {
- TestSuite suite = new TestSuite(UIConnectionTestSuite.class.getName());
-
- suite.addTest(NavigationTests.suite());
-
- return suite;
- }
-}
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java b/rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java
deleted file mode 100644
index 6602c74..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.eclipse.ptp.rdt.ui.tests.navigation;
-
-import java.net.URI;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.dom.ast.IASTName;
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
-import org.eclipse.cdt.core.index.IIndex;
-import org.eclipse.cdt.core.model.ILanguage;
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.cdt.internal.core.model.ASTCache.ASTRunnable;
-import org.eclipse.cdt.internal.core.parser.ParserException;
-import org.eclipse.cdt.internal.ui.editor.ASTProvider;
-import org.eclipse.cdt.internal.ui.editor.CEditor;
-import org.eclipse.cdt.ui.tests.text.EditorTestHelper;
-import org.eclipse.cdt.ui.tests.text.selection.CPPSelectionTestsAnyIndexer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ptp.internal.rdt.core.index.RemoteFastIndexer;
-import org.eclipse.ptp.internal.rdt.ui.search.actions.OpenDeclarationsAction;
-import org.eclipse.ptp.rdt.core.tests.ConnectionManager;
-import org.eclipse.ptp.rdt.core.tests.RemoteTestProject;
-import org.eclipse.ptp.rdt.services.core.ServiceModelManager;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
-
-@SuppressWarnings("restriction")
-
-public class NavigationTests extends CPPSelectionTestsAnyIndexer {
-
- private static final int MAX_WAIT_TIME = 120000;
-
- /* I think a lot of the tests that fail do so because of two reasons:
- * - Headers are not being skipped as they should be,
- *
- */
- private static final String[] TESTS_TO_RUN = {
- "testBug93281",
- "testBug207320",
- "testTemplateClassMethod_207320",
- //"testBasicDefinition", // FAIL cannot reproduce failure
- "testBasicTemplateInstance_207320",
- "testBug86829A",
- //"testCPPSpecDeclsDefs", // FAIL cannot reproduce failure
- "testBug168533",
- "testBug95225",
- //"testBug95202", // FAIL, should not fail when headers are skipped properly
- "testBug101287",
- "testBug102258",
- "testBug103323",
- "testBug78354",
- //"testBug103697", // FAIL trying to use local path which fails
- //"testBug108202", // FAIL
- //"testCNavigationInCppProject_bug183973", // FAIL
- //"testFuncWithTypedefForAnonymousStruct_190730", // FAIL
- //"testFuncWithTypedefForAnonymousEnum_190730", // FAIL
- "testMacroNavigation",
- "testMacroNavigation_Bug208300",
- "testIncludeNavigation",
- //"testNavigationCppCallsC", // FAIL
- //"testNavigationCCallsCpp", // FAIL
- "testNavigationInDefinedExpression_215906",
- };
-
- public static Test suite() {
- //return suite(NavigationTests.class);
- TestSuite suite = new TestSuite();
- for(String testName : TESTS_TO_RUN)
- suite.addTest(new NavigationTests(testName));
- return suite;
- }
-
-
- private static final String PROJECT_NAME = "navigation_test_project";
-
- @Override
- protected String getEditorID() {
- return "org.eclipse.pdt.rdt.ui.editor.CEditor";
- }
-
- @Override
- protected void waitUntilFileIsIndexed(IIndex index, IFile file, int maxmillis) throws Exception {
- Thread.sleep(10000);
- CCorePlugin.getIndexManager().joinIndexer(MAX_WAIT_TIME, new NullProgressMonitor());
- }
-
- public NavigationTests(String name) {
- super(name, RemoteFastIndexer.ID);
- }
-
- @Override
- protected IASTNode testF3(IFile file, int offset, int length) throws ParserException, CoreException {
- if (offset < 0)
- throw new ParserException("offset can not be less than 0 and was " + offset); //$NON-NLS-1$
-
- IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IEditorPart part = null;
- try {
- part = page.openEditor(new FileEditorInput(file), getEditorID(), true); //$NON-NLS-1$
- } catch (PartInitException e) {
- assertFalse(true);
- }
-
- if (part instanceof CEditor) {
- CEditor editor= (CEditor) part;
- EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 100, 500, 10);
- ((AbstractTextEditor)part).getSelectionProvider().setSelection(new TextSelection(offset,length));
-
- final OpenDeclarationsAction action = (OpenDeclarationsAction) editor.getAction("OpenDeclarations"); //$NON-NLS-1$
- action.runSync();
-
- // update the file/part to point to the newly opened IFile/IEditorPart
- part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- assertTrue (part instanceof CEditor);
- editor= (CEditor) part;
- EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 100, 500, 10);
-
- // the action above should highlight the declaration, so now retrieve it and use that selection to get the IASTName selected on the TU
- ISelection sel= editor.getSelectionProvider().getSelection();
-
- final IASTName[] result= {null};
- if (sel instanceof ITextSelection) {
- final ITextSelection textSel = (ITextSelection)sel;
- ITranslationUnit tu = (ITranslationUnit)editor.getInputCElement();
- IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, new NullProgressMonitor(), new ASTRunnable() {
- public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException {
- result[0]= ast.getNodeSelector(null).findName(textSel.getOffset(), textSel.getLength());
- return Status.OK_STATUS;
- }
- });
- assertTrue(ok.isOK());
- return result[0];
- }
- }
-
- return null;
- }
-
-
- protected void setUp() throws Exception {
- //super.setUp();
-
- IWorkbenchPage page= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- IViewReference[] refs= page.getViewReferences();
- for (int i = 0; i < refs.length; i++) {
- IViewReference viewReference = refs[i];
- page.setPartState(viewReference, IWorkbenchPage.STATE_RESTORED);
- }
-
- URI projectRootURI = ConnectionManager.getInstance().getWorkspaceURI(PROJECT_NAME);
- RemoteTestProject remoteProject = new RemoteTestProject(PROJECT_NAME, projectRootURI);
-
- ConnectionManager.getInstance().resetServiceModel(remoteProject.getName());
- ServiceModelManager.getInstance().printServiceModel();
-
- fCProject = remoteProject.getCProject();
-
- CCorePlugin.getIndexManager().setIndexerId(fCProject, RemoteFastIndexer.ID);
- }
-
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
-}
diff --git a/releng/.cvsignore b/releng/.cvsignore
deleted file mode 100644
index 3a4edf6..0000000
--- a/releng/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.project
diff --git a/releng/org.eclipse.ptp.pldt.upc-feature/.project b/releng/org.eclipse.ptp.pldt.upc-feature/.project
deleted file mode 100644
index 78a6bbc..0000000
--- a/releng/org.eclipse.ptp.pldt.upc-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ptp.pldt.upc-feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.pldt.upc-feature/build.properties b/releng/org.eclipse.ptp.pldt.upc-feature/build.properties
deleted file mode 100644
index 8c26e98..0000000
--- a/releng/org.eclipse.ptp.pldt.upc-feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties,\
- license.html,\
- epl-v10.html
-generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.ptp.pldt.upc-feature/epl-v10.html b/releng/org.eclipse.ptp.pldt.upc-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.pldt.upc-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "AS IS" 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]> <![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 1510775..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
-
-# "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 d7f9653..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/3.0"/>
- </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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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 c3093b2..0000000
--- a/releng/org.eclipse.ptp.releng/build.xml
+++ /dev/null
@@ -1,438 +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/I20090611-1540/eclipse-SDK-I20090611-1540-linux-gtk-ppc.tar.gz"/>
- <property name="cdtDist" value="/home/data/httpd/download.eclipse.org/tools/cdt/builds/6.0.1/I.I200907100614/cdt-master-6.0.1-I200907100614.zip"/>
- <property name="mylynDist" value="/home/data/httpd/download.eclipse.org/tools/mylyn/update/galileo/mylyn-3.2.0.I20090520-2300-e3.4.zip"/>
- <property name="rseDist" value="/home/data/httpd/download.eclipse.org/dsdp/tm/downloads/drops/R-3.1-200906171400/RSE-SDK-3.1.zip"/>
- <property name="tauJars" value="${user.home}/tau_jars.zip"/>
- <property name="branchVersion" value="3.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/${branchVersion}"/>
- <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="masterFile" value="ptp-master-${branchVersion}-${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}/${masterFile}" todir="${buildDirectory}"/>
- <unzip src="${buildDirectory}/${masterFile}" dest="${buildDirectory}/site"/>
- <move file="${buildDirectory}/eclipse/epl-v10.html" todir="${buildDirectory}/site/eclipse"/>
- <move 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="@buildVersion@" value="${branchVersion}.${timestamp}"/>
- </replace>
- <copy file="pack.properties" todir="${buildDirectory}/site/eclipse"/>
-
- <zip destfile="${zipsdir}/${masterFile}"
- basedir="${buildDirectory}/site/eclipse"/>
- </target>
-
- <target name="sign" depends="init" unless="hasErrors">
- <exec executable="sign">
- <arg value="${buildDirectory}/${buildType}.${buildId}/${masterFile}"/>
- <arg value="nomail"/>
- <arg value="${buildDirectory}/signed"/>
- </exec>
- <waitfor maxwait="30" maxwaitunit="minute">
- <available file="${buildDirectory}/signed/${masterFile}"/>
- </waitfor>
- <move file="${buildDirectory}/signed/${masterFile}" 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-${branchVersion}-latest.zip" failonerror="false"/>
- <symlink link="${copyToDir}/ptp-master-${branchVersion}-latest.zip" resource="${copyToDir}/${buildType}.${buildId}/${masterFile}" overwrite="true"/>
- <symlink action="delete" link="${copyToDir}/rdt-server-unix-1.0-latest.tar" failonerror="false"/>
- <symlink link="${copyToDir}/rdt-server-unix-1.0-latest.tar" resource="${copyToDir}/${buildType}.${buildId}/rdt-server-unix-1.0.tar" overwrite="true"/>
- </target>
-
- <target name="tagone">
- <cvs cvsroot="/cvsroot/tools" command="rtag ${tagbranch} ${tagname} ${tagmodule}"/>
- </target>
-
- <target name="tag" depends="init">
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.master"/>
- </antcall>
-
- <!--Features-->
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.utils-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.core-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote.remotetools-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote.rse-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remotetools-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.ll-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.pe-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.mpich2-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.openmpi-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.external-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.sdm-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.pldt-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.pldt.lapi-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.perf-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau.fortran-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rdt-feature"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.services-feature"/>
- </antcall>
-
- <!--Plugins-->
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.proxy.protocol"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.help"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.proxy"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.help"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.proxy"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpich2.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpich2.proxy"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpich2.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.rm.remote"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.proxy"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.generichost"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.launcher"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.preferences"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.utils"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.launch"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/doc/org.eclipse.ptp.help"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.common"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.help"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.lapi"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis.cdt"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.analysis"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.ui.pv"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/org.eclipse.ptp.pldt.wizards"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.jars"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papiselect"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.perfdmf"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinst"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinstfort"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.toolopts"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.remotejars"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.stubs"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.doc.user"/>
- </antcall>
- <antcall target="tagone">
- <param name="tagmodule" value="org.eclipse.ptp/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>
- </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 6ca145e..0000000
--- a/releng/org.eclipse.ptp.releng/buildsite.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <description url="http://download.eclipse.org/tools/ptp/releases/3.0">
- Parallel Tools Platform update site - Release 3.0
- </description>
- <feature url="features/org.eclipse.ptp_@buildVersion@.jar" id="org.eclipse.ptp" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.core_@buildVersion@.jar" id="org.eclipse.ptp.core" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.services_@buildVersion@.jar" id="org.eclipse.ptp.services" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.utils_@buildVersion@.jar" id="org.eclipse.ptp.utils" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.remotetools_@buildVersion@.jar" id="org.eclipse.ptp.remotetools" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.rm.ibm.ll_@buildVersion@.jar" id="org.eclipse.ptp.rm.ibm.ll" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.rm.ibm.pe_@buildVersion@.jar" id="org.eclipse.ptp.rm.ibm.pe" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.remote.remotetools_@buildVersion@.jar" id="org.eclipse.ptp.remote.remotetools" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.remote.rse_@buildVersion@.jar" id="org.eclipse.ptp.remote.rse" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.debug.sdm_@buildVersion@.jar" id="org.eclipse.ptp.debug.sdm" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.external_@buildVersion@.jar" id="org.eclipse.ptp.external" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.remote_@buildVersion@.jar" id="org.eclipse.ptp.remote" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.rm.mpich2_@buildVersion@.jar" id="org.eclipse.ptp.rm.mpich2" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.rm.openmpi_@buildVersion@.jar" id="org.eclipse.ptp.rm.openmpi" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.pldt_@buildVersion@.jar" id="org.eclipse.ptp.pldt" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.pldt.lapi_@buildVersion@.jar" id="org.eclipse.ptp.pldt.lapi" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.pldt.upc_@buildVersion@.jar" id="org.eclipse.ptp.pldt.upc" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.perf_@buildVersion@.jar" id="org.eclipse.ptp.perf" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature url="features/org.eclipse.ptp.perf.tau_@buildVersion@.jar" id="org.eclipse.ptp.perf.tau" version="@buildVersion@">
- <category name="Parallel Tools Platform 3.0"/>
- </feature>
- <feature id="org.eclipse.ptp.rdt" url="features/org.eclipse.ptp.rdt_@buildVersion@.jar" version="@buildVersion@">
- <category name="Remote Development Tools"/>
- </feature>
- <category-def name="Parallel Tools Platform 3.0" label="Parallel Tools Platform 3.0"/>
- <category-def name="Remote Development Tools" label="Remote Development Tools"/>
-</site>
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 628d621..0000000
--- a/releng/org.eclipse.ptp.releng/maps/ptp.map
+++ /dev/null
@@ -1,126 +0,0 @@
-! The master
-feature@org.eclipse.ptp.master=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.master
-
-! PTP features
-feature@org.eclipse.ptp=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp-feature
-feature@org.eclipse.ptp.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.utils-feature
-feature@org.eclipse.ptp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.core-feature
-feature@org.eclipse.ptp.remote=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote-feature
-feature@org.eclipse.ptp.remote.remotetools=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote.remotetools-feature
-feature@org.eclipse.ptp.remote.rse=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remote.rse-feature
-feature@org.eclipse.ptp.remotetools=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.remotetools-feature
-feature@org.eclipse.ptp.rm.ibm.ll=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.ll-feature
-feature@org.eclipse.ptp.rm.ibm.pe=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.pe-feature
-feature@org.eclipse.ptp.rm.mpich2=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.mpich2-feature
-feature@org.eclipse.ptp.rm.openmpi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.openmpi-feature
-feature@org.eclipse.ptp.external=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.external-feature
-feature@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.sdm-feature
-feature@org.eclipse.ptp.services=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.services-feature
-
-! PLDT features
-feature@org.eclipse.ptp.pldt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt-feature
-feature@org.eclipse.ptp.pldt.lapi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt.lapi-feature
-feature@org.eclipse.ptp.pldt.upc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt.upc-feature
-
-! PTF features
-feature@org.eclipse.ptp.perf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf-feature
-feature@org.eclipse.ptp.perf.tau=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau-feature
-feature@org.eclipse.ptp.perf.tau.fortran=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.perf.tau.fortran-feature
-
-! RDT features
-feature@org.eclipse.ptp.rdt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt-feature
-
-! PTP Plugins
-plugin@org.eclipse.ptp=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp
-plugin@org.eclipse.ptp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.core
-plugin@org.eclipse.ptp.utils.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils.core
-plugin@org.eclipse.ptp.utils.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils.ui
-plugin@org.eclipse.ptp.proxy.protocol=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.proxy.protocol
-plugin@org.eclipse.ptp.remote.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.core
-plugin@org.eclipse.ptp.remote.remotetools.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.core
-plugin@org.eclipse.ptp.remote.remotetools.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.ui
-plugin@org.eclipse.ptp.remote.rse.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.core
-plugin@org.eclipse.ptp.remote.rse.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.ui
-plugin@org.eclipse.ptp.remote.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.remote.ui
-plugin@org.eclipse.ptp.rm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.core
-plugin@org.eclipse.ptp.rm.ibm.ll.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.core
-plugin@org.eclipse.ptp.rm.ibm.ll.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.help
-plugin@org.eclipse.ptp.rm.ibm.ll.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.proxy
-plugin@org.eclipse.ptp.rm.ibm.ll.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.ui
-plugin@org.eclipse.ptp.rm.ibm.pe.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.core
-plugin@org.eclipse.ptp.rm.ibm.pe.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.help
-plugin@org.eclipse.ptp.rm.ibm.pe.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.proxy
-plugin@org.eclipse.ptp.rm.ibm.pe.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.ui
-plugin@org.eclipse.ptp.rm.mpi.mpich2.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.core
-plugin@org.eclipse.ptp.rm.mpi.mpich2.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.ui
-plugin@org.eclipse.ptp.rm.mpi.openmpi.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.core
-plugin@org.eclipse.ptp.rm.mpi.openmpi.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.ui
-plugin@org.eclipse.ptp.rm.remote=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.rm.remote
-plugin@org.eclipse.ptp.rm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ui
-plugin@org.eclipse.ptp.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.ui
-plugin@org.eclipse.ptp.debug.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.core
-plugin@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm
-plugin@org.eclipse.ptp.debug.sdm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.core
-plugin@org.eclipse.ptp.debug.sdm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.ui
-plugin@org.eclipse.ptp.debug.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.ui
-plugin@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm
-plugin@org.eclipse.ptp.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.proxy
-plugin@org.eclipse.ptp.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils
-plugin@org.eclipse.ptp.launch=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.launch
-plugin@org.eclipse.ptp.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/doc/org.eclipse.ptp.help
-
-! Services Plugins
-plugin@org.eclipse.ptp.services.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.services.core
-plugin@org.eclipse.ptp.services.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.services.ui
-
-! Remote Tools Plugins
-plugin@org.eclipse.ptp.remotetools.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.core
-plugin@org.eclipse.ptp.remotetools.environment.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.core
-plugin@org.eclipse.ptp.remotetools.environment.generichost=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.generichost
-plugin@org.eclipse.ptp.remotetools.environment.launcher=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.launcher
-plugin@org.eclipse.ptp.remotetools.environment.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.environment.ui
-plugin@org.eclipse.ptp.remotetools.preferences=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.preferences
-plugin@org.eclipse.ptp.remotetools.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.remotetools.utils
-
-! PLDT Plugins
-plugin@org.eclipse.ptp.pldt.common=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.common
-plugin@org.eclipse.ptp.pldt.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.help
-plugin@org.eclipse.ptp.pldt.lapi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.lapi
-plugin@org.eclipse.ptp.pldt.mpi.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis
-plugin@org.eclipse.ptp.pldt.mpi.analysis.cdt=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.analysis.cdt
-plugin@org.eclipse.ptp.pldt.mpi.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.mpi.core
-plugin@org.eclipse.ptp.pldt.openmp.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.analysis
-plugin@org.eclipse.ptp.pldt.openmp.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.core
-plugin@org.eclipse.ptp.pldt.openmp.ui.pv=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.openmp.ui.pv
-plugin@org.eclipse.ptp.pldt.upc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.upc
-plugin@org.eclipse.ptp.pldt.wizards=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/org.eclipse.ptp.pldt.wizards
-
-! ETF Plugins
-plugin@org.eclipse.ptp.perf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf
-plugin@org.eclipse.ptp.perf.tau=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau
-plugin@org.eclipse.ptp.perf.tau.jars=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.jars
-plugin@org.eclipse.ptp.perf.tau.papiselect=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.papiselect
-plugin@org.eclipse.ptp.perf.tau.perfdmf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.perfdmf
-plugin@org.eclipse.ptp.perf.tau.selinst=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinst
-plugin@org.eclipse.ptp.perf.tau.selinstfort=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.tau.selinstfort
-plugin@org.eclipse.ptp.perf.toolopts=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/perf/org.eclipse.ptp.perf.toolopts
-
-! RDT Plugins
-plugin@org.eclipse.ptp.rdt.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core
-plugin@org.eclipse.ptp.rdt.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui
-plugin@org.eclipse.ptp.rdt.services=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services
-plugin@org.eclipse.ptp.rdt.doc.user=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.doc.user
-
-! 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 c236ce2..0000000
--- a/releng/org.eclipse.ptp.releng/master/build.properties
+++ /dev/null
@@ -1,99 +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
-
-############## 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 3c59115..0000000
--- a/releng/org.eclipse.ptp.releng/master/customTargets.xml
+++ /dev/null
@@ -1,155 +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>
-</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-${branchVersion}-${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>
-</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="${branchVersion}.${timestamp}"/>
- </replace>
- <replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.ppc/BUILD">
- <replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
- </replace>
- <replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.x86/BUILD">
- <replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
- </replace>
- <replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.x86_64/BUILD">
- <replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
- </replace>
- <replace file="${buildDirectory}/plugins/org.eclipse.ptp.macosx.ppc/BUILD">
- <replacefilter token="@buildVersion@" value="${branchVersion}.${timestamp}"/>
- </replace>
- <replace file="${buildDirectory}/plugins/org.eclipse.ptp.macosx.x86/BUILD">
- <replacefilter token="@buildVersion@" value="${branchVersion}.${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/ptpbuild b/releng/org.eclipse.ptp.releng/ptpbuild
deleted file mode 100644
index 00f378d..0000000
--- a/releng/org.eclipse.ptp.releng/ptpbuild
+++ /dev/null
@@ -1,81 +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
-
-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.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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "AS IS" 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]> <![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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "AS IS" 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]> <![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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "AS IS" 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]> <![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 "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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 ("AGREEMENT"). 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'>"Contribution" 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'>"Contributor" means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Licensed Patents " 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'>"Program" means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>"Recipient" 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 ("Commercial
-Contributor") hereby agrees to defend and indemnify every other
-Contributor ("Indemnified Contributor") against any losses, damages and
-costs (collectively "Losses") 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 "AS IS" 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]> <![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.slurm-feature/feature.properties b/releng/org.eclipse.ptp.rm.slurm-feature/feature.properties
deleted file mode 100644
index 38ad984..0000000
--- a/releng/org.eclipse.ptp.rm.slurm-feature/feature.properties
+++ /dev/null
@@ -1,137 +0,0 @@
-#################################################################################
- # Copyright (c) 2008,2009 School of Computer Science,National University
- # of Defense Technology,Changsha,China.All rights reserved. This program
- # and the accompanying materials are made available under the terms of
- # the Eclipse Public License v1.0 which accompanies this distribution,
- # and is available at http://www.eclipse.org/legal/epl-v10.html
- # Contributors:
- # NUDT school of computer - 605 staff room
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For SLURM
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for Slurm
-
-# copyright
-copyright=\
- Copyright (c) 2008,2009 School of Computer,National University \n\
- of Defense Technology,P.R.China. All rights reserved. This program\n\
- and the accompanying materials are made available under the terms of \n\
- the Eclipse Public License v1.0 which accompanies this distribution,\n\
- and is available at http://www.eclipse.org/legal/epl-v10.html\n\
- Contributors:\n\
- School of Computer - 605 staff room
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.slurm-feature/feature.xml b/releng/org.eclipse.ptp.rm.slurm-feature/feature.xml
deleted file mode 100644
index 422dc9a..0000000
--- a/releng/org.eclipse.ptp.rm.slurm-feature/feature.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.ptp.rm.slurm"
- label="%featureName"
- version="2.1.0.qualifier"
- provider-name="%providerName"
- plugin="org.eclipse.ptp.rm.slurm.core"
- image="eclipse_update_120.jpg">
-
- <description url="http://eclipse.org/ptp">
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/2.1"/>
- </url>
-
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.debug.core"/>
- <import plugin="org.eclipse.ptp.core"/>
- <import plugin="org.eclipse.ptp.rm.core"/>
- <import plugin="org.eclipse.ptp.rm.remote"/>
- <import plugin="org.eclipse.ptp.remote.core"/>
- <import plugin="org.eclipse.core.filesystem"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.search"/>
- <import plugin="org.eclipse.ptp.ui"/>
- <import plugin="org.eclipse.ptp.launch"/>
- <import plugin="org.eclipse.debug.ui"/>
- <import plugin="org.eclipse.ptp.rm.ui"/>
- <import plugin="org.eclipse.ptp.utils.ui"/>
- <import plugin="org.eclipse.ptp.proxy.protocol"/>
- </requires>
-
- <plugin
- id="org.eclipse.ptp.rm.slurm.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.ptp.rm.slurm.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.slurm-feature/license.html b/releng/org.eclipse.ptp.rm.slurm-feature/license.html
deleted file mode 100644
index 15a10cf..0000000
--- a/releng/org.eclipse.ptp.rm.slurm-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). 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
- ("EPL"). 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, "Program" 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 ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</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 ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</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 "features". Within a Feature, files named "feature.xml" 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 ("Included Features"). Within a Feature, files named "feature.xml" 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 "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). 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 "src" 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 ("Feature Update License") 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 "license" property of files named "feature.properties" 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 595a06e..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.ptp.core,
- org.eclipse.ptp.rm.core,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.remote.core,
- org.eclipse.core.filesystem,
- org.eclipse.ui,
- org.eclipse.search
-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 ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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 e120362..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.ptp.core.resourceManagers">
- <resourceManager
- class="org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManagerFactory"
- id="org.eclipse.ptp.mpich2.core.resourcemanager"
- name="MPICH2"/>
- </extension>
-
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java
deleted file mode 100644
index 27da4e6..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2ApplicationAttributes.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ApplicationAttributes {
- private static final String EFFECTIVE_MPICH2_ENV_ATTR_ID = "MPICH2_env"; //$NON-NLS-1$
- private static final String EFFECTIVE_MPICH2_PROG_ARGS_ATTR_ID = "MPICH2_progArgs"; //$NON-NLS-1$
- private static final String EFFECTIVE_MPICH2_WORKING_DIR_ATTR_ID = "MPICH2_workingDir"; //$NON-NLS-1$
-
- private final static ArrayAttributeDefinition<String> effectiveMPICH2EnvAttrDef =
- new ArrayAttributeDefinition<String>(EFFECTIVE_MPICH2_ENV_ATTR_ID, Messages.MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_title,
- Messages.MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_description, true, null);
-
- private final static ArrayAttributeDefinition<String> effectiveMPICH2ProgArgsAttrDef =
- new ArrayAttributeDefinition<String>(EFFECTIVE_MPICH2_PROG_ARGS_ATTR_ID, Messages.MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_title,
- Messages.MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_description, true, null);
-
- private final static StringAttributeDefinition effectiveMPICH2WorkingDirAttrDef =
- new StringAttributeDefinition(EFFECTIVE_MPICH2_WORKING_DIR_ATTR_ID, Messages.MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_title,
- Messages.MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_description, true, ""); //$NON-NLS-1$
-
- /**
- * Environment variables that MPICH2 has passed to the processes.
- */
- public static ArrayAttributeDefinition<String> getEffectiveMPICH2EnvAttributeDefinition() {
- return effectiveMPICH2EnvAttrDef;
- }
-
- /**
- * Program arguments that MPICH2 has passed to the processes.
- */
- public static ArrayAttributeDefinition<String> getEffectiveMPICH2ProgArgsAttributeDefinition() {
- return effectiveMPICH2ProgArgsAttrDef;
- }
-
- /**
- * Working directory where MPICH2 has started the processes.
- */
- public static StringAttributeDefinition getEffectiveMPICH2WorkingDirAttributeDefinition() {
- return effectiveMPICH2WorkingDirAttrDef;
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java
deleted file mode 100644
index bab4b2d..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Defaults.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.osgi.framework.Bundle;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2Defaults {
-
- public static String LAUNCH_CMD = null;
- public static String DEBUG_CMD = null;
- public static String DISCOVER_CMD = null;
- public static String PERIODIC_CMD = null;
- public static int PERIODIC_TIME = 0;
- public static String PATH = null;
- public static boolean USE_DEFAULTS = false;
-
- private static String defaultsResourcePath = "/data/defaults.properties"; //$NON-NLS-1$
-
- public static void loadDefaults() throws CoreException {
- Path defaultsPropertiesPath = new Path(defaultsResourcePath);
- Bundle bundle = MPICH2Plugin.getDefault().getBundle();
- Properties properties = read(defaultsPropertiesPath, bundle);
-
- LAUNCH_CMD = getString(bundle, properties, "LAUNCH_CMD"); //$NON-NLS-1$
- DEBUG_CMD = getString(bundle, properties, "DEBUG_CMD"); //$NON-NLS-1$
- DISCOVER_CMD = getString(bundle, properties, "DISCOVER_CMD"); //$NON-NLS-1$
- PERIODIC_CMD = getString(bundle, properties, "PERIODIC_CMD"); //$NON-NLS-1$
- PERIODIC_TIME = getInteger(bundle, properties, "PERIODIC_TIME"); //$NON-NLS-1$
- PATH = getString(bundle, properties, "PATH"); //$NON-NLS-1$
- USE_DEFAULTS = getBoolean(bundle, properties, "USE_DEFAULTS"); //$NON-NLS-1$
-
- assert LAUNCH_CMD != null;
- assert DEBUG_CMD != null;
- assert DISCOVER_CMD != null;
- assert PERIODIC_CMD != null;
- assert PATH != null;
- }
-
- public static Properties read(Path defaultsPropertiesPath, Bundle bundle)
- throws CoreException {
- InputStream inStream;
- Properties properties = new Properties();
- try {
- inStream = FileLocator.openStream(bundle, defaultsPropertiesPath, false);
- properties.load(inStream);
-
-
- } catch (IOException e) {
- throw MPICH2Plugin.coreErrorException(Messages.MPICH2Defaults_Exception_FailedReadFile, e);
- }
- return properties;
- }
-
- public static String getString(Bundle bundle, Properties properties, String key) throws CoreException {
- String value = properties.getProperty(key);
- if (value == null) {
- throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2Defaults_MissingValue, key)));
- }
-
- return value;
- }
-
- public static int getInteger(Bundle bundle, Properties properties, String key) throws CoreException {
- String value = getString(bundle, properties, key);
- try {
- return Integer.parseInt(value);
- } catch (NumberFormatException e) {
- throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2Defaults_FailedParseInteger, key)));
- }
- }
-
- public static boolean getBoolean(Bundle bundle, Properties properties, String key) throws CoreException {
- String value = getString(bundle, properties, key);
- return Boolean.parseBoolean(value);
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java
deleted file mode 100644
index d5110df..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2JobAttributes.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * Node attributes.
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2JobAttributes {
-
- private static final String JOB_ID_ATTR_ID = "MPICH2_jobid"; //$NON-NLS-1$
- private static final String HOSTNAME_ATTR_ID = "MPICH2_hostname"; //$NON-NLS-1$
-
- private final static StringAttributeDefinition jobIdAttrDef =
- new StringAttributeDefinition(JOB_ID_ATTR_ID, Messages.MPICH2JobAttributes_mpiJobIdAttrDef_title,
- Messages.MPICH2JobAttributes_mpiJobIdAttrDef_description, true, ""); //$NON-NLS-1$
-
- private final static StringAttributeDefinition hostnameAttrDef =
- new StringAttributeDefinition(HOSTNAME_ATTR_ID, Messages.MPICH2JobAttributes_hostnameAttrDef_title,
- Messages.MPICH2JobAttributes_hostnameAttrDef_description, true, ""); //$NON-NLS-1$
-
- /**
- */
- public static StringAttributeDefinition getJobIdAttributeDefinition() {
- return jobIdAttrDef;
- }
-
- /**
- */
- public static StringAttributeDefinition getHostnameAttributeDefinition() {
- return hostnameAttrDef;
- }
-
- public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
- return new IAttributeDefinition[]{jobIdAttrDef, hostnameAttrDef};
- }
-
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java
deleted file mode 100644
index 3430da2..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2LaunchAttributes.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * OMPI-specific attributes
- *
- * @author Daniel Felix Ferber
- */
-public class MPICH2LaunchAttributes {
- private static final String LAUNCH_ARGS_ATTR_ID = "MPICH2_args"; //$NON-NLS-1$
- private static final String ENV_KEYS_ATTR_ID = "MPICH2_envKeys"; //$NON-NLS-1$
- private static final String ENV_ARGS_ATTR_ID = "MPICH2_env"; //$NON-NLS-1$
-
- private final static StringAttributeDefinition launchArgsAttrDef =
- new StringAttributeDefinition(LAUNCH_ARGS_ATTR_ID, Messages.MPICH2LaunchAttributes_launchArgsAttrDef_title,
- Messages.MPICH2LaunchAttributes_launchArgsAttrDef_description, false, ""); //$NON-NLS-1$
-
- private final static ArrayAttributeDefinition<String> environmentKeyAttrDef = new ArrayAttributeDefinition<String>(
- ENV_KEYS_ATTR_ID, Messages.MPICH2LaunchAttributes_environmentKeyAttrDef_title,
- Messages.MPICH2LaunchAttributes_environmentKeyAttrDef_description, false,
- new String[0]);
-
- private final static StringAttributeDefinition environmentArgsAttrDef = new StringAttributeDefinition(
- ENV_ARGS_ATTR_ID, Messages.MPICH2LaunchAttributes_environmentArgsAttrDef_title, Messages.MPICH2LaunchAttributes_environmentArgsAttrDef_description, false,
- "${MPICH2_envKeys:: -x ::-x :}"); //$NON-NLS-1$
-
- /**
- * List of names of environment variables for the application.
- */
- public static ArrayAttributeDefinition<String> getEnvironmentKeysAttributeDefinition() {
- return environmentKeyAttrDef;
- }
-
- /**
- * Environment variables for the application, as expected by openmpi command line.
- */
- public static StringAttributeDefinition getEnvironmentArgsAttributeDefinition() {
- return environmentArgsAttrDef;
- }
-
- /**
- * Arguments for the application, as expected by openmpi command line.
- */
- public static StringAttributeDefinition getLaunchArgumentsAttributeDefinition() {
- return launchArgsAttrDef;
- }
-
- public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
- return new IAttributeDefinition[]{
- launchArgsAttrDef,environmentArgsAttrDef,environmentKeyAttrDef
- };
- }
-
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java
deleted file mode 100644
index 248b51b..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2MachineAttributes.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * Node attributes
- * @author Daniel Felix Ferber
- */
-public class MPICH2MachineAttributes {
-
- private static final String STATUS_MESSAGE = "MPICH2_statusMessage"; //$NON-NLS-1$
-
- private final static StringAttributeDefinition statusMessageAttrDef =
- new StringAttributeDefinition(STATUS_MESSAGE, Messages.MPICH2MachineAttributes_statusMessageAttrDef_title,
- Messages.MPICH2MachineAttributes_statusMessageAttrDef_description, true, ""); //$NON-NLS-1$
-
- /**
- * Status message if it was not possible to discover the machine.
- */
- public static StringAttributeDefinition getStatusMessageAttributeDefinition() {
- return statusMessageAttrDef;
- }
-
- public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
- return new IAttributeDefinition[]{statusMessageAttrDef};
- }
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java
deleted file mode 100644
index 8a21b96..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2NodeAttributes.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-import org.eclipse.ptp.core.attributes.BooleanAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-
-/**
- * Node attributes
- * @author Daniel Felix Ferber
- */
-public class MPICH2NodeAttributes {
-
- private static final String NUM_NODES_ID = "MPICH2_numNodes"; //$NON-NLS-1$
- private static final String MAX_NUM_NODES_ID = "MPICH2_maxNumNodes"; //$NON-NLS-1$
- private static final String STATUS_MESSAGE = "MPICH2_statusMessage"; //$NON-NLS-1$
- private static final String OVERSUBSCRIBED = "MPICH2_oversubscribed"; //$NON-NLS-1$
-
- private final static IntegerAttributeDefinition numNodesAttrDef =
- new IntegerAttributeDefinition(NUM_NODES_ID, Messages.MPICH2NodeAttributes_numNodesAttrDef_title,
- Messages.MPICH2NodeAttributes_numNodesAttrDef_description, true, new Integer(0));
-
- private final static IntegerAttributeDefinition maxNumNodesAttrDef =
- new IntegerAttributeDefinition(MAX_NUM_NODES_ID, Messages.MPICH2NodeAttributes_maxNumNodesAttrDef_title,
- Messages.MPICH2NodeAttributes_maxNumNodesAttrDef_description, true, new Integer(0));
-
- private final static StringAttributeDefinition statusMessageAttrDef =
- new StringAttributeDefinition(STATUS_MESSAGE, Messages.MPICH2NodeAttributes_statusMessageAttrDef_title,
- Messages.MPICH2NodeAttributes_statusMessageAttrDef_description, true, ""); //$NON-NLS-1$
-
- private final static BooleanAttributeDefinition oversubscribedAttrDef =
- new BooleanAttributeDefinition(OVERSUBSCRIBED, Messages.MPICH2NodeAttributes_oversubscribedAttrDef_title,
- Messages.MPICH2NodeAttributes_oversubscribedAttrDef_description, true, new Boolean(false));
-
- /**
- * Number of slots suggested on the node.
- */
- public static IntegerAttributeDefinition getNumberOfNodesAttributeDefinition() {
- return numNodesAttrDef;
- }
-
- /**
- * Maximal number of slots on the node. Zero if not set.
- */
- public static IntegerAttributeDefinition getMaximalNumberOfNodesAttributeDefinition() {
- return maxNumNodesAttrDef;
- }
-
- /**
- * Status message if it was not possible to discover the node.
- */
- public static StringAttributeDefinition getStatusMessageAttributeDefinition() {
- return statusMessageAttrDef;
- }
-
- /**
- * If node is oversubscribed.
- */
- public static BooleanAttributeDefinition getOversubscribedAttributeDefinition() {
- return oversubscribedAttrDef;
- }
-
- public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
- return new IAttributeDefinition[]{numNodesAttrDef,maxNumNodesAttrDef,statusMessageAttrDef};
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java
deleted file mode 100644
index 64d74b1..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2Plugin.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * @author Daniel Felix Ferber
- */
-public class MPICH2Plugin extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.ptp.rm.mpi.mpich2.core"; //$NON-NLS-1$
-
- // The shared instance
- private static MPICH2Plugin plugin;
-
- /**
- * The constructor
- */
- public MPICH2Plugin() {
- // Nothing to do
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- MPICH2Defaults.loadDefaults();
- MPICH2PreferenceManager.initializePreferences();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static MPICH2Plugin getDefault() {
- return plugin;
- }
-
- /**
- * Raise core exception.
- * @param message
- * @return
- */
- public static CoreException coreErrorException(String message) {
- return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message));
- }
-
- /**
- * Raise core exception.
- * @param message
- * @param t
- * @return
- */
- public static CoreException coreErrorException(String message, Throwable t) {
- return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message, t));
- }
-
- /**
- * Create log entry from an IStatus
- *
- * @param status
- */
- public static void log(IStatus status) {
- getDefault().getLog().log(status);
- }
-
- /**
- * Create log entry from a string
- *
- * @param msg
- */
- public static void log(String msg) {
- log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
- }
-
- /**
- * Create log entry from a Throwable
- *
- * @param e
- */
- public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, Messages.MPICH2Plugin_Exception_InternalError, e));
- }
-
- /**
- * Generate a unique identifier
- *
- * @return unique identifier string
- */
- public static String getUniqueIdentifier() {
- if (getDefault() == null)
- // If the default instance is not yet initialized,
- // return a static identifier. This identifier must
- // match the plugin id defined in plugin.xml
- return PLUGIN_ID;
- return getDefault().getBundle().getSymbolicName();
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java
deleted file mode 100644
index 018ddb3..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/MPICH2PreferenceManager.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.AbstractToolsPreferenceManager;
-
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2PreferenceManager extends AbstractToolsPreferenceManager {
- public static final String PREFIX = "mpich2-"; //$NON-NLS-1$
-
- public static Preferences getPreferences() {
- return MPICH2Plugin.getDefault().getPluginPreferences();
- }
-
- public static void savePreferences() {
- MPICH2Plugin.getDefault().savePluginPreferences();
- }
-
- public static void initializePreferences() {
- Preferences preferences = MPICH2Plugin.getDefault().getPluginPreferences();
- preferences.setDefault(PREFIX + PREFS_LAUNCH_CMD, MPICH2Defaults.LAUNCH_CMD);
- preferences.setDefault(PREFIX + PREFS_DEBUG_CMD, MPICH2Defaults.DEBUG_CMD);
- preferences.setDefault(PREFIX + PREFS_DISCOVER_CMD, MPICH2Defaults.DISCOVER_CMD);
- preferences.setDefault(PREFIX + PREFS_PERIODIC_MONITOR_CMD, MPICH2Defaults.PERIODIC_CMD);
- preferences.setDefault(PREFIX + PREFS_PERIODIC_MONITOR_TIME, MPICH2Defaults.PERIODIC_TIME);
- preferences.setDefault(PREFIX + PREFS_REMOTE_INSTALL_PATH, MPICH2Defaults.PATH);
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java
deleted file mode 100644
index 2263b7a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/Messages.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.mpi.mpich2.core.messages.messages"; //$NON-NLS-1$
- public static String MPICH2Defaults_Exception_FailedReadFile;
- public static String MPICH2Defaults_FailedParseInteger;
- public static String MPICH2Defaults_MissingValue;
- public static String MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_description;
- public static String MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_title;
- public static String MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_description;
- public static String MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_title;
- public static String MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_description;
- public static String MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_title;
- public static String MPICH2JobAttributes_hostnameAttrDef_description;
- public static String MPICH2JobAttributes_hostnameAttrDef_title;
- public static String MPICH2JobAttributes_mappingModeAttrDef_description;
- public static String MPICH2JobAttributes_mappingModeAttrDef_title;
- public static String MPICH2JobAttributes_mpiJobIdAttrDef_description;
- public static String MPICH2JobAttributes_mpiJobIdAttrDef_title;
- public static String MPICH2JobAttributes_vpidRangeAttrDef_description;
- public static String MPICH2JobAttributes_vpidRangeAttrDef_title;
- public static String MPICH2JobAttributes_vpidStartAttrDef_description;
- public static String MPICH2JobAttributes_vpidStartAttrDef_title;
- public static String MPICH2LaunchAttributes_environmentArgsAttrDef_description;
- public static String MPICH2LaunchAttributes_environmentArgsAttrDef_title;
- public static String MPICH2LaunchAttributes_environmentKeyAttrDef_description;
- public static String MPICH2LaunchAttributes_environmentKeyAttrDef_title;
- public static String MPICH2LaunchAttributes_launchArgsAttrDef_description;
- public static String MPICH2LaunchAttributes_launchArgsAttrDef_title;
- public static String MPICH2MachineAttributes_statusMessageAttrDef_description;
- public static String MPICH2MachineAttributes_statusMessageAttrDef_title;
- public static String MPICH2NodeAttributes_maxNumNodesAttrDef_description;
- public static String MPICH2NodeAttributes_maxNumNodesAttrDef_title;
- public static String MPICH2NodeAttributes_numNodesAttrDef_description;
- public static String MPICH2NodeAttributes_numNodesAttrDef_title;
- public static String MPICH2NodeAttributes_oversubscribedAttrDef_description;
- public static String MPICH2NodeAttributes_oversubscribedAttrDef_title;
- public static String MPICH2NodeAttributes_statusMessageAttrDef_description;
- public static String MPICH2NodeAttributes_statusMessageAttrDef_title;
- public static String MPICH2Plugin_Exception_InternalError;
-
- public static String MPICH2ResourceManagerConfiguration_defaultDescription;
- public static String MPICH2ResourceManagerConfiguration_defaultName;
-
- public static String MPICH2DiscoverJob_defaultQueueName;
- public static String MPICH2DiscoverJob_Exception_DiscoverCommandFailed;
- public static String MPICH2DiscoverJob_Exception_DiscoverCommandFailedParseHostFile;
- public static String MPICH2DiscoverJob_Exception_DiscoverCommandFailedReadHostFile;
- public static String MPICH2DiscoverJob_Exception_DiscoverCommandHostFileEmpty;
- public static String MPICH2DiscoverJob_Exception_DiscoverCommandHostFileNotFound;
- public static String MPICH2DiscoverJob_Exception_DiscoverCommandHostFilePathNotAbsolute;
- public static String MPICH2DiscoverJob_Exception_DiscoverCommandInternalError;
- public static String MPICH2DiscoverJob_Exception_DiscoverCommandMissingHostFilePath;
- public static String MPICH2DiscoverJob_Exception_HostFileErrors;
- public static String MPICH2DiscoverJob_Exception_HostFileParseError;
- public static String MPICH2DiscoverJob_Exception_HostnameCommandFailed;
- public static String MPICH2DiscoverJob_Exception_HostnameCommandFailedParse;
- public static String MPICH2DiscoverJob_Exception_HostnameCommandFailedParseOutput;
- public static String MPICH2DiscoverJob_Exception_HostnameCommandFailedWithCode;
- public static String MPICH2DiscoverJob_Exception_IgnoredInvalidParameter;
- public static String MPICH2DiscoverJob_Exception_InvalidMaxSlotsParameter;
- public static String MPICH2DiscoverJob_Exception_InvalidSlotsParameter;
- public static String MPICH2DiscoverJob_interruptedErrorMessage;
- public static String MPICH2DiscoverJob_name;
- public static String MPICH2DiscoverJob_parsingErrorMessage;
- public static String MPICH2DiscoverJob_processErrorMessage;
-
- public static String MPICH2MonitorJob_interruptedErrorMessage;
- public static String MPICH2MonitorJob_name;
- public static String MPICH2MonitorJob_parsingErrorMessage;
- public static String MPICH2MonitorJob_processErrorMessage;
- public static String MPICH2MonitorJob_Exception_CommandFailed;
- public static String MPICH2MonitorJob_Exception_InternalError;
-
- public static String MPICH2ProcessMapText12Parser_Exception_InvalidLine;
- public static String MPICH2ProcessMapText12Parser_Exception_MissingDisplayMapInformation;
- public static String MPICH2ProcessMapText12Parser_Exception_BrokenDisplayMapInformation;
-
- public static String MPICH2ProcessMapXml13Parser_Exception_AttributeNotInteger;
- public static String MPICH2ProcessMapXml13Parser_Exception_MissingAttribute;
- public static String MPICH2ProcessMapXml13Parser_Exception_UnknownAttribute;
- public static String MPICH2ProcessMapXml13Parser_Exception_UnknownElement;
-
- public static String MPICH2RuntimeSystem_JobName;
- public static String MPICH2RuntimeSystemJob_Exception_FailedParse;
- public static String MPICH2RuntimeSystemJob_Exception_HostnamesDoNotMatch;
- public static String MPICH2RuntimeSystemJob_ProcessName;
- public static String MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithExitValue;
- public static String MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithSignal;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // Prevent instances.
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties
deleted file mode 100644
index 563d942..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/messages/messages.properties
+++ /dev/null
@@ -1,88 +0,0 @@
-MPICH2Defaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-MPICH2Defaults_FailedParseInteger=Failed to parse integer default value for {0}
-MPICH2Defaults_MissingValue=Missing default value for {0}
-MPICH213Defaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-MPICH213Defaults_FailedParseInteger=Failed to parse integer default value for {0}
-MPICH213Defaults_MissingValue=Missing default value for {0}
-MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_description=Effective environment supplied by MPICH2 to executable on launch
-MPICH2ApplicationAttributes_effectiveMPICH2EnvAttrDef_title=Environment for MPICH2 processes
-MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_description=Effective command-line arguments by MPICH2 supplied to executable
-MPICH2ApplicationAttributes_effectiveMPICH2ProgArgsAttrDef_title=Program Arguments for MPICH2 processes
-MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_description=Effective working directory where MPICH2 launched the processes
-MPICH2ApplicationAttributes_effectiveMPICH2WorkingDirAttrDef_title=Working Directory for MPICH2 processes
-MPICH2JobAttributes_hostnameAttrDef_description=MPICH2 job hostname
-MPICH2JobAttributes_hostnameAttrDef_title=MPICH2 hostname
-MPICH2JobAttributes_mappingModeAttrDef_description=MPICH2 mapping mode
-MPICH2JobAttributes_mappingModeAttrDef_title=MPICH2 mapping mode
-MPICH2JobAttributes_mpiJobIdAttrDef_description=MPICH2 job id
-MPICH2JobAttributes_mpiJobIdAttrDef_title=MPICH2 job id
-MPICH2JobAttributes_vpidRangeAttrDef_description=MPICH2 vpid range
-MPICH2JobAttributes_vpidRangeAttrDef_title=MPICH2 vpid range
-MPICH2JobAttributes_vpidStartAttrDef_description=MPICH2 vpid start
-MPICH2JobAttributes_vpidStartAttrDef_title=MPICH2 vpid start
-MPICH2LaunchAttributes_environmentArgsAttrDef_description=Command line arguments to set environment variables for each MPICH2 processes
-MPICH2LaunchAttributes_environmentArgsAttrDef_title=MPICH2 Environment arguments
-MPICH2LaunchAttributes_environmentKeyAttrDef_description=Name of environment variables supplied to the each MPICH2 processes
-MPICH2LaunchAttributes_environmentKeyAttrDef_title=MPICH2 environment variables
-MPICH2LaunchAttributes_launchArgsAttrDef_description=Command line arguments for MPICH2
-MPICH2LaunchAttributes_launchArgsAttrDef_title=MPICH2 arguments
-MPICH2MachineAttributes_statusMessageAttrDef_description=MPICH2 status message
-MPICH2MachineAttributes_statusMessageAttrDef_title=MPICH2 status message
-MPICH2NodeAttributes_maxNumNodesAttrDef_description=MPICH2 maximal number of nodes on the host
-MPICH2NodeAttributes_maxNumNodesAttrDef_title=MPICH2 maximal number of nodes
-MPICH2NodeAttributes_numNodesAttrDef_description=MPICH2 number of nodes on the host
-MPICH2NodeAttributes_numNodesAttrDef_title=MPICH2 number of nodes
-MPICH2NodeAttributes_oversubscribedAttrDef_description=MPICH2 oversubscribed node (more processes than available)
-MPICH2NodeAttributes_oversubscribedAttrDef_title=MPICH2 oversubscribed
-MPICH2NodeAttributes_statusMessageAttrDef_description=MPICH2 status message
-MPICH2NodeAttributes_statusMessageAttrDef_title=MPICH2 status message
-MPICH2Plugin_Exception_InternalError=Internal error
-
-MPICH2ResourceManagerConfiguration_defaultDescription=MPICH2 Resource Manager
-MPICH2ResourceManagerConfiguration_defaultName=MPICH2
-
-MPICH2DiscoverJob_defaultQueueName=default
-MPICH2DiscoverJob_Exception_DiscoverCommandFailed=Error while running discover command: {0}.
-MPICH2DiscoverJob_Exception_DiscoverCommandFailedParseHostFile=Failed to parse hostfile ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandFailedReadHostFile=Failed read hostfile ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandHostFileEmpty=Empty hostfile is not allowed ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandHostFileNotFound=Failed find hostfile ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandHostFilePathNotAbsolute=Discover command informed a path to hostfile that is not an absolute path ({0}).
-MPICH2DiscoverJob_Exception_DiscoverCommandInternalError=Internal error while running discover command: {0}
-MPICH2DiscoverJob_Exception_DiscoverCommandMissingHostFilePath=Discover command did not inform path to default hostfile. If necessary, set MCA parameters to define default hostfile path.
-MPICH2DiscoverJob_Exception_HostFileErrors=There are errors in the hostfile.
-MPICH2DiscoverJob_Exception_HostFileParseError=Parse error(s) in hostfile.
-MPICH2DiscoverJob_Exception_HostnameCommandFailed=Failed to run command to get hostname.
-MPICH2DiscoverJob_Exception_HostnameCommandFailedParse=Failed to parse command for hostname.
-MPICH2DiscoverJob_Exception_HostnameCommandFailedParseOutput=Failed to parse output of discover command.
-MPICH2DiscoverJob_Exception_HostnameCommandFailedWithCode=Command to get hostname failed with exit code {0}
-MPICH2DiscoverJob_Exception_IgnoredInvalidParameter=Invalid parameter was ignored for this host.
-MPICH2DiscoverJob_Exception_InvalidMaxSlotsParameter=Invalid 'max-slots' parameter was ignored for this host.
-MPICH2DiscoverJob_Exception_InvalidSlotsParameter=Invalid 'slots/cpus/count' parameter was ignored for this host.
-MPICH2DiscoverJob_interruptedErrorMessage=Interrupted while running MPICH2 discover command.
-MPICH2DiscoverJob_name=Discover MPICH2 on {0}
-MPICH2DiscoverJob_parsingErrorMessage=Failed to parse output of MPICH2 discover command.
-MPICH2DiscoverJob_processErrorMessage=Failed to create remote process for MPICH2 discover command.
-
-MPICH2ProcessMapText12Parser_Exception_InvalidLine=Invalid output from MPICH2: {0}
-MPICH2ProcessMapText12Parser_Exception_MissingDisplayMapInformation=Output from MPICH2 has no information about processes and nodes.
-MPICH2ProcessMapText12Parser_Exception_BrokenDisplayMapInformation=Incomplete output from MPICH2.
-
-MPICH2ProcessMapXml13Parser_Exception_AttributeNotInteger=Attribute {0} is not an valid integer ({1})
-MPICH2ProcessMapXml13Parser_Exception_MissingAttribute=Missing XML attribute: {0}
-MPICH2ProcessMapXml13Parser_Exception_UnknownAttribute=Unknown XML attribute: {0}
-MPICH2ProcessMapXml13Parser_Exception_UnknownElement=Unknown XML element: {0}
-
-MPICH2RuntimeSystem_JobName=MPICH2 Job
-MPICH2RuntimeSystemJob_Exception_FailedParse=Failed to parse MPICH2 run command output.
-MPICH2RuntimeSystemJob_Exception_HostnamesDoNotMatch=Hostnames from MPICH2 output do not match expected hostname.
-MPICH2RuntimeSystemJob_ProcessName=MPICH2 run
-
-MPICH2MonitorJob_interruptedErrorMessage=Interrupted while running MPICH2 monitor command.
-MPICH2MonitorJob_name=Monitor MPICH2 on {0}
-MPICH2MonitorJob_parsingErrorMessage=Failed to parse output of MPICH2 monitor command.
-MPICH2MonitorJob_processErrorMessage=Failed to create remote process for MPICH2 monitor command.
-MPICH2MonitorJob_Exception_CommandFailed=Error while running command: {0}.
-MPICH2MonitorJob_Exception_InternalError=Internal error while running command: {0}
-MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithExitValue=Job terminated abnormally with exit value {0}. This can be caused by one or more processes exiting with a non-zero exit code, or exiting before calling MPI_Finalize.
-MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithSignal=Job terminated abnormally due to signal {0}. This can be caused by one ore more processes exiting due to this signal.
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/EffectiveMPICH2ResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/EffectiveMPICH2ResourceManagerConfiguration.java
deleted file mode 100644
index e13796e..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.AbstractToolRMConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2PreferenceManager;
-
-public class EffectiveMPICH2ResourceManagerConfiguration extends
-AbstractEffectiveToolRMConfiguration {
-
- public EffectiveMPICH2ResourceManagerConfiguration(
- AbstractToolRMConfiguration configuration) {
- super(configuration);
- MPICH2ResourceManagerConfiguration MPICH2configuration = (MPICH2ResourceManagerConfiguration)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/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 6d459e8..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() {
- MPICH2ResourceManagerConfiguration config = (MPICH2ResourceManagerConfiguration) getConfiguration();
- AttributeDefinitionManager attrDefMgr = getAttributeDefinitionManager();
- attrDefMgr.setAttributeDefinitions(AbstractToolsAttributes.getDefaultAttributeDefinitions());
- rts = new MPICH2RuntimeSystem(MPICH2_RMID, config, attrDefMgr);
- return rts;
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java
deleted file mode 100755
index d5d363c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerConfiguration.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-/**
- *
- */
-package org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolRMConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2PreferenceManager;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ui.IMemento;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ResourceManagerConfiguration extends
-AbstractToolRMConfiguration implements Cloneable {
-
- public static int MPICH2_CAPABILITIES = CAP_LAUNCH | CAP_DISCOVER | CAP_PERIODIC_MONITOR | CAP_REMOTE_INSTALL_PATH;
-
- private static final String TAG_VERSION_ID = "versionId"; //$NON-NLS-1$
-
- /**
- * Static class to hold openmpi configuration information
- *
- * @author dfferber
- */
- static public class MPICH2Config {
-
- private ToolsConfig toolsConfig;
- private String versionId;
-
- public MPICH2Config() {
- this(new ToolsConfig(), null);
- }
-
- public MPICH2Config(ToolsConfig toolsConfig, String versionId) {
- super();
- this.toolsConfig = toolsConfig;
- this.versionId = versionId;
- }
-
- public ToolsConfig getToolsConfig() {
- return toolsConfig;
- }
-
- public void setToolsConfig(ToolsConfig toolsConfig) {
- this.toolsConfig = toolsConfig;
- }
-
- public String getVersionId() {
- return versionId;
- }
-
- public void setVersionId(String versionId) {
- this.versionId = versionId;
- }
- }
-
- private String versionId;
-
- public static MPICH2Config loadOpenMpiConfig(IResourceManagerFactory factory,
- IMemento memento) {
- ToolsConfig toolsConfig = loadTool(factory, memento);
-
- String versionId = memento.getString(TAG_VERSION_ID);
-
- MPICH2Config config = new MPICH2Config(toolsConfig, versionId);
- return config;
- }
-
- public static MPICH2ResourceManagerConfiguration load(
- MPICH2ResourceManagerFactory factory, IMemento memento) {
- MPICH2Config mpich2Config = loadOpenMpiConfig(factory, memento);
- MPICH2ResourceManagerConfiguration config = new MPICH2ResourceManagerConfiguration(factory, mpich2Config);
- return config;
- }
-
- public MPICH2ResourceManagerConfiguration(MPICH2ResourceManagerFactory factory) {
- super(MPICH2_CAPABILITIES, new ToolsConfig(), factory);
-
- Preferences prefs = MPICH2PreferenceManager.getPreferences();
- setLaunchCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_LAUNCH_CMD));
- setDebugCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DEBUG_CMD));
- setDiscoverCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_DISCOVER_CMD));
- setPeriodicMonitorCmd(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_CMD));
- setPeriodicMonitorTime(prefs.getInt(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_PERIODIC_MONITOR_TIME));
- setRemoteInstallPath(prefs.getString(MPICH2PreferenceManager.PREFIX + MPICH2PreferenceManager.PREFS_REMOTE_INSTALL_PATH));
- // setUseToolDefaults(prefs.getBoolean(MPICH213PreferenceManager.PREFIX + MPICH213PreferenceManager.PREFS_USE_DEFAULTS));
- }
-
- public MPICH2ResourceManagerConfiguration(MPICH2ResourceManagerFactory factory,
- MPICH2Config config) {
- super(MPICH2_CAPABILITIES, config.getToolsConfig(), factory);
- }
-
- @Override
- public Object clone() {
- CommonConfig commonConf = new CommonConfig(getName(),
- getDescription(), getUniqueName(),
- getRemoteServicesId(), getConnectionName());
- RemoteConfig remoteConf = new RemoteConfig(commonConf,
- getProxyServerPath(), getLocalAddress(),
- getInvocationOptionsStr(), getOptions());
- ToolsConfig toolsConfig = new ToolsConfig(
- remoteConf,
- getLaunchCmd(),
- getDebugCmd(),
- getDiscoverCmd(),
- getPeriodicMonitorCmd(),
- getPeriodicMonitorTime(),
- getContinuousMonitorCmd(),
- getRemoteInstallPath(),
- getUseToolDefaults(),
- getUseInstallDefaults(),
- getCommandsEnabled());
- MPICH2Config openMpiConfig = new MPICH2Config(toolsConfig, getVersionId());
-
- return new MPICH2ResourceManagerConfiguration(
- (MPICH2ResourceManagerFactory) getFactory(), openMpiConfig);
- }
-
- @Override
- public void save(IMemento memento) {
- super.save(memento);
- memento.putString(TAG_VERSION_ID, versionId);
- }
-
- @Override
- public void setDefaultNameAndDesc() {
- String name = Messages.MPICH2ResourceManagerConfiguration_defaultName;
- String conn = getConnectionName();
- if (conn != null && !conn.equals(EMPTY_STRING)) {
- name += "@" + conn; //$NON-NLS-1$
- }
- setName(name);
- setDescription(Messages.MPICH2ResourceManagerConfiguration_defaultDescription);
- }
-
- public String getVersionId() {
- return versionId;
- }
-
- public void setVersionId(String versionId) {
- this.versionId = versionId;
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.java
deleted file mode 100755
index 38314bd..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rmsystem/MPICH2ResourceManagerFactory.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.rmsystem;
-
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2ResourceManagerFactory extends AbstractResourceManagerFactory {
-
- public IResourceManagerConfiguration copyConfiguration(
- IResourceManagerConfiguration configuration) {
- return (IResourceManagerConfiguration)configuration.clone();
- }
-
- @Override
- public IResourceManagerControl create(IResourceManagerConfiguration confIn) {
- MPICH2ResourceManagerConfiguration configuration = (MPICH2ResourceManagerConfiguration) confIn;
- PTPCorePlugin plugin = PTPCorePlugin.getDefault();
- IPUniverseControl universe = (IPUniverseControl) plugin.getUniverse();
- return new MPICH2ResourceManager(universe.getNextResourceManagerId(), universe, configuration);
- }
-
- public IResourceManagerConfiguration createConfiguration() {
- MPICH2ResourceManagerConfiguration conf = new MPICH2ResourceManagerConfiguration(this);
-
- return conf;
- }
-
- public IResourceManagerConfiguration loadConfiguration(IMemento memento) {
- return MPICH2ResourceManagerConfiguration.load(this, memento);
- }
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java
deleted file mode 100644
index 6e7c409..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2DiscoverJob.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractRemoteCommandJob;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2MachineAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2NodeAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- *
- * @author Greg Watson
- *
- */
-public class MPICH2DiscoverJob extends AbstractRemoteCommandJob {
- MPICH2RuntimeSystem rts;
-
- public MPICH2DiscoverJob(MPICH2RuntimeSystem rts) {
- super(rts,
- NLS.bind(Messages.MPICH2DiscoverJob_name, rts.getRmConfiguration().getName()),
- rts.retrieveEffectiveToolRmConfiguration().getDiscoverCmd(),
- Messages.MPICH2DiscoverJob_interruptedErrorMessage,
- Messages.MPICH2DiscoverJob_processErrorMessage,
- Messages.MPICH2DiscoverJob_parsingErrorMessage);
- this.rts = rts;
- }
-
- @Override
- protected void parse(BufferedReader output) throws CoreException {
- /*
- * MPI resource manager have only one machine and one queue.
- * There they are implicitly "discovered".
- */
- IResourceManager rm = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rts.getRmID());
- String machineID = rts.createMachine(rm.getName());
- rts.setMachineID(machineID);
- String queueID = rts.createQueue(Messages.MPICH2DiscoverJob_defaultQueueName);
- rts.setQueueID(queueID);
-
- IPMachine machine = rm.getMachineById(machineID);
- assert machine != null;
-
- /*
- * Any exception from now on is caught in order to add the error message as an attribute to the machine.
- * Then, the exception is re-thrown.
- */
- try {
- /*
- * Parse output of trace command that describes the system configuration.
- */
- MPICH2TraceParser parser = new MPICH2TraceParser();
- MPICH2HostMap hostMap = parser.parse(output);
- if (hostMap == null) {
- machine.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
- machine.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(Messages.MPICH2DiscoverJob_Exception_HostFileParseError));
- throw new CoreException(new Status(IStatus.ERROR, MPICH2Plugin.getDefault().getBundle().getSymbolicName(), parser.getErrorMessage()));
- }
-
- /*
- * Create model according to data from discover.
- */
- int nodeCounter = 0;
-
- for (MPICH2HostMap.Host host : hostMap.getHosts()) {
-
- // Add node to model
- String nodeId = rts.createNode(machineID, host.getName(), nodeCounter++);
-
- // Add processor information to node.
- AttributeManager attrManager = new AttributeManager();
- if (host.getNumProcessors() != 0) {
- try {
- attrManager.addAttribute(MPICH2NodeAttributes.getNumberOfNodesAttributeDefinition().create(host.getNumProcessors()));
- } catch (IllegalValueException e) {
- // This situation is not possible since host.getNumProcessors() is always valid.
- assert false;
- }
- }
- rts.changeNode(nodeId, attrManager);
- rts.setNodeIDForName(host.getName(), nodeId);
- }
- } catch (CoreException e) {
- /*
- * Show message of core exception and change machine status to error.
- */
- if (e.getStatus().getSeverity() == IStatus.ERROR) {
- AttributeManager attrManager = new AttributeManager();
- attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
- attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2DiscoverJob_Exception_DiscoverCommandFailed, e.getMessage())));
- rts.changeMachine(machineID, attrManager);
- }
- throw e;
- } catch (Exception e) {
- /*
- * Show message of all other exceptions and change machine status to error.
- */
- AttributeManager attrManager = new AttributeManager();
- attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
- attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2DiscoverJob_Exception_DiscoverCommandInternalError, e.getMessage())));
- rts.changeMachine(machineID, attrManager);
- }
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java
deleted file mode 100644
index 554d64c..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2HostMap.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2HostMap {
- public static class Host {
- public final static int NO_ERRORS = 0;
- public final static int ERR_NUM_SLOTS = 1 << 1;
- public final static int ERR_MAX_NUM_SLOTS = 1 << 2;
- public final static int ERR_UNKNOWN_ATTR = 1 << 3;
-
- private String name = null;
- private String addr = null;
- private String port = null;
- private int numProcessors = 0;
- private int maxNumProcessors = 0;
- private int errors = NO_ERRORS;
-
- public Host(String hostname, String address, String port) {
- this.name = hostname;
- this.addr = address;
- this.port = port;
- }
-
- public int getNumProcessors() {
- return numProcessors;
- }
-
- public int getMaxNumProcessors() {
- return maxNumProcessors;
- }
-
- public String getName() {
- return name;
- }
-
- public String getAddress() {
- return addr;
- }
-
- public String getPort() {
- return port;
- }
-
- public int getErrors() {
- return errors;
- }
-
- public void setNumProcessors(int numProcessors) {
- this.numProcessors = numProcessors;
- }
-
- public void setMaxNumProcessors(int maxNumProcessors) {
- this.maxNumProcessors = maxNumProcessors;
- }
-
- public void addErrors(int errors) {
- this.errors |= errors;
- }
- }
-
- List<Host> hosts = new ArrayList<Host>();
- Map<String, Host> hostNameToHost = new HashMap<String, Host>();
- public boolean hasErrors = false;
-
- protected void addHost(Host host) {
- hosts.add(host);
- hostNameToHost.put(host.getName(), host);
- }
-
- public Host[] getHosts() {
- return hosts.toArray(new Host[hosts.size()]);
- }
-
- public Iterator<Host> getHostIterator() {
- return hosts.listIterator();
- }
-
- public Host getHostByName(String name) {
- return hostNameToHost.get(name);
- }
-
- public void addHost(String name, String address, String port) {
- MPICH2HostMap.Host host = new MPICH2HostMap.Host(name, address, port);
- addHost(host);
- }
-
- public int count() {
- return hosts.size();
- }
-
- public boolean hasParseErrors() {
- return hasErrors;
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java
deleted file mode 100644
index 642fd76..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2JobMap.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author Greg Watson
- *
- */
-public class MPICH2JobMap {
-
- /**
- * An MPICH2 job.
- */
- public class Job {
- private static final int JOBID = 1 << 0;
- private static final int JOBALIAS = 1 << 1;
- private static final int USERNAME = 1 << 2;
- private static final int HOST = 1 << 3;
- private static final int PID = 1 << 4;
- private static final int SID = 1 << 5;
- private static final int RANK = 1 << 6;
- private static final int PGM = 1 << 7;
-
- private String jobID = null;
- private String jobAlias = null;
- private String username = null;
- private String host = null;
- private int pid = 0;
- private int sid = 0;
- private int rank = 0;
- private String pgm = null;
- private int complete;
-
- public Job() {
- this.complete = 0;
- }
-
- /**
- * @return the host
- */
- public String getHost() {
- return host;
- }
-
- /**
- * @return the jobID
- */
- public String getJobID() {
- return jobID;
- }
-
- /**
- * @return the jobAlias
- */
- public String getJobAlias() {
- return jobAlias;
- }
-
- /**
- * @return the pgm
- */
- public String getPgm() {
- return pgm;
- }
-
- /**
- * @return the pid
- */
- public int getPid() {
- return pid;
- }
-
- /**
- * @return the rank
- */
- public int getRank() {
- return rank;
- }
-
- /**
- * @return the sid
- */
- public int getSid() {
- return sid;
- }
-
- /**
- * @return the username
- */
- public String getUsername() {
- return username;
- }
-
- /**
- * @return the complete
- */
- public boolean isComplete() {
- return complete == (JOBID | JOBALIAS | USERNAME | HOST | PID | SID | RANK | PGM);
- }
-
- /**
- * @param host the host to set
- */
- public void setHost(String host) {
- this.host = host;
- this.complete |= HOST;
- }
-
- /**
- * @param jobID the jobID to set
- */
- public void setJobID(String jobID) {
- this.jobID = jobID;
- this.complete |= JOBID;
- }
-
- /**
- * @param jobAlias the jobAlias to set
- */
- public void setJobAlias(String jobAlias) {
- this.jobAlias = jobAlias;
- this.complete |= JOBALIAS;
- }
-
- /**
- * @param pgm the pgm to set
- */
- public void setPgm(String pgm) {
- this.pgm = pgm;
- this.complete |= PGM;
- }
-
- /**
- * @param pid the pid to set
- */
- public void setPid(int pid) {
- this.pid = pid;
- this.complete |= PID;
- }
-
- /**
- * @param rank the rank to set
- */
- public void setRank(int rank) {
- this.rank = rank;
- this.complete |= RANK;
- }
-
- /**
- * @param sid the sid to set
- */
- public void setSid(int sid) {
- this.sid = sid;
- this.complete |= SID;
- }
- /**
- * @param username the username to set
- */
- public void setUsername(String username) {
- this.username = username;
- this.complete |= USERNAME;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString() {
- String str = "Job "; //$NON-NLS-1$
- if (!isComplete()) {
- str += "(incomplete) ["; //$NON-NLS-1$
- } else {
- str += "]"; //$NON-NLS-1$
- }
- if ((complete & JOBID) == JOBID) {
- str += " id: " + jobID; //$NON-NLS-1$
- }
- if ((complete & JOBALIAS) == JOBALIAS) {
- str += " alias: " + jobAlias; //$NON-NLS-1$
- }
- if ((complete & USERNAME) == USERNAME) {
- str += " username:" + username; //$NON-NLS-1$
- }
- if ((complete & HOST) == HOST) {
- str += " host:" + host; //$NON-NLS-1$
- }
- if ((complete & PID) == PID) {
- str += " pid:" + pid; //$NON-NLS-1$
- }
- if ((complete & SID) == SID) {
- str += " sid:" + sid; //$NON-NLS-1$
- }
- if ((complete & RANK) == RANK) {
- str += " rank:" + rank; //$NON-NLS-1$
- }
- if ((complete & PGM) == PGM) {
- str += " pgm:" + pgm; //$NON-NLS-1$
- }
- return str + "]"; //$NON-NLS-1$
- }
-
- }
-
- private final Map<String, List<Job>> jobsByID = new HashMap<String, List<Job>>();
- public boolean hasErrors = false;
-
- public MPICH2JobMap() {
- // Nothing.
- }
-
- public void addJob(Job job) {
- List<Job> jobs = jobsByID.get(job.getJobID());
- if (jobs == null) {
- jobs = new ArrayList<Job>();
- jobsByID.put(job.getJobID(), jobs);
- }
- jobs.add(job);
- }
-
- public List<Job> getJob(String jobID) {
- return jobsByID.get(jobID);
- }
-
- public Collection<List<Job>> getJobs() {
- return jobsByID.values();
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java
deleted file mode 100644
index db25f92..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2ListJobsParser.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-
-/**
- *
- * @author Greg Watson
- *
- */
-public class MPICH2ListJobsParser {
- public enum JobListState {JOBLIST_INIT, JOBLIST_START, JOBLIST_END, JOBLIST_COMPLETE, JOBLIST_ERROR}
-
- private JobListState state;
- private MPICH2JobMap map = new MPICH2JobMap();
- private String errorMsg;
-
- /**
- * @param parser
- * @param line
- * @param job
- */
- private void processJobInfo(String line, MPICH2JobMap.Job job) {
- String[] parts = line.split("="); //$NON-NLS-1$
- String key;
- String value;
-
- if (parts.length == 1) {
- key = parts[0].trim();
- value = ""; //$NON-NLS-1$
- } else if (parts.length == 2) {
- key = parts[0].trim();
- value = parts[1].trim();
- } else {
- state = JobListState.JOBLIST_ERROR;
- errorMsg = line;
- return;
- }
-
- if ("jobid".equals(key)) { //$NON-NLS-1$
- job.setJobID(value);
- } else if ("jobalias".equals(key)) { //$NON-NLS-1$
- job.setJobAlias(value);
- } else if ("username".equals(key)) { //$NON-NLS-1$
- job.setUsername(value);
- } else if ("host".equals(key)) { //$NON-NLS-1$
- job.setHost(value);
- } else if ("pid".equals(key)) { //$NON-NLS-1$
- job.setPid(Integer.parseInt(value));
- } else if ("sid".equals(key)) { //$NON-NLS-1$
- job.setSid(Integer.parseInt(value));
- } else if ("rank".equals(key)) { //$NON-NLS-1$
- job.setRank(Integer.parseInt(value));
- } else if ("pgm".equals(key)) { //$NON-NLS-1$
- job.setPgm(value);
- } else {
- state = JobListState.JOBLIST_ERROR;
- errorMsg = line;
- return;
- }
-
- if (job.isComplete()) {
- state = JobListState.JOBLIST_END;
- }
- }
-
- /**
- * @param reader
- * @return
- * @throws IOException
- */
- public MPICH2JobMap parse(BufferedReader reader) throws IOException {
- String line = null;
- MPICH2JobMap.Job job = null;
-
- state = JobListState.JOBLIST_INIT;
-
- while (state != JobListState.JOBLIST_COMPLETE) {
- switch (state) {
- case JOBLIST_INIT:
- if ((line = reader.readLine()) == null) {
- state = JobListState.JOBLIST_COMPLETE;
- break;
- }
-
- line = line.trim();
-
- if (line.length() == 0) {
- // Ignore empty line
- break;
- }
-
- state = JobListState.JOBLIST_START;
-
- job = map.new Job();
- processJobInfo(line, job);
- break;
-
- case JOBLIST_START:
- if ((line = reader.readLine()) == null) {
- state = JobListState.JOBLIST_END;
- break;
- }
-
- line = line.trim();
-
- if (line.length() == 0) {
- state = JobListState.JOBLIST_END;
- break;
- }
-
- processJobInfo(line, job);
- break;
-
- case JOBLIST_END:
- if (job != null) {
- if (job.isComplete()) {
- map.addJob(job);
- } else {
- DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "job is incomplete, skipping" + job.toString()); //$NON-NLS-1$
- }
- }
-
- if (line == null) {
- state = JobListState.JOBLIST_COMPLETE;
- } else {
- state = JobListState.JOBLIST_INIT;
- }
- DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "found job " + job.toString()); //$NON-NLS-1$
- break;
-
- case JOBLIST_COMPLETE:
- break;
-
- case JOBLIST_ERROR:
- while ((line = reader.readLine()) != null) {
- errorMsg += "\n" + line; //$NON-NLS-1$
- }
- return null;
- }
- }
-
- return map;
- }
-
- /**
- * @return
- */
- public String getErrorMessage() {
- return errorMsg;
- }
-}
-
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java
deleted file mode 100644
index 0b38881..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2PeriodicJob.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractRemoteCommandJob;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2MachineAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- *
- * @author Greg Watson
- *
- */
-public class MPICH2PeriodicJob extends AbstractRemoteCommandJob {
- MPICH2RuntimeSystem rts;
-
- public MPICH2PeriodicJob(MPICH2RuntimeSystem rts) {
- super(rts,
- NLS.bind(Messages.MPICH2MonitorJob_name, rts.getRmConfiguration().getName()),
- rts.retrieveEffectiveToolRmConfiguration().getPeriodicMonitorCmd(),
- Messages.MPICH2MonitorJob_interruptedErrorMessage,
- Messages.MPICH2MonitorJob_processErrorMessage,
- Messages.MPICH2MonitorJob_parsingErrorMessage,
- rts.retrieveEffectiveToolRmConfiguration().getPeriodicMonitorTime());
- this.rts = rts;
- }
-
- @Override
- protected void parse(BufferedReader output) throws CoreException {
- /*
- * MPI resource manager have only one machine and one queue.
- * There they are implicitly "discovered".
- */
- IResourceManager rm = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rts.getRmID());
- IPMachine machine = rm.getMachineById(rts.getMachineID());
- IPQueue queue = rm.getQueueById(rts.getQueueID());
-
- /*
- * We may be called before the model has been set up properly. Do nothing
- * if this is the case.
- */
- if (machine == null || queue == null) {
- return;
- }
-
- /*
- * Any exception from now on is caught in order to add the error message as an attribute to the machine.
- * Then, the exception is re-thrown.
- */
- try {
- /*
- * Parse output of mpdlistjobs command.
- */
- MPICH2ListJobsParser parser = new MPICH2ListJobsParser();
- MPICH2JobMap jobMap = parser.parse(output);
- if (jobMap == null) {
- throw new CoreException(new Status(IStatus.ERROR, MPICH2Plugin.getDefault().getBundle().getSymbolicName(), parser.getErrorMessage()));
- }
-
- /*
- * Update model according to data. First create any new jobs.
- */
- for (List<MPICH2JobMap.Job> jobs : jobMap.getJobs()) {
- for (MPICH2JobMap.Job job : jobs) {
- IPJob pJob = queue.getJobById(job.getJobAlias());
- if (pJob == null) {
- // Not one of our jobs
- continue;
- }
- IPProcessControl process = (IPProcessControl)pJob.getProcessByIndex(job.getRank());
- if (process != null) {
- // process already exists, don't need to do anything
- continue;
- }
- String nodeID = rts.getNodeIDforName(job.getHost());
- if (nodeID == null) {
- throw new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), Messages.MPICH2RuntimeSystemJob_Exception_HostnamesDoNotMatch, null));
- }
-
- String processID = rts.createProcess(job.getJobAlias(), job.getRank(), nodeID);
-
- process = (IPProcessControl)pJob.getProcessById(processID);
- process.setState(ProcessAttributes.State.RUNNING);
- }
- }
- } catch (CoreException e) {
- /*
- * Show message of core exception and change machine status to error.
- */
- if (e.getStatus().getSeverity() == IStatus.ERROR) {
- AttributeManager attrManager = new AttributeManager();
- attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
- attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2MonitorJob_Exception_CommandFailed, e.getMessage())));
- rts.changeMachine(machine.getID(), attrManager);
- }
- throw e;
- } catch (Exception e) {
- /*
- * Show message of all other exceptions and change machine status to error.
- */
- AttributeManager attrManager = new AttributeManager();
- attrManager.addAttribute(MachineAttributes.getStateAttributeDefinition().create(MachineAttributes.State.ERROR));
- attrManager.addAttribute(MPICH2MachineAttributes.getStatusMessageAttributeDefinition().create(NLS.bind(Messages.MPICH2MonitorJob_Exception_InternalError, e.getMessage())));
- rts.changeMachine(machine.getID(), attrManager);
- }
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java
deleted file mode 100644
index b15e13f..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystem.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.rm.core.rmsystem.AbstractEffectiveToolRMConfiguration;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.EffectiveMPICH2ResourceManagerConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManagerConfiguration;
-
-/**
- *
- * @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,
- MPICH2ResourceManagerConfiguration config,
- AttributeDefinitionManager attrDefMgr) {
- super(rmid, config, attrDefMgr);
- }
-
- protected void setMachineID(String machineID) {
- this.machineID = machineID;
- }
-
- protected void setQueueID(String queueID) {
- this.queueID = queueID;
- }
-
- public String getMachineID() {
- return machineID;
- }
-
- public String getQueueID() {
- return queueID;
- }
-
- public String getNodeIDforName(String hostname) {
- return nodeNameToIDMap.get(hostname);
- }
-
- public void setNodeIDForName(String hostname, String nodeID) {
- nodeNameToIDMap.put(hostname, nodeID);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doShutdown()
- */
- @Override
- protected void doShutdown() throws CoreException {
- // Nothing to do
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStartEvents()
- */
- @Override
- protected void doStartEvents() throws CoreException {
- // Nothing to do
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStartup(org.eclipse.core.runtime.IProgressMonitor)
- */
- @Override
- protected void doStartup(IProgressMonitor monitor) throws CoreException {
- // Nothing to do
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem#doStopEvents()
- */
- @Override
- protected void doStopEvents() throws CoreException {
- // Nothing to do
- }
-
- @Override
- protected Job createDiscoverJob() {
- if (!rmConfiguration.hasDiscoverCmd()) {
- return null;
- }
- Job job = new MPICH2DiscoverJob(this);
- job.setPriority(Job.INTERACTIVE);
- job.setSystem(false);
- job.setUser(false);
- return job;
- }
-
- @Override
- protected Job createPeriodicMonitorJob() {
- if (!rmConfiguration.hasPeriodicMonitorCmd()) {
- return null;
- }
- Job job = new MPICH2PeriodicJob(this);
- job.setPriority(Job.INTERACTIVE);
- job.setSystem(false);
- job.setUser(false);
- return job;
- }
-
- @Override
- protected Job createContinuousMonitorJob() {
- return null;
- }
-
- @Override
- public Job createRuntimeSystemJob(String jobID, String queueID, AttributeManager attrMgr) {
- return new MPICH2RuntimeSystemJob(jobID, queueID, Messages.MPICH2RuntimeSystem_JobName, this, attrMgr);
- }
-
-
- @Override
- public AbstractEffectiveToolRMConfiguration retrieveEffectiveToolRmConfiguration() {
- return new EffectiveMPICH2ResourceManagerConfiguration(getRmConfiguration());
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java
deleted file mode 100644
index b8a7c2b..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2RuntimeSystemJob.java
+++ /dev/null
@@ -1,423 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPProcess;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes.State;
-import org.eclipse.ptp.core.elements.events.IChangedProcessEvent;
-import org.eclipse.ptp.core.elements.events.INewProcessEvent;
-import org.eclipse.ptp.core.elements.events.IProcessChangeEvent;
-import org.eclipse.ptp.core.elements.events.IRemoveProcessEvent;
-import org.eclipse.ptp.core.elements.listeners.IJobChildListener;
-import org.eclipse.ptp.core.elements.listeners.IProcessListener;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystem;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractToolRuntimeSystemJob;
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-import org.eclipse.ptp.rm.core.utils.InputStreamListenerToOutputStream;
-import org.eclipse.ptp.rm.core.utils.InputStreamObserver;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2JobAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2LaunchAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2Plugin;
-import org.eclipse.ptp.rm.mpi.mpich2.core.messages.Messages;
-
-/**
- *
- * @author Daniel Felix Ferber
- * @author Greg Watson
- *
- */
-public class MPICH2RuntimeSystemJob extends AbstractToolRuntimeSystemJob {
-
- public Object lock1 = new Object();
- private InputStreamObserver stderrObserver;
- private InputStreamObserver stdoutObserver;
-
- protected final ReentrantLock procsLock = new ReentrantLock();
- protected final Condition procsCondition = procsLock.newCondition();
- protected int numRunningProcs = 0;
-
- protected IProcessListener processListener = new IProcessListener() {
- /* (non-Javadoc)
- * @see org.eclipse.ptp.core.elements.listeners.IProcessListener#handleEvent(org.eclipse.ptp.core.elements.events.IProcessChangeEvent)
- */
- public void handleEvent(IProcessChangeEvent e) {
- if (e.getAttributes().getAttribute(ProcessAttributes.getStateAttributeDefinition()) != null
- && e.getSource().getState() == ProcessAttributes.State.RUNNING) {
- procsLock.lock();
- try {
- numRunningProcs++;
- procsCondition.signalAll();
- } finally {
- procsLock.unlock();
- }
- }
- }
- };
-
- protected IJobChildListener jobChildListener = new IJobChildListener() {
- /* (non-Javadoc)
- * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IChangedProcessEvent)
- */
- public void handleEvent(IChangedProcessEvent e) {
- // ignore
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.INewProcessEvent)
- */
- public void handleEvent(INewProcessEvent e) {
- for (IPProcess process : e.getProcesses()) {
- process.addElementListener(processListener);
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.core.elements.listeners.IJobChildListener#handleEvent(org.eclipse.ptp.core.elements.events.IRemoveProcessEvent)
- */
- public void handleEvent(IRemoveProcessEvent e) {
- for (IPProcess process : e.getProcesses()) {
- process.removeElementListener(processListener);
- }
- }
- };
-
- public MPICH2RuntimeSystemJob(String jobID, String queueID, String name, AbstractToolRuntimeSystem rtSystem, AttributeManager attrMgr) {
- super(jobID, queueID, name, rtSystem, attrMgr);
- }
-
- private void changeAllProcessesStatus(State newState) {
- final MPICH2RuntimeSystem rtSystem = (MPICH2RuntimeSystem) getRtSystem();
- final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
-
- /*
- * Mark all running and starting processes as finished.
- */
- List<String> ids = new ArrayList<String>();
- for (IPProcess ipProcess : ipJob.getProcesses()) {
- switch (ipProcess.getState()) {
- case EXITED:
- case ERROR:
- case EXITED_SIGNALLED:
- break;
- case RUNNING:
- case STARTING:
- case SUSPENDED:
- case UNKNOWN:
- ids.add(ipProcess.getID());
- break;
- }
- }
-
- AttributeManager attrMrg = new AttributeManager();
- attrMrg.addAttribute(ProcessAttributes.getStateAttributeDefinition().create(newState));
- for (String processId : ids) {
- rtSystem.changeProcess(processId, attrMrg);
- }
- }
-
- @Override
- protected void doBeforeExecution(IProgressMonitor monitor, IRemoteProcessBuilder builder) throws CoreException {
- final MPICH2RuntimeSystem rtSystem = (MPICH2RuntimeSystem) getRtSystem();
- final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
- ipJob.addChildListener(jobChildListener);
- }
-
- @Override
- protected void doExecutionCleanUp(IProgressMonitor monitor) {
- if (getProcess() != null) {
- getProcess().destroy();
- }
- if (stderrObserver != null) {
- stderrObserver.kill();
- stderrObserver = null;
- }
- if (stdoutObserver != null) {
- stdoutObserver.kill();
- stdoutObserver = null;
- }
- // TODO: more cleanup?
- changeAllProcessesStatus(ProcessAttributes.State.EXITED);
- }
-
- @Override
- protected JobAttributes.State doExecutionFinished(IProgressMonitor monitor) throws CoreException {
- changeAllProcessesStatus(ProcessAttributes.State.EXITED);
- if (getProcess().exitValue() != 0) {
- if (!terminateJobFlag) {
- changeJobStatusMessage(NLS.bind(Messages.MPICH2RuntimeSystemJob_Exception_ExecutionFailedWithExitValue, new Integer(getProcess().exitValue())));
- return JobAttributes.State.ERROR;
- }
-
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING, "RTS job #{0}: ignoring exit value {1} because job was forced to terminate by user", getJobID(), new Integer(getProcess().exitValue())); //$NON-NLS-1$
- }
- return JobAttributes.State.TERMINATED;
- }
-
- @Override
- protected void doExecutionStarted(IProgressMonitor monitor) throws CoreException {
- final MPICH2RuntimeSystem rtSystem = (MPICH2RuntimeSystem) getRtSystem();
- final IPJob ipJob = PTPCorePlugin.getDefault().getUniverse().getResourceManager(rtSystem.getRmID()).getQueueById(getQueueID()).getJobById(getJobID());
-
- /*
- * Listener that saves stdout.
- */
- final PipedOutputStream stdoutOutputStream = new PipedOutputStream();
- final PipedInputStream stdoutInputStream = new PipedInputStream();
- try {
- stdoutInputStream.connect(stdoutOutputStream);
- } catch (IOException e) {
- assert false; // This exception is not possible
- }
- final InputStreamListenerToOutputStream stdoutPipedStreamListener = new InputStreamListenerToOutputStream(stdoutOutputStream);
-
- Thread stdoutThread = new Thread() {
- @Override
- public void run() {
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: started", getJobID()); //$NON-NLS-1$
- BufferedReader stdoutBufferedReader = new BufferedReader(new InputStreamReader(stdoutInputStream));
- try {
- String line = stdoutBufferedReader.readLine();
- while (line != null) {
- int index = 0;
- int pos = line.indexOf(": "); //$NON-NLS-1$
- if (pos > 0) {
- try {
- index = Integer.parseInt(line.substring(0, pos));
- line = line.substring(pos+1);
- } catch (NumberFormatException e) {
- // ignore
- }
- }
- synchronized (lock1) {
- IPProcess ipProc = ipJob.getProcessByIndex(index);
- if (ipProc != null) {
- ipProc.addAttribute(ProcessAttributes.getStdoutAttributeDefinition().create(line));
- }
- DebugUtil.trace(DebugUtil.RTS_JOB_OUTPUT_TRACING, "RTS job #{0}:> {1}", getJobID(), line); //$NON-NLS-1$
- }
- line = stdoutBufferedReader.readLine();
- }
- } catch (IOException e) {
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: {0}", e); //$NON-NLS-1$
- MPICH2Plugin.log(e);
- } finally {
- stdoutPipedStreamListener.disable();
- }
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stdout thread: finished", getJobID()); //$NON-NLS-1$
- }
- };
-
- /*
- * Listener that saves stderr.
- */
- final PipedOutputStream stderrOutputStream = new PipedOutputStream();
- final PipedInputStream stderrInputStream = new PipedInputStream();
- try {
- stderrInputStream.connect(stderrOutputStream);
- } catch (IOException e) {
- assert false; // This exception is not possible
- }
- final InputStreamListenerToOutputStream stderrPipedStreamListener = new InputStreamListenerToOutputStream(stderrOutputStream);
- Thread stderrThread = new Thread() {
- @Override
- public void run() {
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: started", getJobID()); //$NON-NLS-1$
- final BufferedReader stderrBufferedReader = new BufferedReader(new InputStreamReader(stderrInputStream));
- try {
- String line = stderrBufferedReader.readLine();
- while (line != null) {
- int index = 0;
- int pos = line.indexOf(": "); //$NON-NLS-1$
- if (pos > 0) {
- try {
- index = Integer.parseInt(line.substring(0, pos));
- line = line.substring(pos+1);
- } catch (NumberFormatException e) {
- // ignore
- }
- }
- synchronized (lock1) {
- IPProcess ipProc = ipJob.getProcessByIndex(index);
- if (ipProc != null) {
- ipProc.addAttribute(ProcessAttributes.getStderrAttributeDefinition().create(line));
- }
- DebugUtil.error(DebugUtil.RTS_JOB_OUTPUT_TRACING, "RTS job #{0}:> {1}", getJobID(), line); //$NON-NLS-1$
- }
- line = stderrBufferedReader.readLine();
- }
- } catch (IOException e) {
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: {1}", getJobID(), e); //$NON-NLS-1$
- MPICH2Plugin.log(e);
- } finally {
- stderrPipedStreamListener.disable();
- }
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: stderr thread: finished", getJobID()); //$NON-NLS-1$
- }
- };
-
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: starting all threads", getJobID()); //$NON-NLS-1$
- /*
- * Create and start listeners.
- */
- stdoutThread.start();
- stderrThread.start();
-
- stderrObserver = new InputStreamObserver(getProcess().getErrorStream());
- stdoutObserver = new InputStreamObserver(getProcess().getInputStream());
-
- stdoutObserver.addListener(stdoutPipedStreamListener);
- stderrObserver.addListener(stderrPipedStreamListener);
-
- stderrObserver.start();
- stdoutObserver.start();
-
- /*
- * At this point we need to pause until all processes have started. This is because
- * the model semantics are such that the job state must not be set to RUNNING until
- * all the job's processes (if there are any) have been created and also set to RUNNING.
- */
-
- /*
- * We know that a MPICH2 job has a number of processes attribute
- */
- int numProcs = 1;
- IntegerAttribute numProcsAttr = getAttrMgr().getAttribute(JobAttributes.getNumberOfProcessesAttributeDefinition());
- if (numProcsAttr != null) {
- numProcs = numProcsAttr.getValue().intValue();
- }
-
- procsLock.lock();
- try {
- while (!monitor.isCanceled() && numRunningProcs < numProcs) {
- try {
- procsCondition.await(500, TimeUnit.MILLISECONDS);
- } catch (InterruptedException e) {
- // ignore
- }
- }
- } finally {
- procsLock.unlock();
- }
- }
-
- @Override
- protected void doPrepareExecution(IProgressMonitor monitor) throws CoreException {
- // Nothing to do
- }
-
- @Override
- protected IAttribute<?, ?, ?>[] doRetrieveToolBaseSubstitutionAttributes() throws CoreException {
- // TODO make macros available for environment variables and work directory.
- return null;
- }
-
- @Override
- protected IAttribute<?, ?, ?>[] doRetrieveToolCommandSubstitutionAttributes(
- AttributeManager baseSubstitutionAttributeManager,
- String directory, Map<String, String> environment) {
-
- List<IAttribute<?, ?, ?>> newAttributes = new ArrayList<IAttribute<?,?,?>>();
-
- /*
- * An MPICH2 specific attribute.
- * Attribute that contains a list of names of environment variables.
- */
- int p = 0;
- String keys[] = new String[environment.size()];
- for (String key : environment.keySet()) {
- keys[p++] = key;
- }
- newAttributes.add(MPICH2LaunchAttributes.getEnvironmentKeysAttributeDefinition().create(keys));
-
- /*
- * An MPICH2 specific attribute.
- * A shortcut that generates arguments for the MPICH2 run command.
- */
- newAttributes.add(MPICH2LaunchAttributes.getEnvironmentArgsAttributeDefinition().create());
-
- /*
- * The jobid is used to alias the MPICH2 job so that it can be matched later.
- */
- newAttributes.add(MPICH2JobAttributes.getJobIdAttributeDefinition().create(getJobID()));
-
- return newAttributes.toArray(new IAttribute<?, ?, ?>[newAttributes.size()]);
- }
-
- @Override
- protected HashMap<String, String> doRetrieveToolEnvironment()
- throws CoreException {
- // No extra environment variables needs to be set for MPICH2.
- return null;
- }
-
- @Override
- protected void doTerminateJob() {
- // Empty implementation.
- }
-
- @Override
- protected void doWaitExecution(IProgressMonitor monitor) throws CoreException {
- /*
- * Wait until both stdout and stderr stop because stream are closed.
- * This means that the process has finished.
- */
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting stderr thread to finish", getJobID()); //$NON-NLS-1$
- try {
- stderrObserver.join();
- } catch (InterruptedException e1) {
- // Ignore
- }
-
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting stdout thread to finish", getJobID()); //$NON-NLS-1$
- try {
- stdoutObserver.join();
- } catch (InterruptedException e1) {
- // Ignore
- }
-
- /*
- * Still experience has shown that remote process might not have yet terminated, although stdout and stderr is closed.
- */
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: waiting mpi process to finish completely", getJobID()); //$NON-NLS-1$
- try {
- getProcess().waitFor();
- } catch (InterruptedException e) {
- // Ignore
- }
-
- DebugUtil.trace(DebugUtil.RTS_JOB_TRACING_MORE, "RTS job #{0}: completely finished", getJobID()); //$NON-NLS-1$
- }
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java
deleted file mode 100644
index f0433c0..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.core/src/org/eclipse/ptp/rm/mpi/mpich2/core/rtsystem/MPICH2TraceParser.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.core.rtsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.ptp.rm.core.utils.DebugUtil;
-
-/**
- *
- * @author Greg Watson
- *
- */
-public class MPICH2TraceParser {
- private String errorMessage = null;
- private MPICH2HostMap map = new MPICH2HostMap();
- private static Pattern pattern = Pattern.compile("([^_]+)_([0-9])+ \\(([0-9.]+)\\)"); //$NON-NLS-1$
-
- /**
- * Parse the output of the mpdtrace command.
- *
- * @param reader
- * @return an MPICH2HostMap containing the known hosts, or null if there was an error
- * @throws IOException
- */
- public MPICH2HostMap parse(BufferedReader reader) throws IOException {
- MPICH2TraceParser parser = new MPICH2TraceParser();
- String line;
- while ((line = reader.readLine()) != null) {
- line = line.trim();
-
- if (line.length()==0) {
- // Ignore empty line
- continue;
- }
-
- Matcher matcher = pattern.matcher(line);
- if (!matcher.matches()) {
- /*
- * Probably an error from mpdtrace. Collect lines and mark error.
- */
- errorMessage = ""; //$NON-NLS-1$
-
- while ((line = reader.readLine()) != null) {
- errorMessage += line + "\n"; //$NON-NLS-1$
- }
-
- return null;
- }
-
- if (matcher.matches() && matcher.groupCount() == 3) {
- String host = matcher.group(1);
- String port = matcher.group(2);
- String addr = matcher.group(3);
- parser.map.addHost(host, addr, port);
- DebugUtil.trace(DebugUtil.RTS_DISCOVER_TRACING, "found host " + host + " addr " + addr + " port " + port); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
- }
-
- return parser.map;
- }
-
- /**
- * @return error message
- */
- public String getErrorMessage() {
- return errorMessage;
- }
-}
-
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath
deleted file mode 100644
index 1fa3e68..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project
deleted file mode 100644
index bbf2126..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ptp.rm.mpi.mpich2.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 201e354..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,60 +0,0 @@
-#Mon Oct 06 14:36:44 GMT-03:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=error
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=error
-org.eclipse.jdt.core.compiler.problem.nullReference=error
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=error
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=error
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 3dfd11f..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.ptp.core,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.launch,
- org.eclipse.debug.ui,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.rm.ui,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.utils.ui,
- org.eclipse.ptp.rm.core,
- org.eclipse.ptp.rm.mpi.mpich2.core
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.mpi.mpich2.ui,
- org.eclipse.ptp.rm.mpi.mpich2.ui.launch,
- org.eclipse.ptp.rm.mpi.mpich2.ui.wizards
-Bundle-Vendor: %pluginProvider
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>May 2, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") 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 dd2cc70..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.ptp.ui.rmConfigurationWizards">
- <configurationWizard
- class="org.eclipse.ptp.rm.mpi.mpich2.ui.wizards.MPICH2RMConfigurationWizardPageFactory"
- id="org.eclipse.ptp.rm.mpich2.ui.configurationWizard"/>
- </extension>
- <extension
- point="org.eclipse.ptp.launch.rmLaunchConfigurations">
- <launchConfiguration
- class="org.eclipse.ptp.rm.mpi.mpich2.ui.launch.MPICH2RMLaunchConfigurationFactory"
- id="org.eclipse.ptp.rm.mpich2.ui.launchConfiguration"/>
- </extension>
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java
deleted file mode 100644
index 6baa3e1..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/MPICH2UIPlugin.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.core.ToolsRMPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.launch.MPICH2LaunchConfigurationDefaults;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * @author Daniel Felix Ferber
- */
-public class MPICH2UIPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.ptp.rm.mpi.mpich2.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static MPICH2UIPlugin plugin;
-
- /**
- * The constructor
- */
- public MPICH2UIPlugin() {
- // Empty implementation.
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- MPICH2LaunchConfigurationDefaults.loadDefaults();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static MPICH2UIPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Raise core exception.
- * @param message
- * @return
- */
- public static CoreException coreErrorException(String message) {
- return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message));
- }
-
- /**
- * Raise core exception.
- * @param message
- * @param t
- * @return
- */
- public static CoreException coreErrorException(String message, Throwable t) {
- return new CoreException(new Status(IStatus.ERROR, ToolsRMPlugin.getDefault().getBundle().getSymbolicName(), message, t));
- }
-
- /**
- * Create log entry from an IStatus
- *
- * @param status
- */
- public static void log(IStatus status) {
- getDefault().getLog().log(status);
- }
-
- /**
- * Create log entry from a string
- *
- * @param msg
- */
- public static void log(String msg) {
- log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, msg, null));
- }
-
- /**
- * Create log entry from a Throwable
- *
- * @param e
- */
- public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, Messages.MPICH2UIPlugin_Exception_InternalError, e));
- }
-
- /**
- * Generate a unique identifier
- *
- * @return unique identifier string
- */
- public static String getUniqueIdentifier() {
- if (getDefault() == null)
- // If the default instance is not yet initialized,
- // return a static identifier. This identifier must
- // match the plugin id defined in plugin.xml
- return PLUGIN_ID;
- return getDefault().getBundle().getSymbolicName();
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 180d5d7..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/AdvancedMPICH2RMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.ICheckStateListener;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.launch.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabDataSource;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabWidgetListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class AdvancedMPICH2RMLaunchConfigurationDynamicTab extends
-AbstractRMLaunchConfigurationDynamicTab {
-
- Composite control;
- Button useArgsDefaultsButton;
- Text argsText;
-
- class WidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener
- implements ICheckStateListener {
- public WidgetListener(AbstractRMLaunchConfigurationDynamicTab dynamicTab) {
- super(dynamicTab);
- }
-
- @Override
- protected void doWidgetSelected(SelectionEvent e) {
- super.doWidgetSelected(e);
- }
-
- public void checkStateChanged(CheckStateChangedEvent event) {
- // do nothing
- }
- }
-
- class DataSource extends RMLaunchConfigurationDynamicTabDataSource {
- private boolean useDefArgs;
- private String args;
-
- protected DataSource(AbstractRMLaunchConfigurationDynamicTab page) {
- super(page);
- }
-
- @Override
- protected void copyFromFields() throws ValidationException {
- useDefArgs = useArgsDefaultsButton.getSelection();
- args = extractText(argsText);
- }
-
- @Override
- protected void copyToFields() {
- applyText(argsText, args);
- useArgsDefaultsButton.setSelection(useDefArgs);
- }
-
- @Override
- protected void copyToStorage() {
- getConfigurationWorkingCopy().setAttribute(
- MPICH2LaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
- useDefArgs);
- getConfigurationWorkingCopy().setAttribute(
- MPICH2LaunchConfiguration.ATTR_ARGUMENTS, args);
- }
-
- @Override
- protected void loadDefault() {
- args = MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS;
- useDefArgs = MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS;
-
- }
-
- @Override
- protected void loadFromStorage() {
- try {
- args = getConfiguration().getAttribute(
- MPICH2LaunchConfiguration.ATTR_ARGUMENTS,
- MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS);
- useDefArgs = getConfiguration()
- .getAttribute(
- MPICH2LaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
- MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS);
- } catch (CoreException e) {
- // TODO handle exception?
- MPICH2UIPlugin.log(e);
- }
- }
-
- @Override
- protected void validateLocal() throws ValidationException {
- if (!useDefArgs && args == null) {
- throw new ValidationException(
- Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyArguments);
- }
- }
-
- /**
- * Convert a comma separated list into one host per line
- *
- * @param list
- * @return
- */
- private String hostListToText(String list) {
- if (list == null)
- return ""; //$NON-NLS-1$
- String result = ""; //$NON-NLS-1$
- String[] values = list.split(","); //$NON-NLS-1$
- for (int i = 0; i < values.length; i++) {
- if (!values[i].equals("")) { //$NON-NLS-1$
- if (i > 0) {
- result += "\r"; //$NON-NLS-1$
- }
- result += values[i];
- }
- }
- return result;
- }
- }
-
- @Override
- protected RMLaunchConfigurationDynamicTabDataSource createDataSource() {
- return new DataSource(this);
- }
-
- @Override
- protected RMLaunchConfigurationDynamicTabWidgetListener createListener() {
- return new WidgetListener(this);
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public String getText() {
- return Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Title;
- }
-
- public void createControl(Composite parent, IResourceManager rm,
- IPQueue queue) throws CoreException {
- control = new Composite(parent, SWT.NONE);
- control.setLayout(new GridLayout());
-
- final Group argumentsGroup = new Group(control, SWT.NONE);
- argumentsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true,
- false));
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- argumentsGroup.setLayout(layout);
- argumentsGroup
- .setText(Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_LaunchArguments);
-
- useArgsDefaultsButton = new Button(argumentsGroup, SWT.CHECK);
- useArgsDefaultsButton
- .setText(Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultArguments);
- // useArgsDefaultsButton.setSelection(true);
- GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
- useArgsDefaultsButton.setLayoutData(gd);
- useArgsDefaultsButton.addSelectionListener(getListener());
-
- Label label = new Label(argumentsGroup, SWT.NONE);
- label.setLayoutData(new GridData());
- label
- .setText(Messages.AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_Arguments);
-
- argsText = new Text(argumentsGroup, SWT.BORDER);
- argsText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
- }
-
- public IAttribute<?, ?, ?>[] getAttributes(IResourceManager rm,
- IPQueue queue, ILaunchConfiguration configuration, String mode)
- throws CoreException {
- return null;
- }
-
- public Control getControl() {
- return control;
- }
-
- public RMLaunchValidation setDefaults(
- ILaunchConfigurationWorkingCopy configuration, IResourceManager rm,
- IPQueue queue) {
- configuration.setAttribute(
- MPICH2LaunchConfiguration.ATTR_USEDEFAULTARGUMENTS,
- MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS);
- configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_ARGUMENTS,
- MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS);
- return new RMLaunchValidation(true, null);
- }
-
- @Override
- public void updateControls() {
- argsText.setEnabled(!useArgsDefaultsButton.getSelection());
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index ea739cb..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/BasicMPICH2RMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.rm.mpi.mpich2.core.MPICH2LaunchAttributes;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.ui.launch.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabDataSource;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabWidgetListener;
-import org.eclipse.ptp.utils.ui.PixelConverter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class BasicMPICH2RMLaunchConfigurationDynamicTab extends AbstractRMLaunchConfigurationDynamicTab {
-
- Composite control;
- Spinner numProcsSpinner;
- Button noLocalButton;
- Button usePrefixButton;
- Text prefixText;
- Text hostFileText;
- Button hostFileButton;
- Text hostListText;
- Button hostListButton;
- Button browseButton;
-
- class WidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener {
- public WidgetListener(AbstractRMLaunchConfigurationDynamicTab dynamicTab) {
- super(dynamicTab);
- }
-
- @Override
- protected void doModifyText(ModifyEvent e) {
- if (e.getSource() == numProcsSpinner || e.getSource() == prefixText || e.getSource() == hostFileText || e.getSource() == hostListText) {
- // getDataSource().justValidate();
- } else{
- super.doModifyText(e);
- }
- }
-
- @Override
- protected void doWidgetSelected(SelectionEvent e) {
- if (e.getSource() == noLocalButton || e.getSource() == usePrefixButton) {
- // getDataSource().justValidate();
- } else if (e.getSource() == usePrefixButton || e.getSource() == hostFileButton || e.getSource() == hostListButton) {
- // getDataSource().justValidate();
- updateControls();
- } else {
- super.doWidgetSelected(e);
- }
- }
- }
-
- class DataSource extends RMLaunchConfigurationDynamicTabDataSource {
-
- private int numProcs;
- private boolean noLocal;
- private boolean usePrefix;
- private String prefix;
- private boolean useHostFile;
- private String hostFile;
- private boolean useHostList;
- private String hostList;
-
- protected DataSource(AbstractRMLaunchConfigurationDynamicTab page) {
- super(page);
- }
-
- @Override
- protected void copyFromFields() throws ValidationException {
- numProcs = numProcsSpinner.getSelection();
- noLocal = noLocalButton.getSelection();
- usePrefix = usePrefixButton.getSelection();
- prefix = extractText(prefixText);
- useHostFile = hostFileButton.getSelection();
- hostFile = extractText(hostFileText);
- useHostList = hostListButton.getSelection();
- hostList = extractText(hostListText);
- }
-
- @Override
- protected void copyToFields() {
- numProcsSpinner.setSelection(numProcs);
- noLocalButton.setSelection(noLocal);
- usePrefixButton.setSelection(usePrefix);
- applyText(prefixText, prefix);
- applyText(hostFileText, hostFile);
- hostFileButton.setSelection(useHostFile);
- applyText(hostListText, hostListToText(hostList));
- hostListButton.setSelection(useHostList);
- }
-
- @Override
- protected void copyToStorage() {
- getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, numProcs);
- getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_NOLOCAL, noLocal);
- getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_USEPREFIX, usePrefix);
- getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_PREFIX, prefix);
- getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTFILE, useHostFile);
- getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTFILE, hostFile);
- getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTLIST, useHostList);
- getConfigurationWorkingCopy().setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTLIST, hostList);
- }
-
- @Override
- protected void loadDefault() {
- numProcs = MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS;
- noLocal = MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL;
- usePrefix = MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX;
- prefix = MPICH2LaunchConfigurationDefaults.ATTR_PREFIX;
- hostFile = MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE;
- useHostFile = MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE;
- hostList = MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST;
- useHostList = MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST;
-
- }
-
- @Override
- protected void loadFromStorage() {
- try {
- numProcs = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS);
- noLocal = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_NOLOCAL, MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL);
- usePrefix = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_USEPREFIX, MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX);
- prefix = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_PREFIX, MPICH2LaunchConfigurationDefaults.ATTR_PREFIX);
- hostFile = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_HOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE);
- useHostFile = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE);
- hostList = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_HOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST);
- useHostList = getConfiguration().getAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST);
- } catch (CoreException e) {
- // TODO handle exception?
- MPICH2UIPlugin.log(e);
- }
- }
-
- @Override
- protected void validateLocal() throws ValidationException {
- if (numProcs < 1) {
- throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_NoProcess);
- }
- if (usePrefix && prefix == null) {
- throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyPrefix);
- }
- if (useHostFile && hostFile == null) {
- throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostfile);
- }
- if (useHostList && hostList == null) {
- throw new ValidationException(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostList);
- }
- }
-
- /**
- * Convert a comma separated list into one host per line
- *
- * @param list
- * @return
- */
- private String hostListToText(String list) {
- if (list == null) {
- return ""; //$NON-NLS-1$
- }
- String result = ""; //$NON-NLS-1$
- String[] values = list.split(","); //$NON-NLS-1$
- for (int i = 0; i < values.length; i++) {
- if (!values[i].equals("")) { //$NON-NLS-1$
- if (i > 0) {
- result += "\r"; //$NON-NLS-1$
- }
- result += values[i];
- }
- }
- return result;
- }
- }
-
- @Override
- protected RMLaunchConfigurationDynamicTabDataSource createDataSource() {
- return new DataSource(this);
- }
-
- @Override
- protected RMLaunchConfigurationDynamicTabWidgetListener createListener() {
- return new WidgetListener(this);
- }
-
- @Override
- public Image getImage() {
- return null;
- }
-
- @Override
- public String getText() {
- return Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title;
- }
-
- public void createControl(Composite parent, IResourceManager rm, IPQueue queue) throws CoreException {
- control = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- control.setLayout(layout);
-
- Label label = new Label(control, SWT.NONE);
- label.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NumberProcesses);
-
- numProcsSpinner = new Spinner(control, SWT.BORDER);
- numProcsSpinner.addModifyListener(getListener());
- numProcsSpinner.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false, 2, 1));
-
- final Group optionsGroup = new Group(control, SWT.NONE);
- optionsGroup.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 3, 1));
- optionsGroup.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title_OptionsGroup);
- layout = new GridLayout();
- layout.numColumns = 3;
- optionsGroup.setLayout(layout);
-
- noLocalButton = new Button(optionsGroup, SWT.CHECK);
- noLocalButton.addSelectionListener(getListener());
- noLocalButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoLocal);
-
- usePrefixButton = new Button(optionsGroup, SWT.CHECK);
- usePrefixButton.addSelectionListener(getListener());
- usePrefixButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Prefix);
-
- prefixText = new Text(optionsGroup, SWT.BORDER);
- prefixText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));
- prefixText.addModifyListener(getListener());
-
- final Group hostGroup = new Group(control, SWT.NONE);
- hostGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
- hostGroup.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostGroup);
- layout = new GridLayout();
- layout.numColumns = 3;
- hostGroup.setLayout(layout);
-
- hostFileButton = new Button(hostGroup, SWT.CHECK);
- hostFileButton.addSelectionListener(getListener());
- hostFileButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_HostFile);
-
- hostFileText = new Text(hostGroup, SWT.BORDER);
- hostFileText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
- hostFileText.addModifyListener(getListener());
-
- browseButton = new Button(hostGroup, SWT.NONE);
- browseButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false));
- browseButton.addSelectionListener(getListener());
- PixelConverter pixelconverter = new PixelConverter(control);
- GridData gd = new GridData(SWT.RIGHT, SWT.CENTER, false, false);
- gd.widthHint = pixelconverter.convertHorizontalDLUsToPixels(IDialogConstants.BUTTON_WIDTH);
- browseButton.setLayoutData(gd);
- browseButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Browse);
-
- hostListButton = new Button(hostGroup, SWT.CHECK);
- hostListButton.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));
- hostListButton.addSelectionListener(getListener());
- hostListButton.setText(Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostList);
-
- hostListText = new Text(hostGroup, SWT.V_SCROLL | SWT.BORDER);
- gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
- gd.heightHint = 20;
- hostListText.setLayoutData(gd);
- hostListText.addModifyListener(getListener());
- }
-
- public IAttribute<?, ?, ?>[] getAttributes(IResourceManager rm,
- IPQueue queue, ILaunchConfiguration configuration, String mode)
- throws CoreException {
-
- List<IAttribute<?,?,?>> attrs = new ArrayList<IAttribute<?,?,?>>();
-
- int numProcs = configuration.getAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS);
- try {
- attrs.add(JobAttributes.getNumberOfProcessesAttributeDefinition().create(numProcs));
- } catch (IllegalValueException e) {
- throw new CoreException(new Status(IStatus.ERROR, MPICH2UIPlugin.getDefault().getBundle().getSymbolicName(), Messages.BasicMPICH2RMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration, e));
- }
-
- attrs.add(MPICH2LaunchAttributes.getLaunchArgumentsAttributeDefinition().create(MPICH2LaunchConfiguration.calculateArguments(configuration)));
-
- return attrs.toArray(new IAttribute<?,?,?>[attrs.size()]);
- }
-
- public Control getControl() {
- return control;
- }
-
- public RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy configuration,
- IResourceManager rm, IPQueue queue) {
- configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS);
- configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_NOLOCAL, MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL);
- configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_USEPREFIX, MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX);
- configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_PREFIX, MPICH2LaunchConfigurationDefaults.ATTR_PREFIX);
- configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE);
- configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE);
- configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_USEHOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST);
- configuration.setAttribute(MPICH2LaunchConfiguration.ATTR_HOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST);
- return new RMLaunchValidation(true, null);
- }
-
- @Override
- public void updateControls() {
- prefixText.setEnabled(usePrefixButton.getSelection());
- browseButton.setEnabled(hostFileButton.getSelection());
- hostFileText.setEnabled(hostFileButton.getSelection());
- hostListText.setEnabled(hostListButton.getSelection());
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java
deleted file mode 100644
index f0b325d..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfiguration.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2LaunchConfiguration {
- public static final String ATTR_BASE = MPICH2UIPlugin.PLUGIN_ID + ".launchAttributes"; //$NON-NLS-1$
- public static final String ATTR_NUMPROCS = ATTR_BASE + ".numProcs"; //$NON-NLS-1$
- public static final String ATTR_NOLOCAL = ATTR_BASE + ".noLocal"; //$NON-NLS-1$
- public static final String ATTR_PREFIX = ATTR_BASE + ".prefix"; //$NON-NLS-1$
- public static final String ATTR_USEPREFIX = ATTR_BASE + ".usePrefix"; //$NON-NLS-1$
- public static final String ATTR_HOSTFILE = ATTR_BASE + ".hostFile"; //$NON-NLS-1$
- public static final String ATTR_USEHOSTFILE = ATTR_BASE + ".useHostFile"; //$NON-NLS-1$
- public static final String ATTR_HOSTLIST = ATTR_BASE + ".hostList"; //$NON-NLS-1$
- public static final String ATTR_USEHOSTLIST = ATTR_BASE + ".useHostList"; //$NON-NLS-1$
- public static final String ATTR_ARGUMENTS = ATTR_BASE + ".arguments"; //$NON-NLS-1$
- public static final String ATTR_USEDEFAULTARGUMENTS = ATTR_BASE + ".useDefaultArguments"; //$NON-NLS-1$
- public static final String ATTR_PARAMETERS = ATTR_BASE + ".parameters"; //$NON-NLS-1$
- public static final String ATTR_USEDEFAULTPARAMETERS = ATTR_BASE + ".useDefaultParameters"; //$NON-NLS-1$
-
- static String calculateArguments(ILaunchConfiguration configuration) throws CoreException {
- if (configuration.getAttribute(ATTR_USEDEFAULTARGUMENTS, MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTARGUMENTS)) {
- String launchArgs = "-np " + Integer.toString(configuration.getAttribute(ATTR_NUMPROCS, MPICH2LaunchConfigurationDefaults.ATTR_NUMPROCS)); //$NON-NLS-1$
- if (configuration.getAttribute(ATTR_NOLOCAL, MPICH2LaunchConfigurationDefaults.ATTR_NOLOCAL)) {
- launchArgs += " -nolocal"; //$NON-NLS-1$
- }
- if (configuration.getAttribute(ATTR_USEPREFIX, MPICH2LaunchConfigurationDefaults.ATTR_USEPREFIX)) {
- launchArgs += " --prefix " + fixString(configuration.getAttribute(ATTR_PREFIX, MPICH2LaunchConfigurationDefaults.ATTR_PREFIX)); //$NON-NLS-1$
- }
- if (configuration.getAttribute(ATTR_USEHOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTFILE)) {
- launchArgs += " -hostfile " + fixString(configuration.getAttribute(ATTR_HOSTFILE, MPICH2LaunchConfigurationDefaults.ATTR_HOSTFILE)); //$NON-NLS-1$
- }
- if (configuration.getAttribute(ATTR_USEHOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_USEHOSTLIST)) {
- launchArgs += " -host " + fixString(configuration.getAttribute(ATTR_HOSTLIST, MPICH2LaunchConfigurationDefaults.ATTR_HOSTLIST)); //$NON-NLS-1$
- }
-
- if (! configuration.getAttribute(ATTR_USEDEFAULTPARAMETERS, MPICH2LaunchConfigurationDefaults.ATTR_USEDEFAULTPARAMETERS)) {
- Map<String, String> params = configuration.getAttribute(ATTR_PARAMETERS, MPICH2LaunchConfigurationDefaults.ATTR_PARAMETERS);
- for (Entry<String, String> param : params.entrySet()) {
- launchArgs += " -mca " + param.getKey() + " " + fixString(param.getValue()); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
- return launchArgs;
- } else {
- String launchArgs = configuration.getAttribute(ATTR_ARGUMENTS, MPICH2LaunchConfigurationDefaults.ATTR_ARGUMENTS);
- return launchArgs;
- }
- }
-
- /**
- * Make string suitable for passing as an argument
- *
- * @param s
- * @return
- */
- static private String fixString(String s) {
- // TODO is that right and escaped correctly?
- if (s == null) {
- return "\"\""; //$NON-NLS-1$
- }
- return "\"" + s + "\""; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java
deleted file mode 100644
index 71c12be..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2LaunchConfigurationDefaults.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.MPICH2UIPlugin;
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.osgi.framework.Bundle;
-
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2LaunchConfigurationDefaults {
- public static int ATTR_NUMPROCS;
- public static boolean ATTR_NOLOCAL;
- public static String ATTR_PREFIX;
- public static boolean ATTR_USEPREFIX;
- public static String ATTR_HOSTFILE;
- public static boolean ATTR_USEHOSTFILE;
- public static String ATTR_HOSTLIST;
- public static boolean ATTR_USEHOSTLIST;
- public static String ATTR_ARGUMENTS;
- public static boolean ATTR_USEDEFAULTARGUMENTS;
- public static HashMap<String, String> ATTR_PARAMETERS = new HashMap<String, String>();
- public static boolean ATTR_USEDEFAULTPARAMETERS;
-
- private static String defaultsResourcePath = "/data/launch-defaults.properties"; //$NON-NLS-1$
-
- public static void loadDefaults() throws CoreException {
- Path defaultsPropertiesPath = new Path(defaultsResourcePath);
- Bundle bundle = MPICH2UIPlugin.getDefault().getBundle();
- Properties properties = read(defaultsPropertiesPath, bundle);
-
- ATTR_NUMPROCS = getInteger(bundle, properties, "NUMPROCS"); //$NON-NLS-1$
- ATTR_NOLOCAL = getBoolean(bundle, properties, "NOLOCAL"); //$NON-NLS-1$
- ATTR_PREFIX = getString(bundle, properties, "PREFIX"); //$NON-NLS-1$
- ATTR_USEPREFIX = getBoolean(bundle, properties, "USEPREFIX"); //$NON-NLS-1$
- ATTR_HOSTFILE = getString(bundle, properties, "HOSTFILE"); //$NON-NLS-1$
- ATTR_USEHOSTFILE = getBoolean(bundle, properties, "USEHOSTFILE"); //$NON-NLS-1$
- ATTR_ARGUMENTS = getString(bundle, properties, "ARGUMENTS"); //$NON-NLS-1$
- ATTR_USEDEFAULTARGUMENTS = getBoolean(bundle, properties, "USEDEFAULTARGUMENTS"); //$NON-NLS-1$
- ATTR_USEDEFAULTPARAMETERS = getBoolean(bundle, properties, "USEDEFAULTPARAMETERS"); //$NON-NLS-1$
-
- assert ATTR_PREFIX != null;
- assert ATTR_HOSTFILE != null;
- assert ATTR_ARGUMENTS != null;
- // TODO: read ATTR_PARAMETERS
- }
-
- public static Properties read(Path defaultsPropertiesPath, Bundle bundle)
- throws CoreException {
- InputStream inStream;
- Properties properties = new Properties();
- try {
- inStream = FileLocator.openStream(bundle, defaultsPropertiesPath, false);
- properties.load(inStream);
- } catch (IOException e) {
- throw MPICH2UIPlugin.coreErrorException(Messages.MPICH2LaunchConfigurationDefaults_Exception_FailedReadFile, e);
- }
- return properties;
- }
-
- public static String getString(Bundle bundle, Properties properties, String key) throws CoreException {
- String value = properties.getProperty(key);
- if (value == null) {
- throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2LaunchConfigurationDefaults_MissingValue, key)));
- }
- return value;
- }
-
- public static int getInteger(Bundle bundle, Properties properties, String key) throws CoreException {
- String value = getString(bundle, properties, key);
- try {
- return Integer.parseInt(value);
- } catch (NumberFormatException e) {
- throw new CoreException(new Status(IStatus.ERROR, bundle.getSymbolicName(), NLS.bind(Messages.MPICH2LaunchConfigurationDefaults_FailedParseInteger, key)));
- }
- }
-
- public static boolean getBoolean(Bundle bundle, Properties properties, String key) throws CoreException {
- String value = getString(bundle, properties, key);
- return Boolean.parseBoolean(value);
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java
deleted file mode 100644
index 13bab6a..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/MPICH2RMLaunchConfigurationFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManager;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2RMLaunchConfigurationFactory extends AbstractRMLaunchConfigurationFactory {
-
- @Override
- protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm) throws CoreException {
- return new NewMPICH2RMLaunchConfigurationDynamicTab(rm);
- }
-
- @Override
- public Class<? extends IResourceManager> getResourceManagerClass() {
- return MPICH2ResourceManager.class;
- }
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 0aa4bde..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/launch/NewMPICH2RMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.launch;
-
-
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.rm.ui.launch.ExtendableRMLaunchConfigurationDynamicTab;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class NewMPICH2RMLaunchConfigurationDynamicTab extends ExtendableRMLaunchConfigurationDynamicTab {
-
- public NewMPICH2RMLaunchConfigurationDynamicTab(IResourceManager rm) {
- super();
- addDynamicTab(new BasicMPICH2RMLaunchConfigurationDynamicTab());
- addDynamicTab(new AdvancedMPICH2RMLaunchConfigurationDynamicTab());
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java
deleted file mode 100644
index 35c8a55..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/Messages.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.mpi.mpich2.ui.messages.messages"; //$NON-NLS-1$
- public static String MPICH2UIPlugin_Exception_InternalError;
-
- public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_Arguments;
- public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultArguments;
- public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultMCAParameters;
- public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_LaunchArguments;
- public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_MCAParameters;
- public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_PArameterTable_Column_Name;
- public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_ParameterTable_Column_Value;
- public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Title;
- public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyArguments;
- public static String AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyParameter;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Browse;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_BySlot;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_HostFile;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoLocal;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoOversubscribe;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NumberProcesses;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Prefix;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostGroup;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostList;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Title_OptionsGroup;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostfile;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostList;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyPrefix;
- public static String BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_NoProcess;
- public static String MPICH2LaunchConfigurationDefaults_Exception_FailedReadFile;
- public static String MPICH2LaunchConfigurationDefaults_FailedParseInteger;
- public static String MPICH2LaunchConfigurationDefaults_MissingValue;
-
- public static String MPICH2PreferencePage_Title;
-
- public static String MPICH2ConfigurationWizardPage_Description;
- public static String MPICH2ConfigurationWizardPage_Label_Version;
- public static String MPICH2ConfigurationWizardPage_Name;
- public static String MPICH2ConfigurationWizardPage_Title;
- public static String MPICH2ConfigurationWizardPage_Validation_NoVersionSelected;
- public static String MPICH2ConfigurationWizardPage_VersionCombo_Version12;
- public static String MPICH2ConfigurationWizardPage_VersionCombo_Version13;
- public static String MPICH2RMConfigurationWizardPage_Description;
- public static String MPICH2RMConfigurationWizardPage_Title;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // Prevent instances.
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties
deleted file mode 100644
index 7867ffa..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/messages/messages.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-MPICH2UIPlugin_Exception_InternalError=Internal error
-
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_Arguments=Arguments:
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultArguments=Use default arguments
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_DefaultMCAParameters=Use default parameters
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_LaunchArguments=Launch arguments
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Label_MCAParameters=MCA Parameters
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_PArameterTable_Column_Name=Name
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_ParameterTable_Column_Value=Value
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Title=Advanced MPICH2
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyArguments=Arguments cannot be empty
-AdvancedMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyParameter=Parameter value cannot be empty
-BasicMPICH2RMLaunchConfigurationDynamicTab_Exception_InvalidConfiguration=Invalid configuration
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Browse=Browse
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_BySlot=By slot
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_HostFile=Host file:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoLocal=No local
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NoOversubscribe=No oversubscribe
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_NumberProcesses=Number of processes:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Label_Prefix=Prefix:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title=Basic MPICH2
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostGroup=Hosts
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title_HostList=Host list:
-BasicMPICH2RMLaunchConfigurationDynamicTab_Title_OptionsGroup=Options
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostfile=Must provide a host file
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyHostList=Must provide at least one host name
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_EmptyPrefix=Prefix cannot be empty
-BasicMPICH2RMLaunchConfigurationDynamicTab_Validation_NoProcess=Must specify at least one process
-MPICH2LaunchConfigurationDefaults_Exception_FailedReadFile=Failed to read properties file with default preferences.
-MPICH2LaunchConfigurationDefaults_FailedParseInteger=Failed to parse integer default value for {0}
-MPICH2LaunchConfigurationDefaults_MissingValue=Missing default value for {0}
-
-MPICH2PreferencePage_Title=MPICH2 preferences
-
-MPICH2ConfigurationWizardPage_Description=Enter information to configure the MPICH2 tool
-MPICH2ConfigurationWizardPage_Label_Version=MPICH2 version:
-MPICH2ConfigurationWizardPage_Name=MPICH2
-MPICH2ConfigurationWizardPage_Title=MPICH2 tool configuration
-MPICH2ConfigurationWizardPage_Validation_NoVersionSelected=No MPICH2 version selected
-MPICH2ConfigurationWizardPage_VersionCombo_Version12=MPICH2
-MPICH2ConfigurationWizardPage_VersionCombo_Version13=MPICH2
-MPICH2RMConfigurationWizardPage_Description=Enter MPICH2 connection information
-MPICH2RMConfigurationWizardPage_Title=MPICH2 connection configuration
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2ConfigurationWizardPage.java
deleted file mode 100644
index aed5602..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.MPICH2ResourceManagerConfiguration;
-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.RMConfigurationWizard;
-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 MPICH2ResourceManagerConfiguration 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 = (MPICH2ResourceManagerConfiguration) configuration;
- super.setConfig(configuration);
- }
- }
-
- @Override
- protected WizardPageWidgetListener createListener() {
- return new WidgetListener();
- }
-
- @Override
- protected WizardPageDataSource createDataSource() {
- return new DataSource(this);
- }
-
- public MPICH2ConfigurationWizardPage(RMConfigurationWizard wizard) {
- super(wizard, MPICH2ResourceManagerConfiguration.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 ee6b30b..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPage.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.wizards;
-
-import org.eclipse.ptp.rm.mpi.mpich2.ui.messages.Messages;
-import org.eclipse.ptp.rm.remote.ui.wizards.AbstractRemoteResourceManagerConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public final class MPICH2RMConfigurationWizardPage extends AbstractRemoteResourceManagerConfigurationWizardPage {
-
- public MPICH2RMConfigurationWizardPage(RMConfigurationWizard wizard) {
- super(wizard, Messages.MPICH2RMConfigurationWizardPage_Title);
- setTitle(Messages.MPICH2RMConfigurationWizardPage_Title);
- setDescription(Messages.MPICH2RMConfigurationWizardPage_Description);
- }
-
-}
diff --git a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java
deleted file mode 100644
index 7fe3a97..0000000
--- a/rms/org.eclipse.ptp.rm.mpi.mpich2.ui/src/org/eclipse/ptp/rm/mpi/mpich2/ui/wizards/MPICH2RMConfigurationWizardPageFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.mpi.mpich2.ui.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.ptp.rm.mpi.mpich2.core.rmsystem.MPICH2ResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerFactory;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-
-
-/**
- *
- * @author Daniel Felix Ferber
- *
- */
-public class MPICH2RMConfigurationWizardPageFactory extends RMConfigurationWizardPageFactory {
-
- public MPICH2RMConfigurationWizardPageFactory() {
- // no-op
- }
-
- protected RMConfigurationWizardPage[] getMPICH2ConfigurationWizardPages(RMConfigurationWizard wizard) {
- return new RMConfigurationWizardPage[] {
- new MPICH2ConfigurationWizardPage(wizard)
- };
- }
-
- // @Override
- @Override
- public RMConfigurationWizardPage[] getPages(RMConfigurationWizard wizard) {
- List<RMConfigurationWizardPage> list = new ArrayList<RMConfigurationWizardPage>();
- list.add(new MPICH2RMConfigurationWizardPage(wizard));
- list.addAll(Arrays.asList(getMPICH2ConfigurationWizardPages(wizard)));
- return list.toArray(new RMConfigurationWizardPage[list.size()]);
- }
-
- // @Override
- @Override
- public Class<? extends IResourceManagerFactory> getRMFactoryClass() {
- return MPICH2ResourceManagerFactory.class;
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/.classpath b/rms/org.eclipse.ptp.rm.slurm.core/.classpath
deleted file mode 100644
index 0215967..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/.project b/rms/org.eclipse.ptp.rm.slurm.core/.project
deleted file mode 100644
index 9161cc5..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ptp.rm.slurm.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.slurm.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 0ed2620..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.slurm.core;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.slurm.core.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.search,
- org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.ptp.proxy.protocol,
- org.eclipse.ptp.core,
- org.eclipse.ptp.rm.remote,
- org.eclipse.ptp.remote.core;bundle-version="2.1.0"
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.slurm.core,
- org.eclipse.ptp.rm.slurm.core.rmsystem
-Import-Package: org.eclipse.ptp.remote.core
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/about.html b/rms/org.eclipse.ptp.rm.slurm.core/about.html
deleted file mode 100644
index 3106f3a..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>Apri 14, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/build.properties b/rms/org.eclipse.ptp.rm.slurm.core/build.properties
deleted file mode 100644
index 6f20375..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/plugin.properties b/rms/org.eclipse.ptp.rm.slurm.core/plugin.properties
deleted file mode 100644
index 616d7d0..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP SLURM Core
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/plugin.xml b/rms/org.eclipse.ptp.rm.slurm.core/plugin.xml
deleted file mode 100644
index fdd79e3..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension
- point="org.eclipse.ptp.core.resourceManagers">
- <resourceManager
- class="org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManagerFactory"
- id="org.eclipse.ptp.slurm.core.resourcemanager"
- name="SLURM"/>
- </extension>
-
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/Activator.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/Activator.java
deleted file mode 100644
index 42fff23..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.ptp.rm.slurm.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.ptp.rm.slurm.core";
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMAttributes.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMAttributes.java
deleted file mode 100644
index 371c902..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMAttributes.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.eclipse.ptp.rm.slurm.core;
-
-public class SLURMAttributes {
-
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMJobAttributes.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMJobAttributes.java
deleted file mode 100644
index cb5306e..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMJobAttributes.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.core;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.rm.slurm.core.messages.Messages;
-
-
-/**
- * Job attributes
- */
-public class SLURMJobAttributes {
- private static final String NUM_NODES_ATTR_ID = "numberOfNodes"; //$NON-NLS-1$
- private static final String TIME_LIMIT_ATTR_ID = "timeLimit"; //$NON-NLS-1$
-
- private final static IntegerAttributeDefinition numNodesAttrDef =
- new IntegerAttributeDefinition(NUM_NODES_ATTR_ID, "Nodes", //$NON-NLS-1$
- Messages.SLURMJobAttributes_0, true, 1);
-
- private final static IntegerAttributeDefinition timeLimitAttrDef =
- new IntegerAttributeDefinition(TIME_LIMIT_ATTR_ID, "TimeLimit", //$NON-NLS-1$
- Messages.SLURMJobAttributes_1, true, 1);
-
- public static IAttributeDefinition<?,?,?>[] getDefaultAttributeDefinitions() {
- return new IAttributeDefinition[]{
- numNodesAttrDef,
- timeLimitAttrDef,
- };
- }
-
- public static IntegerAttributeDefinition getNumberOfNodesAttributeDefinition() {
- return numNodesAttrDef;
- }
-
- public static IntegerAttributeDefinition getTimeLimitAttributeDefinition() {
- return timeLimitAttrDef;
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMPreferenceManager.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMPreferenceManager.java
deleted file mode 100644
index 1ee1c40..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/SLURMPreferenceManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.core;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.remote.core.IRemoteProxyOptions;
-import org.eclipse.ptp.rm.remote.ui.preferences.PreferenceConstants;
-
-public class SLURMPreferenceManager {
- //private static final String PROXY_EXECUTABLE_NAME = "ptp_slurm_proxy.py";
- private static final String PROXY_EXECUTABLE_PATH = null; // use local fragment directory
- private static final int OPTIONS = IRemoteProxyOptions.PORT_FORWARDING;
-
- public static int getDefaultOptions() {
- return OPTIONS;
- }
-
- public static String getDefaultProxyExecutablePath() {
- return PROXY_EXECUTABLE_PATH;
- }
-
- public static Preferences getPreferences() {
- return Activator.getDefault().getPluginPreferences();
- }
-
- public static void savePreferences() {
- Activator.getDefault().savePluginPreferences();
- }
-
- public static void initializePreferences() {
- Preferences preferences = Activator.getDefault().getPluginPreferences();
-
- String server = "";
-
- if (PROXY_EXECUTABLE_PATH != null) {
- //server = new Path(PROXY_EXECUTABLE_PATH).append(PROXY_EXECUTABLE_NAME).toOSString();
- } else {
- //server = PTPCorePlugin.getDefault().locateFragmentFile("org.eclipse.ptp", PROXY_EXECUTABLE_NAME);
- if (server == null) {
- server = "";
- }
- }
-
- preferences.setDefault(PreferenceConstants.PROXY_PATH, server);
- preferences.setDefault(PreferenceConstants.OPTIONS, OPTIONS);
- }
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/Messages.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/Messages.java
deleted file mode 100644
index fe689b5..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.slurm.core.messages.messages"; //$NON-NLS-1$
-
- public static String SLURMJobAttributes_0;
- public static String SLURMJobAttributes_1;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // Prevent instances.
- }
-}
-
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/messages.properties b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/messages.properties
deleted file mode 100644
index 41e8690..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/messages/messages.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-SLURMJobAttributes_0=Number of Nodes
-SLURMJobAttributes_1=Job Time Limit
-
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManager.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManager.java
deleted file mode 100644
index 3758af6..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManager.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.core.rmsystem;
-
-import java.util.Collection;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elementcontrols.IPJobControl;
-import org.eclipse.ptp.core.elementcontrols.IPMachineControl;
-import org.eclipse.ptp.core.elementcontrols.IPNodeControl;
-import org.eclipse.ptp.core.elementcontrols.IPProcessControl;
-import org.eclipse.ptp.core.elementcontrols.IPQueueControl;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.rm.slurm.core.rtsystem.SLURMProxyRuntimeClient;
-import org.eclipse.ptp.rm.slurm.core.rtsystem.SLURMRuntimeSystem;
-import org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-
-public class SLURMResourceManager extends AbstractRuntimeResourceManager {
-
- private Integer SLURMRMID;
-
- public SLURMResourceManager(Integer id, IPUniverseControl universe, IResourceManagerConfiguration config) {
- super(id.toString(), universe, config);
- SLURMRMID = id;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doAfterCloseConnection()
- */
- protected void doAfterCloseConnection() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doAfterOpenConnection()
- */
- protected void doAfterOpenConnection() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doBeforeCloseConnection()
- */
- protected void doBeforeCloseConnection() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractProxyResourceManager#doBeforeOpenConnection()
- */
- protected void doBeforeOpenConnection() {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateJob(org.eclipse.ptp.core.elementcontrols.IPQueueControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
- */
- @Override
- protected IPJobControl doCreateJob(IPQueueControl queue, String jobId, AttributeManager attrs) {
- return newJob(queue, jobId, attrs);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateMachine(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
- */
- @Override
- protected IPMachineControl doCreateMachine(String machineId, AttributeManager attrs) {
- return newMachine(machineId, attrs);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateNode(org.eclipse.ptp.core.elementcontrols.IPMachineControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
- */
- @Override
- protected IPNodeControl doCreateNode(IPMachineControl machine, String nodeId, AttributeManager attrs) {
- return newNode(machine, nodeId, attrs);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateProcess(org.eclipse.ptp.core.elementcontrols.IPJobControl, java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
- */
- @Override
- protected IPProcessControl doCreateProcess(IPJobControl job, String processId, AttributeManager attrs) {
- return newProcess(job, processId, attrs);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateQueue(java.lang.String, org.eclipse.ptp.core.attributes.AttributeManager)
- */
- @Override
- protected IPQueueControl doCreateQueue(String queueId, AttributeManager attrs) {
- return newQueue(queueId, attrs);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doCreateRuntimeSystem()
- */
- @Override
- protected IRuntimeSystem doCreateRuntimeSystem() {
- SLURMResourceManagerConfiguration config = (SLURMResourceManagerConfiguration) getConfiguration();
- /* load up the control and monitoring systems for OMPI */
- SLURMProxyRuntimeClient runtimeProxy = new SLURMProxyRuntimeClient(config, SLURMRMID);
- return new SLURMRuntimeSystem(runtimeProxy, getAttributeDefinitionManager());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateJobs(org.eclipse.ptp.core.elements.IPQueue, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
- */
- @Override
- protected boolean doUpdateJobs(IPQueueControl queue, Collection<IPJobControl> jobs,
- AttributeManager attrs) {
- return updateJobs(queue, jobs, attrs);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateMachines(java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
- */
- @Override
- protected boolean doUpdateMachines(Collection<IPMachineControl> machines,
- AttributeManager attrs) {
- return updateMachines(machines, attrs);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateNodes(org.eclipse.ptp.core.elementcontrols.IPMachineControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
- */
- @Override
- protected boolean doUpdateNodes(IPMachineControl machine,
- Collection<IPNodeControl> nodes, AttributeManager attrs) {
- return updateNodes(machine, nodes, attrs);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateProcesses(org.eclipse.ptp.core.elementcontrols.IPJobControl, java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
- */
- @Override
- protected boolean doUpdateProcesses(IPJobControl job,
- Collection<IPProcessControl> processes, AttributeManager attrs) {
- return updateProcesses(job, processes, attrs);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractRuntimeResourceManager#doUpdateQueues(java.util.Collection, org.eclipse.ptp.core.attributes.AttributeManager)
- */
- @Override
- protected boolean doUpdateQueues(Collection<IPQueueControl> queues,
- AttributeManager attrs) {
- return updateQueues(queues, attrs);
- }
-
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerConfiguration.java
deleted file mode 100644
index 03b3b31..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerConfiguration.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-/**
- *
- */
-package org.eclipse.ptp.rm.slurm.core.rmsystem;
-
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-final public class SLURMResourceManagerConfiguration extends
- AbstractRemoteResourceManagerConfiguration implements Cloneable {
- public static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
- private static final String TAG_SLURMD_PATH = "slurmdPath"; //$NON-NLS-1$
- private static final String TAG_SLURMD_ARGS = "slurmdArgs"; //$NON-NLS-1$
- private static final String TAG_SLURMD_DEFAULTS = "slurmdDefaults"; //$NON-NLS-1$
-
- /**
- * @param factory
- * @param memento
- * @return
- */
- public static IResourceManagerConfiguration load(
- SLURMResourceManagerFactory factory, IMemento memento) {
-
- RemoteConfig remoteConfig = loadRemote(factory, memento);
-
- String slurmdPath = memento.getString(TAG_SLURMD_PATH);
- String slurmdArgs = memento.getString(TAG_SLURMD_ARGS);
- boolean useDefaults = Boolean.parseBoolean(memento
- .getString(TAG_SLURMD_DEFAULTS));
-
- SLURMResourceManagerConfiguration config = new SLURMResourceManagerConfiguration(
- factory, remoteConfig, slurmdPath, slurmdArgs, useDefaults);
-
- return config;
- }
-
- private String slurmdPath;
- private String slurmdArgs;
- private boolean useDefaults;
-
- public SLURMResourceManagerConfiguration(SLURMResourceManagerFactory factory) {
- this(factory, new RemoteConfig(), EMPTY_STRING, EMPTY_STRING, true);
- }
-
- public SLURMResourceManagerConfiguration(SLURMResourceManagerFactory factory,
- RemoteConfig config, String slurmdPath, String slurmdArgs,
- boolean useDefaults) {
- super(config, factory);
- setSlurmdPath(slurmdPath);
- setSlurmdArgs(slurmdArgs);
- setUseDefaults(useDefaults);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#clone()
- */
- @Override
- public Object clone() {
- CommonConfig commonConf = new CommonConfig(getName(),
- getDescription(), getUniqueName(),
- getRemoteServicesId(), getConnectionName());
- RemoteConfig remoteConf = new RemoteConfig(commonConf,
- getProxyServerPath(), getLocalAddress(),
- getInvocationOptionsStr(), getOptions());
- return new SLURMResourceManagerConfiguration(
- (SLURMResourceManagerFactory) getFactory(), remoteConf,
- getSlurmdPath(), getSlurmdArgs(), useDefaults());
- }
-
- /**
- * @return the slurmdArgs
- */
- public String getSlurmdArgs() {
- return slurmdArgs;
- }
-
- /**
- * @return the slurmdPath
- */
- public String getSlurmdPath() {
- return slurmdPath;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rm.remote.core.AbstractRemoteResourceManagerConfiguration#save(org.eclipse.ui.IMemento)
- */
- public void save(IMemento memento) {
- super.save(memento);
- memento.putString(TAG_SLURMD_PATH, slurmdPath);
- memento.putString(TAG_SLURMD_ARGS, slurmdArgs);
- memento.putString(TAG_SLURMD_DEFAULTS, Boolean.toString(useDefaults));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#setDefaultNameAndDesc()
- */
- public void setDefaultNameAndDesc() {
- String name = "SLURM"; //$NON-NLS-1$
- String conn = getConnectionName();
- if (conn != null && !conn.equals(EMPTY_STRING)) {
- name += "@" + conn; //$NON-NLS-1$
- }
- setName(name);
- setDescription("SLURM Resource Manager"); //$NON-NLS-1$
- }
-
- /**
- * @param slurmdArguments
- * the slurmdArgs to set
- */
- public void setSlurmdArgs(String slurmdArgs) {
- this.slurmdArgs = slurmdArgs;
- }
-
- /**
- * @param slurmdPath
- * the slurmdPath to set
- */
- public void setSlurmdPath(String slurmdPath) {
- this.slurmdPath = slurmdPath;
- }
-
- /**
- * @param useDefaults
- * the useDefaults to set
- */
- public void setUseDefaults(boolean useDefaults) {
- this.useDefaults = useDefaults;
- }
-
- /**
- * @return the useDefaults
- */
- public boolean useDefaults() {
- return useDefaults;
- }
-
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerFactory.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerFactory.java
deleted file mode 100644
index b489c97..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rmsystem/SLURMResourceManagerFactory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.core.rmsystem;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.core.elementcontrols.IPUniverseControl;
-import org.eclipse.ptp.core.elementcontrols.IResourceManagerControl;
-import org.eclipse.ptp.rm.remote.ui.preferences.PreferenceConstants;
-import org.eclipse.ptp.rm.slurm.core.SLURMPreferenceManager;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ui.IMemento;
-
-public class SLURMResourceManagerFactory extends AbstractResourceManagerFactory {
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#copyConfiguration(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)
- */
- public IResourceManagerConfiguration copyConfiguration(
- IResourceManagerConfiguration configuration) {
- return (IResourceManagerConfiguration)configuration.clone();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#create(org.eclipse.ptp.rmsystem.IResourceManagerConfiguration)
- */
- public IResourceManagerControl create(IResourceManagerConfiguration confIn) {
- SLURMResourceManagerConfiguration configuration = (SLURMResourceManagerConfiguration) confIn;
- final PTPCorePlugin plugin = PTPCorePlugin.getDefault();
- final IPUniverseControl universe = (IPUniverseControl) plugin.getUniverse();
- return new SLURMResourceManager(universe.getNextResourceManagerId(), universe, configuration);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#createConfiguration()
- */
- public IResourceManagerConfiguration createConfiguration() {
- SLURMResourceManagerConfiguration conf = new SLURMResourceManagerConfiguration(this);
-
- Preferences preferences = SLURMPreferenceManager.getPreferences();
-
- conf.setProxyServerPath(preferences.getString(PreferenceConstants.PROXY_PATH));
- conf.setOptions(preferences.getInt(PreferenceConstants.OPTIONS));
-
- return conf;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.rmsystem.IResourceManagerFactory#loadConfiguration(org.eclipse.ui.IMemento)
- */
- public IResourceManagerConfiguration loadConfiguration(IMemento memento) {
- return SLURMResourceManagerConfiguration.load(this, memento);
- }
-
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyCommandFactory.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyCommandFactory.java
deleted file mode 100644
index 9728335..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyCommandFactory.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.slurm.core.rtsystem;
-
-import org.eclipse.ptp.proxy.command.IProxyCommand;
-import org.eclipse.ptp.proxy.packet.ProxyPacket;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeInitCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeModelDefCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeStartEventsCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeStopEventsCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeSubmitJobCommand;
-import org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeTerminateJobCommand;
-import org.eclipse.ptp.proxy.runtime.command.ProxyRuntimeCommandFactory;
-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManagerConfiguration;
-
-public class SLURMProxyCommandFactory implements IProxyRuntimeCommandFactory {
- public final static String SLURMD_PATH_ATTR = "slurmdPath";
- public final static String SLURMD_ARGS_ATTR = "slurmdArgs";
-
- private IProxyRuntimeCommandFactory factory;
- private SLURMResourceManagerConfiguration config;
-
- public SLURMProxyCommandFactory(SLURMResourceManagerConfiguration config) {
- this.factory = new ProxyRuntimeCommandFactory();
- this.config = config;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeInitCommand(int)
- */
- public IProxyRuntimeInitCommand newProxyRuntimeInitCommand(int baseId) {
- IProxyRuntimeInitCommand cmd = factory.newProxyRuntimeInitCommand(baseId);
- if (!config.useDefaults()) {
- if (!config.getSlurmdPath().equals("")) {
- cmd.addArgument(SLURMD_PATH_ATTR + "=" + config.getSlurmdPath());
- }
- if (!config.getSlurmdArgs().equals("")) {
- for (String arg : config.getSlurmdArgs().split(" ")) {
- cmd.addArgument(SLURMD_ARGS_ATTR + "=" + arg);
- }
- }
- }
- return cmd;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeModelDefCommand()
- */
- public IProxyRuntimeModelDefCommand newProxyRuntimeModelDefCommand() {
- return factory.newProxyRuntimeModelDefCommand();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeStartEventsCommand()
- */
- public IProxyRuntimeStartEventsCommand newProxyRuntimeStartEventsCommand() {
- return factory.newProxyRuntimeStartEventsCommand();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeStopEventsCommand()
- */
- public IProxyRuntimeStopEventsCommand newProxyRuntimeStopEventsCommand() {
- return factory.newProxyRuntimeStopEventsCommand();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeSubmitJobCommand(java.lang.String[])
- */
- public IProxyRuntimeSubmitJobCommand newProxyRuntimeSubmitJobCommand(
- String[] args) {
- return factory.newProxyRuntimeSubmitJobCommand(args);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.proxy.runtime.command.IProxyRuntimeCommandFactory#newProxyRuntimeTerminateJobCommand(java.lang.String)
- */
- public IProxyRuntimeTerminateJobCommand newProxyRuntimeTerminateJobCommand(
- String jobId) {
- return factory.newProxyRuntimeTerminateJobCommand(jobId);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.proxy.command.ProxyCommandFactory#toCommand(org.eclipse.ptp.proxy.packet.ProxyPacket)
- */
- public IProxyCommand toCommand(ProxyPacket packet) {
- return factory.toCommand(packet);
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyRuntimeClient.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyRuntimeClient.java
deleted file mode 100644
index 8e98393..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMProxyRuntimeClient.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.slurm.core.rtsystem;
-
-import org.eclipse.ptp.proxy.runtime.event.ProxyRuntimeEventFactory;
-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManagerConfiguration;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteProxyRuntimeClient;
-
-public class SLURMProxyRuntimeClient extends AbstractRemoteProxyRuntimeClient {
- public SLURMProxyRuntimeClient(SLURMResourceManagerConfiguration config,
- int baseModelId) {
- super(config, baseModelId, new SLURMProxyCommandFactory(config), new ProxyRuntimeEventFactory());
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMRuntimeSystem.java b/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMRuntimeSystem.java
deleted file mode 100644
index 72d552b..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.core/src/org/eclipse/ptp/rm/slurm/core/rtsystem/SLURMRuntimeSystem.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.slurm.core.rtsystem;
-
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.rm.remote.core.AbstractRemoteProxyRuntimeSystem;
-
-public class SLURMRuntimeSystem extends AbstractRemoteProxyRuntimeSystem {
- public SLURMRuntimeSystem(SLURMProxyRuntimeClient proxy, AttributeDefinitionManager manager) {
- super(proxy, manager);
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/.cproject b/rms/org.eclipse.ptp.rm.slurm.proxy/.cproject
deleted file mode 100644
index 841b658..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/.cproject
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="0.1451097999">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1451097999" moduleId="org.eclipse.cdt.core.settings" name="Default">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactName="org.eclipse.ptp.rm.slurm.proxy" buildProperties="" description="" id="0.1451097999" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-<folderInfo id="0.1451097999." name="/" resourcePath="">
-<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1939665555" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
-<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1939665555.1415213314" name=""/>
-<builder id="org.eclipse.cdt.build.core.settings.default.builder.379503967" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1835313480" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
-<tool id="org.eclipse.cdt.build.core.settings.holder.354226561" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.909176780" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-<tool id="org.eclipse.cdt.build.core.settings.holder.419413029" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1301739134" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-<tool id="org.eclipse.cdt.build.core.settings.holder.1246471449" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2135229327" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-</toolChain>
-</folderInfo>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="0.1451097999">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-</cconfiguration>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<project id="org.eclipse.ptp.rm.slurm.proxy.null.1647747885" name="org.eclipse.ptp.rm.slurm.proxy"/>
-</storageModule>
-</cproject>
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/.project b/rms/org.eclipse.ptp.rm.slurm.proxy/.project
deleted file mode 100644
index 4a8d843..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/.project
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ptp.rm.slurm.proxy</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
- <triggers>clean,full,incremental,</triggers>
- <arguments>
- <dictionary>
- <key>?name?</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.append_environment</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.autoBuildTarget</key>
- <value>all</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildArguments</key>
- <value></value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.buildCommand</key>
- <value>make</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
- <value>clean</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.contents</key>
- <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
- <value>false</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.enableFullBuild</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.fullBuildTarget</key>
- <value>all</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.stopOnError</key>
- <value>true</value>
- </dictionary>
- <dictionary>
- <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
- <value>true</value>
- </dictionary>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.cdt.core.cnature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
- <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
- </natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/AUTHORS b/rms/org.eclipse.ptp.rm.slurm.proxy/AUTHORS
deleted file mode 100644
index 20edfa2..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Jie Jiang <jiangjie@nudt.edu.cn>
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/COPYING b/rms/org.eclipse.ptp.rm.slurm.proxy/COPYING
deleted file mode 100644
index d75058f..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/COPYING
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2009 School of Computer, National University of Defense Technology, P.R.China
-
-This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/ChangeLog b/rms/org.eclipse.ptp.rm.slurm.proxy/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/ChangeLog
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/INSTALL b/rms/org.eclipse.ptp.rm.slurm.proxy/INSTALL
deleted file mode 100644
index 5c0c42f..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-See README for build/install instructions.
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/MANIFEST.MF
deleted file mode 100644
index a6b5ca7..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,82 +0,0 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.eclipse.ptp.rm.orte.proxy
-Bundle-ManifestVersion: 2
-Created-By: 1.5.0_13-119 (Apple Inc.)
-Bundle-Name: PTP Proxy Server for OpenRTE
-Bundle-Version: 2.0.1.200806061515
-Bundle-Vendor: Eclipse.org
-Ant-Version: Apache Ant 1.7.0
-Require-Bundle: org.eclipse.ptp.utils,org.eclipse.ptp.proxy
-
-Name: configure.in
-SHA1-Digest: 6zEb7glkC+8rdwwrxA5KDFUOgyI=
-
-Name: Makefile.am
-SHA1-Digest: ROHYubgHwBYTVPIXTNhu4R112l8=
-
-Name: configure
-SHA1-Digest: axCeP1TlINK+7wS5lHX200RIWKg=
-
-Name: ChangeLog
-SHA1-Digest: 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
-
-Name: INSTALL
-SHA1-Digest: us0e070Tu4gXn+nqwifiLOGpbIQ=
-
-Name: about.html
-SHA1-Digest: 67tR7zDg5zZTSqky1HavSrc+IY0=
-
-Name: compile
-SHA1-Digest: 9yZtrtrcGkvhbkbyVJuEtwzwJ9c=
-
-Name: Makefile.in
-SHA1-Digest: xOv2Z+6eN2eQTmlWKogufdkLoik=
-
-Name: COPYING
-SHA1-Digest: qPg+VsliTTBu9Pj5lQzGOyNN61I=
-
-Name: src/ptp_orte_proxy.c
-SHA1-Digest: c26YXCKmymkiudiF8g677Jpm4mI=
-
-Name: ltmain.sh
-SHA1-Digest: FRbVIWsy7X3WW6bmSc1YZX7kirk=
-
-Name: depcomp
-SHA1-Digest: XXQlqcCKZsMXfx4xKG+kCYb/yZY=
-
-Name: AUTHORS
-SHA1-Digest: 5URHvgOFMFtLeqPgwqFoqAEiji0=
-
-Name: NEWS
-SHA1-Digest: 2jmj7l5rSw0yVb/vlWAYkK/YBwk=
-
-Name: missing
-SHA1-Digest: hOFJWuvhBLpo8SS8NgbLShtfbHo=
-
-Name: src/orte_fixup.h
-SHA1-Digest: zjf2tOPZEPOaHNn5FWP+3pYNVlo=
-
-Name: aclocal.m4
-SHA1-Digest: /36j4eu2Q/+iMyClhj8QEkWHqH0=
-
-Name: install-sh
-SHA1-Digest: Kxgl4URD8xmAqKOoBx2z1gjiTE0=
-
-Name: README
-SHA1-Digest: 3HNCziIFDG8857WcSM9Y0Ym8nAE=
-
-Name: config.h.in
-SHA1-Digest: Zg9MFip6DD9nkN+Smu3eGkqewtM=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: 09gN05tobgS/MdtqyTNQhOhB73M=
-
-Name: config.sub
-SHA1-Digest: bixvOgJrShjcVTjgjLpjrXMJLO0=
-
-Name: config.status
-SHA1-Digest: nYUJgdxawZbAUT8Pnn53lAqFX2U=
-
-Name: config.guess
-SHA1-Digest: sWCO1DGIHZsAcAV22m+35qKOdgU=
-
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/eclipse.inf b/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/eclipse.inf
deleted file mode 100644
index 92ffed2..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/META-INF/eclipse.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-#Processed using Jarprocessor
-pack200.conditioned = true
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/Makefile.am b/rms/org.eclipse.ptp.rm.slurm.proxy/Makefile.am
deleted file mode 100644
index a0e47a5..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-
-bin_PROGRAMS = ptp_slurm_proxy
-
-ptp_slurm_proxy_SOURCES = src/ptp_slurm_proxy.c src/srun_opt.h
-ptp_slurm_proxy_CFLAGS = $(AM_CFLAGS)
-ptp_slurm_proxy_CPPFLAS = -I$(SLURMDIR)/include
-ptp_slurm_proxy_LDFLAGS = -L$(SLURMDIR)/lib
-ptp_slurm_proxy_LDADD = -lslurm -lpthread
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/NEWS b/rms/org.eclipse.ptp.rm.slurm.proxy/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/NEWS
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/README b/rms/org.eclipse.ptp.rm.slurm.proxy/README
deleted file mode 100644
index bce9c30..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/README
+++ /dev/null
@@ -1,33 +0,0 @@
-This project contains the source code of the SLURM proxy server. The following
-steps are used to set up your build environment so that the executable will be
-correctly built and installed. In order to use the server binary, it needs to
-be installed in a fragment that corresponds to the architecture of the machine
-it will be run on.
-
-1. Make sure the SLURM rms is installed and ensure it work well.
- That is, SLURM cmd utilities, such as "sinfo/srun/squeue" work as expected.
- For more detailed information about how to build and install SLURM, see
- http://www.llnl.gov/linux/slurm/slurm.html
-
-
-2. Download PTP 2.1 for your platform. And modify proxy_attr.h using libproxy.patch:
- (1) copy libproxy.patch to $PTPDIR/core/org.eclipse.ptp.proxy
- (2) cd $PTPDIR/core/org.eclipse.ptp.proxy
- (3) patch -p1 < libproxy.patch
-
-
-3. Build the corresponding "proxy" and "utils" libraries in $PTPDIR/core/org.eclipse.ptp.proxy
- and $PTPDIR/core/org.eclipse.ptp.utils directory using 'configure', 'make' and 'make install' commands.
-
-
-4. Use 'configure', 'make' and 'make install' within this directory from
- the command line to build and install the executable.
- NOTE: The 'configure' command MUST require '--with-slurm' option to specify the
- top install directory of SLURM. If such option is missed, the configure process will fail.
-
-
-5. If any of the automake/autoconf files changes, you should just need to
- run 'autoreconf' and it will automatically regenerate the appropriate files.
-
-
-
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/about.html b/rms/org.eclipse.ptp.rm.slurm.proxy/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>May 2, 2006</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/config.h.in b/rms/org.eclipse.ptp.rm.slurm.proxy/config.h.in
deleted file mode 100644
index 0f7134d..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/config.h.in
+++ /dev/null
@@ -1,76 +0,0 @@
-/* config.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `proxysvr' library (-lproxysvr). */
-#undef HAVE_LIBPROXYSVR
-
-/* Define to 1 if you have the `slurm' library (-lslurm). */
-#undef HAVE_LIBSLURM
-
-/* Define to 1 if you have the `utils' library (-lutils). */
-#undef HAVE_LIBUTILS
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <slurm/slurm_errno.h> header file. */
-#undef HAVE_SLURM_SLURM_ERRNO_H
-
-/* Define to 1 if you have the <slurm/slurm.h> header file. */
-#undef HAVE_SLURM_SLURM_H
-
-/* Enable SLURM rms support. */
-#undef HAVE_SRUN
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/configure.in b/rms/org.eclipse.ptp.rm.slurm.proxy/configure.in
deleted file mode 100644
index 82a5506..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/configure.in
+++ /dev/null
@@ -1,89 +0,0 @@
-dnl
-dnl
-
-AC_PREREQ([2.50])
-
-AC_INIT([org.eclipse.ptp.slurm], [2.1])
-AC_CONFIG_SRCDIR([src/ptp_slurm_proxy.c])
-
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-
-AC_CANONICAL_BUILD
-
-dnl
-dnl Eclipse adds version number to end of package when deploying via update site
-dnl
-
-UTILS="../../core/org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
- UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
- if test ! -d $UTILS; then
- AC_MSG_ERROR([utils directory not found])
- fi
-fi
-
-PROXY="../../core/org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
- PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
- if test ! -d $PROXY; then
- AC_MSG_ERROR([proxy directory not found])
- fi
-fi
-
-dnl SLURM
-
-AC_ARG_WITH([slurm], AS_HELP_STRING([--with-slurm],
- [Specify the top dir of installed SLURM rms.@<:@REQUIRED@:>@]),[],[with_slurm=no])
-
-SLURMDIR=
-AS_IF([test "x$with_slurm" != xno],[AC_SUBST([SLURMDIR],[$with_slurm])],
- AC_MSG_ERROR([The top installation directory of SLURM rms must be specified via "--with-slurm=DIR".]))
-
-
-dnl
-dnl Check for programs.
-dnl
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-CFLAGS="$CFLAGS -Wall -I$UTILS/include -I$PROXY/include -I$SLURMDIR/include"
-LIBS="$LIBS -L$UTILS -L$PROXY -L$SLURMDIR/lib"
-CPPFLAGS="$CPPFLAGS -I$SLURMDIR/include"
-
-dnl
-dnl Check for libraries.
-dnl
-
-AC_CHECK_LIB([utils], [bitset_new])
-AC_CHECK_LIB([proxysvr], [proxy_svr_init])
-AC_CHECK_LIB([slurm],[slurm_ping],[],
- [AC_MSG_ERROR([libslurm.so/.a not found. Make sure --with-slurm specify correct dir.])])
-
-dnl
-dnl Check for header files.
-dnl
-
-AC_HEADER_STDC
-AC_CHECK_HEADERS([slurm/slurm.h slurm/slurm_errno.h],[],
- [AC_MSG_ERROR([slurm.h or slurm_errno.h not found])])
-
-dnl
-dnl Check for types
-dnl
-AC_TYPE_SIGNAL
-
-AC_PATH_PROG(SRUN, [srun], no)
-if test "$ac_cv_path_SRUN" != no; then
- AC_DEFINE([HAVE_SRUN],[1],[Enable SLURM rms support.])
-else
- AC_MSG_ERROR([srun command not found. Make sure SLURM rms installed.])
-fi
-
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/libproxy.patch b/rms/org.eclipse.ptp.rm.slurm.proxy/libproxy.patch
deleted file mode 100644
index d960a45..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/libproxy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -uNr org.eclipse.ptp.proxy/include/proxy_attr.h org.eclipse.ptp.proxy_slurm/include/proxy_attr.h
---- org.eclipse.ptp.proxy/include/proxy_attr.h 2009-04-14 15:08:29.000000000 +0800
-+++ org.eclipse.ptp.proxy_slurm/include/proxy_attr.h 2009-04-14 15:12:40.000000000 +0800
-@@ -56,10 +56,12 @@
- * Node attributes
- */
- #define NODE_STATE_ATTR "nodeState"
-+#ifndef HAVE_SLURM_SLURM_H
- #define NODE_STATE_UP "UP"
- #define NODE_STATE_DOWN "DOWN"
- #define NODE_STATE_ERROR "ERROR"
- #define NODE_STATE_UNKNOWN "UNKNOWN"
-+#endif
- #define NODE_NUMBER_ATTR "nodeNumber"
- #ifdef HAVE_SYS_BPROC_H
- #define NODE_GROUP_ATTR "nodeGroup"
diff --git a/rms/org.eclipse.ptp.rm.slurm.proxy/src/ptp_slurm_proxy.c b/rms/org.eclipse.ptp.rm.slurm.proxy/src/ptp_slurm_proxy.c
deleted file mode 100644
index 2782888..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.proxy/src/ptp_slurm_proxy.c
+++ /dev/null
@@ -1,3064 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jie Jiang <jiangjie@nudt.edu.cn>
- *******************************************************************************/
-
-
-#ifndef SLURM_PROXY
-#define SLURM_PROXY
-#endif
-
-
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include "config.h"
-#include <fcntl.h>
-#include <getopt.h>
-#include <unistd.h>
-#include <grp.h>
-#include <pwd.h>
-#include <stdbool.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdint.h>
-#include <assert.h>
-#include <unistd.h>
-#include <pthread.h>
-#include <libgen.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/select.h>
-#include <sys/param.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "handler.h"
-#include "list.h"
-#include "args.h"
-#include "rangeset.h"
-#include "slurm/slurm.h"
-#include "srun_opt.h"
-
-
-#define PTP_JOBID 0
-#define SLURM_JOBID 1
-#define DEBUG_JOBID 2
-#define JOBID_INIT 0
-#define JOBID_FAIL -1
-#define MAX_THREADS 60
-#define CORE_INVALID -1
-#define CORE_DEFAULT 0
-#define MAX_BUF_SIZE 8192
-#define MAX_SRUN_ARG_NUM 256
-#define ALL_JOBSTATE -1
-/*
- * Need to undef these if we include
- * two config.h files
- */
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-
-#define WIRE_PROTOCOL_VERSION "2.0"
-#define DEFAULT_HOST "localhost"
-#define DEFAULT_PROXY "tcp"
-
-/*
- * Proxy server states. The SHUTTING_DOWN state is used to
- * give the proxy a chance to send any pending events once
- * a QUIT command has been received.
- */
-#define STATE_INIT 0
-#define STATE_RUNNING 1
-#define STATE_SHUTTING_DOWN 2
-#define STATE_SHUTDOWN 3
-
-
-/*
- * RTEV codes must EXACTLY match org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEvent
- */
-#define RTEV_OFFSET 200
-#define RTEV_ERROR_SLURM_INIT RTEV_OFFSET + 1000
-#define RTEV_ERROR_SLURM_FINALIZE RTEV_OFFSET + 1001
-#define RTEV_ERROR_SLURM_SUBMIT RTEV_OFFSET + 1002
-#define RTEV_ERROR_JOB RTEV_OFFSET + 1003
-#define RTEV_ERROR_NATTR RTEV_OFFSET + 1007
-//#define RTEV_ERROR_ORTE_BPROC_SUBSCRIBE RTEV_OFFSET + 1008
-#define RTEV_ERROR_SIGNAL RTEV_OFFSET + 1009
-
-/*
- * Queue attributes
- */
-#define DEFAULT_QUEUE_NAME "default"
-#define SLURM_JOB_NAME_FMT "job%02d"
-
-#define MAX_RETRIES 100
-#define JOB_UPDATE_TIMER 1
-#define NODE_UPDATE_TIMER 2
-#define JOB_UPDATE_TIMEOUT 500000 /*usec*/
-#define NODE_UPDATE_TIMEOUT 5000000 /*usec*/
-
-/* SLURM job state and attributes */
-#define SLURM_JOB_STATE_PENDING "PENDING"
-#define SLURM_JOB_STATE_RUNNING "RUNNING"
-#define SLURM_JOB_STATE_SUSPENDED "SUSPENDED"
-#define SLURM_JOB_STATE_TERMINATED "TERMINATED"
-#define SLURM_JOB_STATE_COMPLETE SLURM_JOB_STATE_TERMINATED
-#define SLURM_JOB_STATE_CANCELLED "CANCELLED"
-#define SLURM_JOB_STATE_FAILED "FAILED"
-#define SLURM_JOB_STATE_TIMEOUT "TIMEOUT"
-#define SLURM_JOB_STATE_NODEFAIL "NODEFAIL"
-
-#define SLURM_JOB_SUB_ID_ATTR "jobSubId"
-#define SLURM_JOB_NUM_PROCS_ATTR "jobNumProcs" //-n
-#define SLURM_JOB_NUM_NODES_ATTR "jobNumNodes" //-N
-#define SLURM_JOB_TIME_LIMIT_ATTR "jobTimeLimit" //-t
-#define SLURM_JOB_PARTITION_ATTR "jobPartition" //-p
-#define SLURM_JOB_ID_ATTR "jobId" //--jobid
-#define SLURM_JOB_NODELIST_ATTR "jobNodeList" //-w
-#define SLURM_JOB_TYPE_ATTR "jobType" //--jobtype
-#define SLURM_JOB_IOLABEL_ATTR "jobIoLabel" //-l
-#define SLURM_JOB_VERBOSE_ATTR "jobVerbose" //-v
-#define SLURM_JOB_EXEC_NAME_ATTR "execName"
-#define SLURM_JOB_EXEC_PATH_ATTR "execPath"
-#define SLURM_JOB_WORKING_DIR_ATTR "workingDir"
-#define SLURM_JOB_PROG_ARGS_ATTR "progArgs"
-#define SLURM_JOB_ENV_ATTR "env"
-#define SLURM_JOB_DEBUG_EXEC_NAME_ATTR "debugExecName"
-#define SLURM_JOB_DEBUG_EXEC_PATH_ATTR "debugExecPath"
-#define SLURM_JOB_DEBUG_ARGS_ATTR "debugArgs"
-#define SLURM_JOB_DEBUG_FLAG_ATTR "debug"
-
-/* SLURM node state and attributes */
-#define SLURM_NODE_STATE_UNKNOWN "UNKNOWN"
-#define SLURM_NODE_STATE_DOWN "DOWN"
-#define SLURM_NODE_STATE_IDLE "UP"
-#define SLURM_NODE_STATE_ALLOCATED "ALLOCATED"
-#define SLURM_NODE_EXTRA_STATE_ATTR "nodeExtraState"
-#define SLURM_NODE_NUMBER_ATTR "nodeNumber"
-#define SLURM_NODE_SOCKETS_ATTR "sockNumber"
-#define SLURM_NODE_CORES_ATTR "coreNumber"
-#define SLURM_NODE_THREADS_ATTR "threadNumber"
-#define SLURM_NODE_ARCH_ATTR "cpuArch"
-#define SLURM_NODE_OS_ATTR "OS"
-
-#define EXIT_JOB_ALLOC_FAIL -1
-#define EXIT_JOB_IOTHREAD_FAIL -2
-#define EXIT_EXEC_FAIL -3
-
-
-struct sync_msg {
- int slurm_jobid;
- bool jobid_set;
- bool io_ready;
-};
-typedef struct sync_msg sync_msg;
-
-struct ptp_machine {
- int id;
- List * nodes;
-};
-typedef struct ptp_machine ptp_machine;
-
-struct ptp_slurm_node {
- int id; /* model element id, generated by proxy agent */
- int number; /* node number, assigned by SLURM */
- char * name;
- uint16_t state; /* (uint16_t)node_info_t.state, converted to (char *) */
- uint16_t sockets;
- uint16_t cores;
- uint16_t threads;
- char * arch;
- char * os;
-};
-typedef struct ptp_slurm_node ptp_node;
-
-struct ptp_slurm_process {
- int id;
- int node_id;
- int task_id; /* MPI rank */
- int pid;
-};
-typedef struct ptp_slurm_process ptp_process;
-
-struct ptp_slurm_job {
- int ptp_jobid; /* job ID as known by PTP */
- int slurm_jobid; /* job ID that will be used by program when it starts */
- bool need_alloc; /* need to allocate new resource */
- int debug_jobid;
- int num_procs; /* number of procs requested for program (debugger: num_procs+1) */
- int state; /* job state(slurm definition) */
- pid_t srun_pid; /* pid of the srun process */
- bool debug; /* job is debug job */
- bool attach; /* attach debug */
- int fd_err; /* fd of pipe for srun's stderr */
- int fd_out; /* fd of pipe for srun's stdout */
- int iothread_id; /* id of thread forwarding srun's stdio */
- bool iothread_exit_req; /* request iothread to exit */
- bool iothread_exit; /* flag inidication iothread has exited */
- bool removable;
- ptp_process ** procs; /* procs of this job */
- rangeset * set; /* range set of proc ID */
-};
-typedef struct ptp_slurm_job ptp_job;
-
-typedef struct slurmctld_comm_addr {
- char * hostname;
- uint16_t port;
-}slurmctld_comm_addr_t;
-
-typedef void SigFunc(int);
-typedef int32_t slurm_fd;
-
-
-static int SLURM_Initialize(int, int, char **);
-static int SLURM_ModelDef(int, int, char **);
-static int SLURM_StartEvents(int, int, char **);
-static int SLURM_StopEvents(int, int, char **);
-static int SLURM_SubmitJob(int, int, char **);
-static int SLURM_TerminateJob(int, int, char **);
-static int SLURM_Quit(int, int, char **);
-
-static FILE * init_logfp();
-static void debug_log(FILE * fp, char * fmt,...);
-static void * srun_output_forwarding(void * arg);
-static bool job_update_timeout();
-static void update_job_state(int slurm_jobid);
-static bool node_update_timeout();
-static void update_node_state();
-static int create_node_list(ptp_machine *mach);
-static void init_job_timer();
-static void init_node_timer();
-
-static struct timeval job_update_timer;
-static struct timeval node_update_timer;
-static sync_msg * sync_msg_addr;
-static FILE * logfp;
-static int destroy_job = 0; /* job allocation cancelled by signal */
-static bool enable_state_update = false;
-static srun_opt_t opt;
-static allocation_msg_thread_t* msg_thr = NULL;
-static slurmctld_comm_addr_t slurmctld_comm_addr;
-static int gTransID = 0; /* transaction id for start of event stream, is 0 when events are off */
-static int gBaseID = -1; /* base ID for event generation */
-static int gLastID = 1; /* ID generator */
-static int gQueueID; /* ID of default queue */
-static int proxy_state = STATE_INIT;
-static proxy_svr * slurm_proxy;
-static List * gJobList;
-static List * gMachineList;
-static int ptp_signal_exit = 0;;
-
-
-static proxy_svr_helper_funcs helper_funcs = {
- NULL, // newconn() - can be used to reject connections
- NULL // numservers() - if there are multiple servers, return the number
-};
-
-#define CMD_BASE 0
-static proxy_cmd cmds[] = {
- SLURM_Quit,
- SLURM_Initialize,
- SLURM_ModelDef,
- SLURM_StartEvents,
- SLURM_StopEvents,
- SLURM_SubmitJob,
- SLURM_TerminateJob
-};
-
-static proxy_commands command_tab = {
- CMD_BASE,
- sizeof(cmds)/sizeof(proxy_cmd),
- cmds
-};
-
-static struct option longopts[] = {
- {"proxy", required_argument, NULL, 'P'},
- {"port", required_argument, NULL, 'p'},
- {"host", required_argument, NULL, 'h'},
- {NULL, 0, NULL, 0}
-};
-
-
-/*
- * If the log file is specified, return the FILE pointer.
- * Otherwise, default to stderr.
- */
-static FILE *
-init_logfp()
-{
- FILE * fp = stderr;
- char * logdir;
- char * logfile;
- int rc;
-
- if ((logdir = getenv("PTP_SLURM_PROXY_LOGDIR")) == NULL)
- return fp;
-
- rc = access(logdir, R_OK|W_OK);
- if (rc < 0) {
- fprintf(stderr, "Please ensure the DIR %s exists and you can READ/WRITE it!\n", logdir);
- return fp;
- }
- asprintf(&logfile,"%s/ptp_proxy.log",logdir);
- fp = fopen(logfile,"w+");
- if(fp == NULL)
- fp = stderr;
- free(logfile);
-
- return fp;
-}
-
-/*
- * Write debug info into logfile.
- */
-static void
-debug_log(FILE * fp, char * fmt,...)
-{
- va_list va;
-
- if (fp == NULL)
- return;
-
- va_start(va, fmt);
- vfprintf(fp, fmt, va);
- fflush(fp);
- va_end(va);
-
- return;
-}
-
-/*
- * Generate a model element ID.
- */
-static int
-generate_id(void)
-{
- return gBaseID + gLastID++;
-}
-
-/*
- * Create a new machine.
- */
-static ptp_machine *
-new_machine()
-{
- ptp_machine * m = (ptp_machine *)malloc(sizeof(ptp_machine));
- m->id = generate_id();
- m->nodes = NewList();
- AddToList(gMachineList, (void *)m);
-
- return m;
-}
-
-/*
- * Convert SLURM node state code (uint16_t) to STRING.
- */
-static char *
-nodestate_to_string(uint16_t slurm_node_state)
-{
- char * str = NULL;
-
- switch (slurm_node_state & NODE_STATE_BASE) {
- case NODE_STATE_UNKNOWN:
- str = SLURM_NODE_STATE_UNKNOWN;
- break;
- case NODE_STATE_DOWN:
- str = SLURM_NODE_STATE_DOWN;
- break;
- case NODE_STATE_IDLE:
- str = SLURM_NODE_STATE_IDLE;
- break;
- case NODE_STATE_ALLOCATED:
- str = SLURM_NODE_STATE_ALLOCATED;
- break;
- default:
- str = SLURM_NODE_STATE_UNKNOWN;
- break;
- }
-
- return str;
-}
-
-/*
- * Convert SLURM job state code(uint16_t) to STRING.
- */
-static char *
-jobstate_to_string(uint16_t slurm_job_state)
-{
- char * str = NULL;
-
- switch (slurm_job_state & (~JOB_COMPLETING)) {
- case JOB_PENDING:
- str = SLURM_JOB_STATE_PENDING;
- break;
- case JOB_RUNNING:
- str = SLURM_JOB_STATE_RUNNING;
- break;
- case JOB_SUSPENDED:
- str = SLURM_JOB_STATE_SUSPENDED;
- break;
- case JOB_COMPLETE:
- str = SLURM_JOB_STATE_COMPLETE;
- break;
- case JOB_CANCELLED:
- str = SLURM_JOB_STATE_CANCELLED;
- break;
- case JOB_FAILED:
- str = SLURM_JOB_STATE_FAILED;
- break;
- case JOB_TIMEOUT:
- str = SLURM_JOB_STATE_TIMEOUT;
- break;
- case JOB_NODE_FAIL:
- str = SLURM_JOB_STATE_NODEFAIL;
- break;
- default:
- str = "Unknown job state";
- break;
- }
-
- return str;
-}
-
-
-/*
- * Create a new node and insert it into machine node list.
- */
-static ptp_node *
-new_node(ptp_machine *mach, node_info_t *ni)
-{
- static int node_number = 0;
- ptp_node * n = (ptp_node *)malloc(sizeof(ptp_node));
-
- memset((char *)n, 0, sizeof(ptp_node));
- n->id = generate_id();
- n->number = node_number++;
-
- n->sockets = ni->sockets;
- n->cores = ni->cores;
- n->threads = ni->threads;
-
- if (ni->name != NULL)
- n->name = strdup(ni->name);
-
- n->state = ni->node_state;
-
- if (ni->arch != NULL)
- n->arch = strdup(ni->arch);
- if (ni->os != NULL)
- n->os = strdup(ni->os);
-
- AddToList(mach->nodes, (void *)n);
-
- return n;
-}
-
-/*
- * Get node pointer from node name.
- */
-static ptp_node *
-find_node_by_name(char *name)
-{
- ptp_machine * m;
- ptp_node * n;
-
- for (SetList(gMachineList); (m = (ptp_machine *)GetListElement(gMachineList)) != NULL; ) {
- for (SetList(m->nodes); (n = (ptp_node *)GetListElement(m->nodes)) != NULL; ) {
- if (strcmp(name, n->name) == 0)
- return n;
- }
- }
-
- return NULL;
-}
-
-/*
- * Create a new process and insert it into job structure.
- */
-static ptp_process *
-new_process(ptp_job *job, int node_id, int task_id, int pid)
-{
- ptp_process * p = (ptp_process *)malloc(sizeof(ptp_process));
- if (p == NULL)
- return NULL;
-
- p->id = generate_id();
- p->task_id = task_id;
- p->pid = pid;
- p->node_id = node_id;
-
- job->procs[task_id] = p;
- insert_in_rangeset(job->set, p->id);
-
- return p;
-}
-
-
-/*
- * Free the space allocated to ptp_process.
- */
-static void
-free_process(ptp_process *p)
-{
- if (p)
- free(p);
- return;
-}
-
-/*
- * Get process pointer given job and task_id.
- */
-static ptp_process *
-find_process(ptp_job *job, int task_id)
-{
- if (task_id < 0 || task_id >= job->num_procs)
- return NULL;
-
- return job->procs[task_id];
-}
-
-/*
- * Get jobid of 'which' type
- */
-static int
-get_jobid(ptp_job *j, int which)
-{
- int id = -1;
-
- if (j != NULL) {
- switch (which) {
- case PTP_JOBID:
- id = j->ptp_jobid;
- break;
- case SLURM_JOBID:
- id = j->slurm_jobid;
- break;
- case DEBUG_JOBID:
- id = j->debug_jobid;
- break;
- default:
- id = -1;
- break;
- }
- }
-
- return id;
-}
-
-/*
- * Create a new job,set job attributes and add to gJobList.
- */
-static ptp_job *
-new_job(int num_procs, bool debug, int ptp_jobid, int slurm_jobid, int debug_jobid, bool need_alloc)
-{
- ptp_job * j = (ptp_job *)malloc(sizeof(ptp_job));
- if (j == NULL) {
- debug_log(logfp, "Allcoate space for job struct fail. \n");
- return NULL;
- }
-
- j->ptp_jobid = ptp_jobid;
- j->slurm_jobid = slurm_jobid;
- j->need_alloc = need_alloc;
- j->num_procs = num_procs;
- j->debug = debug;
- j->debug_jobid = debug_jobid;
- j->attach = false;
- j->srun_pid = -1;
- j->state = -1;
- j->removable = false;
- j->fd_err = -1;
- j->fd_out = -1;
- j->iothread_id = -1;
- j->iothread_exit_req = false;
- j->iothread_exit = false;
- j->set = new_rangeset();
- j->procs = (ptp_process **)malloc(sizeof(ptp_process *) * num_procs);
- memset(j->procs, 0, sizeof(ptp_process *) * num_procs);
-
- AddToList(gJobList, (void *)j);
-
- return j;
-}
-
-/*
- * Free job space allocated by new_job().
- */
-static void
-free_job(ptp_job *j)
-{
- int i;
-
- if (j) {
- if (j->procs) {
- for (i = 0; i < j->num_procs; i++) {
- if (j->procs[i] != NULL)
- free_process(j->procs[i]);
- }
- free(j->procs);
- }
- if (j->set)
- free_rangeset(j->set);
-
- free(j);
- }
-}
-
-
-/*
- * Get job pointer given the jobid of 'which' type.
- * If debug is true, find the job using the debug jobid.
- */
-static ptp_job *
-find_job(int jobid, int which)
-{
- ptp_job * j = NULL;
-
- for (SetList(gJobList); (j = (ptp_job *)GetListElement(gJobList)) != NULL; ) {
- if (get_jobid(j, which) == jobid)
- return j;
- }
- return NULL;
-}
-
-/*
- * Determin if the given job is ACTIVE.
- */
-static bool
-slurm_job_active(ptp_job * job)
-{
- uint16_t state;
- bool active;
-
- state = job->state;
- if (state == JOB_COMPLETE || state == JOB_CANCELLED
- || state == JOB_FAILED || state == JOB_TIMEOUT || state == JOB_NODE_FAIL) {
- active = false;
- } else
- active = true; /* JOB_COMPLETING is ACTIVE */
-
- return active;
-}
-
-static void
-sendOKEvent(int trans_id)
-{
- proxy_svr_queue_msg(slurm_proxy, proxy_ok_event(trans_id));
-}
-
-static void
-sendShutdownEvent(int trans_id)
-{
- proxy_svr_queue_msg(slurm_proxy, proxy_shutdown_event(trans_id));
-}
-
-static void
-sendMessageEvent(int trans_id, char *level, int code, char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- proxy_svr_queue_msg(slurm_proxy, proxy_message_event(trans_id, level, code, fmt, ap));
- va_end(ap);
-}
-
-static void
-sendErrorEvent(int trans_id, int code, char *fmt, ...)
-{
- va_list ap;
-
- va_start(ap, fmt);
- debug_log(logfp, "sendErrorEvent(%d,%d),", trans_id, code);
- debug_log(logfp, fmt,ap);
- proxy_svr_queue_msg(slurm_proxy, proxy_error_event(trans_id, code, fmt, ap));
- va_end(ap);
-}
-
-static void
-sendJobSubErrorEvent(int trans_id, char *jobSubId, char *msg)
-{
- proxy_svr_queue_msg(slurm_proxy, proxy_submitjob_error_event(trans_id, jobSubId, RTEV_ERROR_SLURM_SUBMIT, msg));
-}
-
-
-static void
-sendJobTerminateErrorEvent(int trans_id, int id, char *msg)
-{
- char * job_id;
-
- asprintf(&job_id, "%d", id);
- proxy_svr_queue_msg(slurm_proxy, proxy_terminatejob_error_event(trans_id, job_id, RTEV_ERROR_JOB, msg));
-}
-
-static void
-sendNewMachineEvent(int trans_id, int id, char *name)
-{
- char * rm_id;
- char * machine_id;
-
- asprintf(&rm_id, "%d", gBaseID);
- asprintf(&machine_id, "%d", id);
- proxy_svr_queue_msg(slurm_proxy, proxy_new_machine_event(trans_id, rm_id, machine_id, name, MACHINE_STATE_UP));
- free(machine_id);
- free(rm_id);
-}
-
-
-/*
- * Get the number of node attributes setup in ptp_node.
- */
-static int
-num_node_attrs(ptp_node *node)
-{
- int cnt = 0;
-
- if (node->number >= 0)
- cnt++;
- if (node->sockets > 0)
- cnt++;
- if (node->cores > 0)
- cnt++;
- if (node->threads > 0)
- cnt++;
- if (node->arch != NULL)
- cnt++;
- if (node->os != NULL)
- cnt++;
-
- return cnt;
-}
-
-/*
- * Add node attributes to proxy_msg.
- */
-static void
-add_node_attrs(proxy_msg *m, ptp_node *node)
-{
-
- /* NODE_NUMBER_ATTR enables the node number ruler in Machine View */
- if (node->number >= 0)
- proxy_add_int_attribute(m, SLURM_NODE_NUMBER_ATTR, node->number);
-
- proxy_add_int_attribute(m, SLURM_NODE_SOCKETS_ATTR, (int)node->sockets);
- proxy_add_int_attribute(m, SLURM_NODE_CORES_ATTR, (int)node->cores);
- proxy_add_int_attribute(m, SLURM_NODE_THREADS_ATTR, (int)node->threads);
-
- if (node->arch != NULL)
- proxy_add_string_attribute(m, SLURM_NODE_ARCH_ATTR, node->arch);
- if (node->os != NULL)
- proxy_add_string_attribute(m, SLURM_NODE_OS_ATTR, node->os);
-}
-
-static void
-sendNewJobEvent(int trans_id, int jobid, char *name, char *jobSubId, char *state)
-{
- char * queue_id;
- char * job_id;
-
- asprintf(&queue_id, "%d", gQueueID);
- asprintf(&job_id, "%d", jobid);
- proxy_svr_queue_msg(slurm_proxy, proxy_new_job_event(trans_id, queue_id, job_id, name, state, jobSubId));
- free(queue_id);
- free(job_id);
-}
-
-static void
-sendNewNodeEvent(int trans_id, int machid, ptp_machine *mach)
-{
- ptp_node * n;
- proxy_msg * m;
- char * machine_id;
- char * node_id;
-
- asprintf(&machine_id, "%d", machid);
- m = proxy_new_node_event(trans_id, machine_id, SizeOfList(mach->nodes));
- for (SetList(mach->nodes); (n = (ptp_node *)GetListElement(mach->nodes)) != NULL; ) {
- asprintf(&node_id, "%d", n->id);
- proxy_add_node(m, node_id, n->name, nodestate_to_string(n->state), num_node_attrs(n));
- add_node_attrs(m, n);
- free(node_id);
- }
- proxy_svr_queue_msg(slurm_proxy, m);
- free(machine_id);
-}
-
-static void
-sendNodeChangeEvent(int trans_id, char * id_range, char * state)
-{
- proxy_msg * m;
-
- m = proxy_node_change_event(trans_id, id_range, 1);
- proxy_add_string_attribute(m, NODE_STATE_ATTR, state);
- proxy_svr_queue_msg(slurm_proxy, m);
-}
-
-/*
- * FIXME:
- * Add extra attributes when task topology information is available.
- * This can be done via slurm_job_step_layout_get() API when updating job state.
- */
-static void
-sendNewProcessEvent(int trans_id, int jobid, ptp_process *p, char *state)
-{
- proxy_msg * m;
- char * job_id;
- char * proc_id;
- char * name;
-
- if (p == NULL)
- return;
-
- asprintf(&job_id, "%d", jobid);
- asprintf(&proc_id, "%d", p->id);
- asprintf(&name, "%d", p->task_id);
-
- m = proxy_new_process_event(trans_id, job_id, 1);
- /*
- * By now, p->node_id, p->task_id, p->pid can't be obtained.
- * So set the extra_attrs=0
- */
- proxy_add_process(m, proc_id, name, state, 0);
- /*
- proxy_add_process(m, proc_id, name, state, 3);
- proxy_add_int_attribute(m, PROC_NODEID_ATTR, p->node_id);
- proxy_add_int_attribute(m, PROC_INDEX_ATTR, p->task_id);
- proxy_add_int_attribute(m, PROC_PID_ATTR, p->pid);
- */
- proxy_svr_queue_msg(slurm_proxy, m);
-
- free(job_id);
- free(proc_id);
- free(name);
-}
-
-static void
-sendNewQueueEvent(int trans_id)
-{
- char * rm_id;
- char * queue_id;
-
- gQueueID = generate_id();
-
- asprintf(&rm_id, "%d", gBaseID);
- asprintf(&queue_id, "%d", gQueueID);
- proxy_svr_queue_msg(slurm_proxy, proxy_new_queue_event(trans_id, rm_id, queue_id, DEFAULT_QUEUE_NAME, QUEUE_STATE_NORMAL));
-
- free(rm_id);
- free(queue_id);
-}
-
-static void
-sendProcessStateChangeEvent(int trans_id, ptp_job *j, char *state)
-{
- proxy_msg * m;
-
- if (j == NULL || j->num_procs == 0)
- return;
-
- m = proxy_process_change_event(trans_id, rangeset_to_string(j->set), 1);
- proxy_add_string_attribute(m, PROC_STATE_ATTR, state);
- proxy_svr_queue_msg(slurm_proxy, m);
-}
-
-
-static void
-sendJobStateChangeEvent(int trans_id, int jobid, char *state)
-{
- char * job_id;
- proxy_msg * m;
-
- asprintf(&job_id, "%d", jobid);
-
- m = proxy_job_change_event(trans_id, job_id, 1);
- proxy_add_string_attribute(m, JOB_STATE_ATTR, state);
- proxy_svr_queue_msg(slurm_proxy, m);
-
- free(job_id);
-}
-
-/*
- * SLURM provides no process state, only job state.
- * Let process state equal to job state.
- */
-static void
-sendProcessChangeEvent(int trans_id, ptp_process *p, int node_id, int task_id, int pid)
-{
- return;
-}
-
-static void
-sendProcessOutputEvent(int trans_id, int procid, char *output)
-{
- char * proc_id;
- proxy_msg * m;
-
- asprintf(&proc_id, "%d", procid);
-
- m = proxy_process_change_event(trans_id, proc_id, 1);
- proxy_add_string_attribute(m, PROC_STDOUT_ATTR, output);
- proxy_svr_queue_msg(slurm_proxy, m);
-
- free(proc_id);
-}
-
-/*
- * Get the number of compute nodes managed by SLURM.
- */
-static int
-get_num_nodes(int machid)
-{
- uint32_t cnt = 0;
- node_info_msg_t * ninfo;
-
- slurm_load_node((time_t)NULL, &ninfo, SHOW_ALL);
- cnt = ninfo->record_count;
- slurm_free_node_info_msg(ninfo);
-
- return cnt;
-}
-
-/*
- * Currently only ONE machine supported.
- */
-static int
-get_num_machines()
-{
- return 1;
-}
-
-/*
- * Get hostname of the server node where slurmctld runs.
- */
-static char *
-get_machine_name(int num)
-{
- static char hostname[512];
-
- gethostname(hostname, 512);
- return hostname;
-}
-
-/*
- * Cteate the node list for a machine.
- */
-static int
-create_node_list(ptp_machine *mach)
-{
- uint32_t cnt;
- node_info_msg_t *nmsg;
- ptp_node * node;
- int i;
-
- if (slurm_load_node((time_t)NULL,&nmsg, SHOW_ALL))
- return -1;
-
- cnt = nmsg->record_count;
- for (i = 0; i < cnt; i++)
- node = new_node(mach, nmsg->node_array + i);
-
- return 0;
-}
-
-/*
- * If we're under debug control, let the debugger handle process state update.
- *
- * Note: this will only be called if the debugger allows the program to
- * reach MPI_Init(), which may never happen (e.g. if it's not an MPI program).
- * Don't rely this to do anything for arbitrary jobs.
- *
- * Note also: the debugger manages process state updates so we don't need
- * to send events back to the runtime.
- */
-
-
-//static void
-//debug_app_job_state_callback(orte_jobid_t jobid, orte_proc_state_t state)
-//{
- /* this is what it has before, untouched */
-// switch(state) {
-// case ORTE_PROC_STATE_TERMINATED:
-// case ORTE_PROC_STATE_ABORTED:
-// break;
-// }
-//}
-
-/*
- * job_state_callback for the debugger. Detects debugger start and exit and notifies the
- * UI. Cleans up job id map.
- */
-/*
-static void
-debug_job_state_callback(orte_jobid_t jobid, orte_proc_state_t state)
-{
- ptp_job * j;
-
- if ((j = find_job(jobid, JOBID_DEBUG)) == NULL)
- return;
-
- do_state_callback(j, state);
-}
-*/
-
-/*
- * Tell the daemon to exit.
- * Noops for SLURM.
- */
-static int
-do_slurm_shutdown(void)
-{
- debug_log(logfp, "do_slurm_shutdown() called.\n");
- return 0;
-}
-
-/*
- * gethostname_short - equivalent to gethostname, but return only the first
- * component of the fully qualified name
- * (e.g. "linux123.foo.bar" becomes "linux123")
- */
-static int
-gethostname_short (char *name, size_t len)
-{
- int error_code, name_len;
- char *dot_ptr, path_name[1024];
-
- error_code = gethostname (path_name, sizeof(path_name));
- if (error_code)
- return error_code;
-
- dot_ptr = strchr (path_name, '.');
- if (dot_ptr == NULL)
- dot_ptr = path_name + strlen(path_name);
- else
- dot_ptr[0] = '\0';
-
- name_len = dot_ptr - path_name;
- if (name_len > len)
- return ENAMETOOLONG;
-
- strcpy (name, path_name);
- return 0;
-}
-
-
-/*
- * Set default srun options.
- */
-static int
-opt_default(srun_opt_t * opt)
-{
- char buf[MAXPATHLEN + 1];
- struct passwd *pw;
- int i;
- char hostname[64];
-
- if (opt == NULL)
- return -1;
-
- if ((pw = getpwuid(getuid())) != NULL) {
- strncpy(opt->ps_user, pw->pw_name, MAX_USERNAME);
- opt->ps_uid = pw->pw_uid;
- } else {
- debug_log(logfp, "opt_default:who are you?");
- return -1;
- }
-
- opt->ps_gid = getgid();
-
- if ((getcwd(buf, MAXPATHLEN)) == NULL) {
- debug_log(logfp,"getcwd failed");
- return -1;
- }
- opt->ps_cwd = strdup(buf);
- opt->ps_cwd_set = false;
- opt->ps_progname = NULL;
- opt->ps_nprocs = 1;
- opt->ps_nprocs_set = false;
- opt->ps_cpus_per_task = 1;
- opt->ps_cpus_set = false;
- opt->ps_min_nodes = 1;
- opt->ps_max_nodes = 0;
- opt->ps_min_sockets_per_node = NO_VAL; /* requested min/maxsockets */
- opt->ps_max_sockets_per_node = NO_VAL;
- opt->ps_min_cores_per_socket = NO_VAL; /* requested min/maxcores */
- opt->ps_max_cores_per_socket = NO_VAL;
- opt->ps_min_threads_per_core = NO_VAL; /* requested min/maxthreads */
- opt->ps_max_threads_per_core = NO_VAL;
- opt->ps_ntasks_per_node = NO_VAL; /* ntask max limits */
- opt->ps_ntasks_per_socket = NO_VAL;
- opt->ps_ntasks_per_core = NO_VAL;
- opt->ps_nodes_set = false;
- opt->ps_cpu_bind_type = 0;
- opt->ps_cpu_bind = NULL;
- opt->ps_mem_bind_type = 0;
- opt->ps_mem_bind = NULL;
- opt->ps_time_limit = NO_VAL;
- opt->ps_time_limit_str = NULL;
- opt->ps_ckpt_interval = 0;
- opt->ps_ckpt_interval_str = NULL;
- opt->ps_ckpt_path = NULL;
- opt->ps_partition = NULL;
-
- //use default value:32
- /*
- opt->ps_max_threads = MAX_THREADS;
- pmi_server_max_threads(opt->ps_max_threads);
- */
-
- opt->ps_relative = NO_VAL;
- opt->ps_relative_set = false;
- opt->ps_job_name = NULL;
- opt->ps_job_name_set = false;
- opt->ps_jobid = NO_VAL;
- opt->ps_jobid_set = false;
- opt->ps_dependency = NULL;
- opt->ps_account = NULL;
- opt->ps_comment = NULL;
-
- opt->ps_distribution = SLURM_DIST_UNKNOWN;
- opt->ps_plane_size = NO_VAL;
-
- opt->ps_ofname = NULL;
- opt->ps_ifname = NULL;
- opt->ps_efname = NULL;
-
- opt->ps_core_type = CORE_DEFAULT;
-
- opt->ps_labelio = false;
- opt->ps_unbuffered = false;
- opt->ps_overcommit = false;
- opt->ps_shared = (uint16_t)NO_VAL;
- opt->ps_exclusive = false;
- opt->ps_no_kill = false;
- opt->ps_kill_bad_exit = false;
-
- opt->ps_immediate = false;
-
- opt->ps_join = false;
- slurm_ctl_conf_t * slurm_ctl_conf_ptr;
- slurm_load_ctl_conf((time_t)NULL, &slurm_ctl_conf_ptr);
- opt->ps_max_wait = slurm_ctl_conf_ptr->wait_time;
-
- opt->ps_quit_on_intr = false;
- opt->ps_disable_status = false;
- opt->ps_test_only = false;
-
- opt->ps_quiet = 0;
-
- opt->ps_job_min_cpus = NO_VAL;
- opt->ps_job_min_sockets = NO_VAL;
- opt->ps_job_min_cores = NO_VAL;
- opt->ps_job_min_threads = NO_VAL;
- opt->ps_job_min_memory = NO_VAL;
- opt->ps_task_mem = NO_VAL;
- opt->ps_job_min_tmp_disk= NO_VAL;
-
- opt->ps_hold = false;
- opt->ps_constraints = NULL;
- opt->ps_contiguous = false;
- opt->ps_nodelist = NULL;
- opt->ps_exc_nodes = NULL;
- opt->ps_max_launch_time = 120;/* 120 seconds to launch job */
- opt->ps_max_exit_timeout= 60; /* Warn user 60 seconds after task exit */
- /* Default launch msg timeout */
- opt->ps_msg_timeout = slurm_ctl_conf_ptr->msg_timeout;
-
- for (i=0; i<SYSTEM_DIMENSIONS; i++)
- opt->ps_geometry[i] = (uint16_t) NO_VAL;
- opt->ps_reboot = false;
- opt->ps_no_rotate = false;
- opt->ps_conn_type = (uint16_t) NO_VAL;
- opt->ps_blrtsimage = NULL;
- opt->ps_linuximage = NULL;
- opt->ps_mloaderimage = NULL;
- opt->ps_ramdiskimage = NULL;
- opt->ps_euid = (uid_t) -1;
- opt->ps_egid = (gid_t) -1;
- opt->ps_propagate = NULL; /* propagate specific rlimits */
- opt->ps_prolog = slurm_ctl_conf_ptr->srun_prolog;
- opt->ps_epilog = slurm_ctl_conf_ptr->srun_epilog;
- opt->ps_task_prolog = NULL;
- opt->ps_task_epilog = NULL;
- gethostname_short(hostname, sizeof(hostname));
- opt->ps_ctrl_comm_ifhn = strdup(hostname);
- opt->ps_pty = false;
- opt->ps_open_mode = 0;
- opt->ps_acctg_freq = -1;
-
- if (slurm_ctl_conf_ptr)
- slurm_free_ctl_conf(slurm_ctl_conf_ptr);
-
- return 0;
-}
-
-/*
- * Initialize option defaults.
- */
-static int
-set_srun_options_defaults(srun_opt_t * opt)
-{
- return opt_default(opt);
-}
-
-/*
- * Free space allocated for job "opt".
- */
-static void
-free_opt(srun_opt_t * opt)
-{
- if (opt == NULL)
- return;
-
- if (opt->ps_cwd_set == true && opt->ps_cwd != NULL)
- free(opt->ps_cwd);
- if (opt->ps_nodes_set == true && opt->ps_nodelist != NULL)
- free(opt->ps_nodelist);
- if (opt->ps_ctrl_comm_ifhn) /* allocated in opt_default() */
- free(opt->ps_ctrl_comm_ifhn);
-}
-
-/*
- * Free space allocated to save srun args in SLURM_SubmitJob().
- */
-static void
-free_srun_argv(int srun_argc,char ** srun_argv)
-{
- int i;
-
- for (i = 0; i< srun_argc; i++) {
- if (srun_argv[i] != NULL)
- free(srun_argv[i]);
- }
-
- free(srun_argv);
-}
-
-
-/*
- * Create job desc. msg from opts for job allocation.
- * By now, -w/-x options are not supported.
- */
-static job_desc_msg_t *
-create_job_desc_msg_from_opts(srun_opt_t *opt)
-{
-
- job_desc_msg_t * j = NULL;
-
- assert(opt != NULL);
- if ((j = (job_desc_msg_t *)malloc(sizeof(job_desc_msg_t))) == NULL) {
- debug_log(logfp, "Allocate job_desg_msg fail");
- return NULL;
- }
-
- slurm_init_job_desc_msg(j);
-
- if (opt->ps_account)
- j->account = strdup(opt->ps_account);
-
- j->contiguous = opt->ps_contiguous;
- j->features = opt->ps_constraints;
- j->immediate = (uint16_t)opt->ps_immediate;
- j->name = opt->ps_job_name;
-
- if (opt->ps_nodelist)
- j->req_nodes = strdup(opt->ps_nodelist);
- /*
- * FIXME: handle -w nodelist request
- */
- /*
- if(j->req_nodes) {
- hl = hostlist_create(j->req_nodes);
- hostlist_ranged_string(hl, sizeof(buf), buf);
- xfree(opt.nodelist);
- opt.nodelist = xstrdup(buf);
- hostlist_uniq(hl);
- hostlist_ranged_string(hl, sizeof(buf), buf);
- hostlist_destroy(hl);
- xfree(j->req_nodes);
- j->req_nodes = xstrdup(buf);
- }
- */
- if(opt->ps_distribution == SLURM_DIST_ARBITRARY
- && !j->req_nodes) {
- debug_log(logfp,"With Arbitrary distribution you need to \
- specify a nodelist or hostfile with the -w option");
- return NULL;
- }
- j->exc_nodes = opt->ps_exc_nodes;
- j->partition = opt->ps_partition;
- j->min_nodes = opt->ps_min_nodes;
- if (opt->ps_min_sockets_per_node != NO_VAL)
- j->min_sockets = (uint16_t)opt->ps_min_sockets_per_node;
- if (opt->ps_min_cores_per_socket != NO_VAL)
- j->min_cores = (uint16_t)opt->ps_min_cores_per_socket;
- if (opt->ps_min_threads_per_core != NO_VAL)
- j->min_threads = (uint16_t)opt->ps_min_threads_per_core;
- j->user_id = opt->ps_uid;
- j->dependency = opt->ps_dependency;
- if (opt->ps_nice)
- j->nice = (uint16_t)(NICE_OFFSET + opt->ps_nice);
- j->task_dist = (uint16_t)opt->ps_distribution;
- if (opt->ps_plane_size != NO_VAL)
- j->plane_size = (uint16_t)opt->ps_plane_size;
- j->group_id = opt->ps_gid;
- j->mail_type = opt->ps_mail_type;
-
- if (opt->ps_ntasks_per_node != NO_VAL)
- j->ntasks_per_node = (uint16_t)opt->ps_ntasks_per_node;
- if (opt->ps_ntasks_per_socket != NO_VAL)
- j->ntasks_per_socket = (uint16_t)opt->ps_ntasks_per_socket;
- if (opt->ps_ntasks_per_core != NO_VAL)
- j->ntasks_per_core =(uint16_t)opt->ps_ntasks_per_core;
-
- if (opt->ps_mail_user)
- j->mail_user = strdup(opt->ps_mail_user);
- if (opt->ps_begin)
- j->begin_time = opt->ps_begin;
- if (opt->ps_licenses)
- j->licenses = strdup(opt->ps_licenses);
- if (opt->ps_network)
- j->network = strdup(opt->ps_network);
- if (opt->ps_comment)
- j->comment = strdup(opt->ps_comment);
-
- if (opt->ps_hold)
- j->priority = 0;
- if (opt->ps_jobid != NO_VAL)
- j->job_id = opt->ps_jobid;
-
- #if SYSTEM_DIMENSIONS
- if (opt->ps_geometry[0] > 0) {
- int i;
- for (i=0; i<SYSTEM_DIMENSIONS; i++)
- j->geometry[i] = opt->ps_geometry[i];
- }
- #endif
-
- if (opt->ps_conn_type != (uint16_t) NO_VAL)
- j->conn_type = opt->ps_conn_type;
-
- if (opt->ps_reboot)
- j->reboot = 1;
- if (opt->ps_no_rotate)
- j->rotate = 0;
-
- if (opt->ps_blrtsimage)
- j->blrtsimage = strdup(opt->ps_blrtsimage);
- if (opt->ps_linuximage)
- j->linuximage = strdup(opt->ps_linuximage);
- if (opt->ps_mloaderimage)
- j->mloaderimage = strdup(opt->ps_mloaderimage);
- if (opt->ps_ramdiskimage)
- j->ramdiskimage = strdup(opt->ps_ramdiskimage);
-
- if (opt->ps_max_nodes)
- j->max_nodes = opt->ps_max_nodes;
- if (opt->ps_max_sockets_per_node)
- j->max_sockets = opt->ps_max_sockets_per_node;
- if (opt->ps_max_cores_per_socket)
- j->max_cores = opt->ps_max_cores_per_socket;
- if (opt->ps_max_threads_per_core)
- j->max_threads = opt->ps_max_threads_per_core;
-
- if (opt->ps_job_min_cpus != NO_VAL)
- j->job_min_procs = opt->ps_job_min_cpus;
- if (opt->ps_job_min_sockets != NO_VAL)
- j->job_min_sockets = opt->ps_job_min_sockets;
- if (opt->ps_job_min_cores != NO_VAL)
- j->job_min_cores = opt->ps_job_min_cores;
- if (opt->ps_job_min_threads != NO_VAL)
- j->job_min_threads = opt->ps_job_min_threads;
- if (opt->ps_job_min_memory != NO_VAL)
- j->job_min_memory = opt->ps_job_min_memory;
- if (opt->ps_job_min_tmp_disk != NO_VAL)
- j->job_min_tmp_disk = opt->ps_job_min_tmp_disk;
- if (opt->ps_overcommit) {
- j->num_procs = opt->ps_min_nodes;
- j->overcommit = opt->ps_overcommit;
- } else
- j->num_procs = opt->ps_nprocs * opt->ps_cpus_per_task;
- if (opt->ps_nprocs_set)
- j->num_tasks = opt->ps_nprocs;
-
- if (opt->ps_cpus_set)
- j->cpus_per_task = opt->ps_cpus_per_task;
-
- if (opt->ps_no_kill)
- j->kill_on_node_fail = 0;
- if (opt->ps_time_limit != NO_VAL)
- j->time_limit = opt->ps_time_limit;
- j->shared = opt->ps_shared;
-
- /*
- * srun uses the same listening port for the allocation response
- * message as for all other message.
- * slurmctld_comm_addr structure initialized by slurmctld_msg_init()
- */
- j->alloc_resp_port = slurmctld_comm_addr.port;
- j->other_port = slurmctld_comm_addr.port;
-
- return j;
-}
-
-/*
- * Callback handlers for job allocation.
- */
-static void
-timeout_handler(srun_timeout_msg_t *msg)
-{
- static time_t last_timeout = 0;
-
- if (msg->timeout != last_timeout) {
- last_timeout = msg->timeout;
- debug_log(logfp,"callback--->timeout_handler:");
- debug_log(logfp,"job time limit to be reached at %s",
- ctime(&msg->timeout));
- }
-}
-
-static void
-user_msg_handler(srun_user_msg_t *msg)
-{
- debug_log(logfp,"callback--->usr_msg_handler: %s", msg->msg);
-}
-
-static void
-ping_handler(srun_ping_msg_t *msg)
-{
- debug_log(logfp,"callback--->pingt_handler:");
-}
-
-
-static void
-node_fail_handler(srun_node_fail_msg_t *msg)
-{
- debug_log(logfp,"callback--->node_fail_handler: Node failure on %s", msg->nodelist);
-}
-
-static void
-job_complete_handler(srun_job_complete_msg_t * msg)
-{
- debug_log(logfp,"callback--->job_complete_handler: Force Terminate job\n");
-}
-
-static bool
-wait_retry()
-{
- static int count = 0;
-
- if (count < MAX_RETRIES) {
- sleep(++count);
- return true;
- }else
- return false;
-}
-
-/*
- * Install signo handler.
- */
-static SigFunc *
-xsignal(int signo, SigFunc *f)
-{
- struct sigaction sa, old_sa;
-
- sa.sa_handler = f;
- sigemptyset(&sa.sa_mask);
- sigaddset(&sa.sa_mask, signo);
- sa.sa_flags = 0;
- if (sigaction(signo, &sa, &old_sa) < 0)
- debug_log(logfp,"xsignal(%d) failed: %m", signo);
-
- return old_sa.sa_handler;
-}
-
-/*
- * Signal handler during allocating jobs.
- */
-static void
-signal_while_allocating(int signo)
-{
- destroy_job = 1;
- if (sync_msg_addr && (sync_msg_addr->slurm_jobid > 0))
- slurm_complete_job(sync_msg_addr->slurm_jobid, 0);
-}
-
-
-/*
- * Pending callback during block job allocation.
- */
-static void
-set_pending_jobid(uint32_t id)
-{
- /*
- * This callback can set the jobid even in the case of blocking allocation.
- * So proxy agent can get the slurm jobid and will not block .
- */
- if (sync_msg_addr != NULL) {
- sync_msg_addr->slurm_jobid = (int) id;
- sync_msg_addr->jobid_set = true;
- }
-}
-
-static void
-ignore_signal(int signo)
-{
- /*do nothing*/
-}
-
-/*
- * Release allocated memory in job_desc_msg.
- */
-static void
-destroy_job_desc_msg(job_desc_msg_t * j)
-{
- if (j != NULL) {
- if (j->account != NULL)
- free(j->account);
- if (j->req_nodes != NULL)
- free(j->req_nodes);
- if (j->mail_user != NULL)
- free(j->mail_user);
- if (j->licenses != NULL)
- free(j->licenses);
- if (j->network != NULL)
- free(j->network);
- if (j->comment != NULL)
- free(j->comment);
- if (j->blrtsimage != NULL)
- free(j->blrtsimage);
- if (j->linuximage != NULL)
- free(j->linuximage);
- if (j->mloaderimage != NULL)
- free(j->mloaderimage);
- if (j->ramdiskimage != NULL)
- free(j->ramdiskimage);
-
- free(j);
- }
-}
-
-/*
- * Create a socket to communicate with slurmctld
- * during job allocation. This fd will be closed
- * on executing srun after job allocation.
- */
-slurm_fd
-slurm_init_msg_engine_port(uint16_t port)
-{
- slurm_addr addr;
-
- int fd;
- int rc;
- const int one = 1;
- const size_t sz1 = sizeof(one);
-
- addr.sin_family = AF_INET;
- addr.sin_port = htons(port);
- addr.sin_addr.s_addr = htonl(INADDR_ANY);
-
- if ((fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
- debug_log(logfp,"create slurmctld socket error\n");
- return fd;
- }
- rc = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,&one,sz1);
- if (rc < 0) {
- goto error;
- }
- rc = bind(fd, &addr, sizeof(addr));
- if (rc < 0) {
- goto error;
- }
- rc = listen(fd, 128);
- if(rc < 0) {
- goto error;
- }
-
- return fd;
-
-error:
- if ((close(fd) < 0) && (errno == EINTR))
- close(fd); /*try again*/
- return rc;
-}
-
-
-/*
- * Init socket fd to handle message from slurmctld.
- */
-slurm_fd
-slurmctld_msg_init(srun_opt_t * opt)
-{
- slurm_addr slurm_address;
- uint16_t port;
- static slurm_fd slurmctld_fd = 0;
- socklen_t name_len;
- int fval;
- int rc;
-
- if (slurmctld_fd)
- return slurmctld_fd;
-
- slurmctld_fd = -1;
- slurmctld_comm_addr.hostname = NULL;
- slurmctld_comm_addr.port = 0;
-
- /* open socket */
- if ((slurmctld_fd = slurm_init_msg_engine_port(0)) < 0) {
- debug_log(logfp, "slurm_init_msg_engine_port error\n");
- return -1;
- }
-
- /* get socket port number */
- name_len = sizeof(slurm_address);
- if ((rc = getsockname(slurmctld_fd, &slurm_address, &name_len)) < 0) {
- debug_log(logfp, "getsockname error\n");
- return -1;
- }
-
- /* set non-blocking */
- fval = fcntl(slurmctld_fd, F_GETFL, 0);
- fcntl(slurmctld_fd, F_SETFL, fval|O_NONBLOCK);
-
- /* set FD_CLOEXEC: close slurmctld_fd when exec(srun) after allocation */
- fval = fcntl(slurmctld_fd, F_GETFD, 0);
- fcntl(slurmctld_fd, F_SETFD, fval|FD_CLOEXEC);
-
- /* set global var.: slurmctld_comm_addr */
- slurmctld_comm_addr.hostname = strdup(opt->ps_ctrl_comm_ifhn);
- port = ntohs(slurm_address.sin_port);
- slurmctld_comm_addr.port = port;
-
- return slurmctld_fd;
-}
-
-/*
- * Allocate job resource in response to SubmitJob cmd.
- * Called in child process
- */
-static resource_allocation_response_msg_t *
-allocate_nodes(srun_opt_t *opt)
-{
- resource_allocation_response_msg_t *resp = NULL;
- slurm_allocation_callbacks_t callbacks;
-
- slurmctld_msg_init(opt);
- job_desc_msg_t *j = create_job_desc_msg_from_opts(opt);
- if (!j)
- return NULL;
-
- /*
- * Do not re-use existing job id when submitting new job
- * from within a running job
- */
- if ((j->job_id != NO_VAL) && !opt->ps_jobid_set) {
- if (!opt->ps_jobid_set) /* Let slurmctld set jobid */
- j->job_id = NO_VAL;
- }
- callbacks.ping = ping_handler;
- callbacks.timeout = timeout_handler;
- callbacks.job_complete = job_complete_handler;
- callbacks.user_msg = user_msg_handler;
- callbacks.node_fail = node_fail_handler;
-
- /* create message thread to handle pings and such from slurmctld */
- msg_thr = slurm_allocation_msg_thr_create(&j->other_port, &callbacks);
-
- xsignal(SIGHUP, signal_while_allocating);
- xsignal(SIGINT, signal_while_allocating);
- xsignal(SIGQUIT, signal_while_allocating);
- xsignal(SIGPIPE, signal_while_allocating);
- xsignal(SIGTERM, signal_while_allocating);
- xsignal(SIGUSR1, signal_while_allocating);
- xsignal(SIGUSR2, signal_while_allocating);
-
-// while (!resp)
- {
- /*
- * BLOCK unitl allocation granted or interrupt by signal
- * if allocation blocked/pending,
- * the jobid can be returned to parent by 'set_pending_jobid' callback
- */
- resp = slurm_allocate_resources_blocking(j, 0, set_pending_jobid);
- if (resp == NULL)
- debug_log(logfp, "blocking job allocate error!\n");
-// if (destroy_job) /* interrupt by signal */
-// break;
-// else if(!resp && !wait_retry()) /* time out */
-// break;
- }
-
-
- xsignal(SIGHUP, ignore_signal);
- xsignal(SIGINT, ignore_signal);
- xsignal(SIGQUIT, ignore_signal);
- xsignal(SIGPIPE, ignore_signal);
- xsignal(SIGTERM, ignore_signal);
- xsignal(SIGUSR1, ignore_signal);
- xsignal(SIGUSR2, ignore_signal);
-
- destroy_job_desc_msg(j);
- return resp;
-}
-
-static int
-handle_attach_debug()
-{
- return 0;
-}
-
-static int
-handle_debug()
-{
- return 0;
-}
-
-/*
- * Create a thread to retrieve srun's stdout/stderr,
- * and send to ptp ui.
- */
-static int
-create_iothread(ptp_job * job)
-{
- pthread_attr_t attr;
- pthread_t iothread_id;
- int rc;
-
- pthread_attr_init(&attr);
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- if (pthread_create(&iothread_id, &attr, srun_output_forwarding, (void *)job) == 0 ) {
- job->iothread_id = iothread_id;
- debug_log(logfp, "iothread created for job[%d].\n", job->slurm_jobid);
- rc = 0;
- } else {
- debug_log(logfp,"error on creating iothread for job[%d].\n", job->slurm_jobid);
- rc = -1;
- }
-
- return rc;
-}
-
-/*
- * Allocate job resource if necessary, launch job
- * and forward job stdout/stderr to ptp ui.
- */
-static int
-allocate_and_launch_job(int trans_id, char * jobsubid, ptp_job * in, srun_opt_t * opt, int srun_argc, char * srun_argv[])
-{
- int i;
- int shmid;
- int fd_out[2];
- int fd_err[2];
- bool need_alloc;
- pid_t pid;
- int rc;
- char * ptr;
- sync_msg * pp, *pc;
- char * msg;
- ptp_job * job;
- char * name;
- ptp_process * p;
- int node_id = -1;
- int task_id = -1;
- int proc_pid = -1;
- ptp_machine * m;
- ptp_node * n;
- int kill_jobid = -1;
- int allocated_jobid = -1;
- resource_allocation_response_msg_t * resp = NULL;
-
- /* create a shared memory region to communiate/synchronize with child process */
- if ((shmid = shmget(IPC_PRIVATE, sizeof(sync_msg), SHM_R|SHM_W)) < 0) {
- debug_log(logfp,"error on creating shared memory\n");
- return -1;
- }
- /* init shm */
- pp = (sync_msg *)shmat(shmid, 0, 0);
- pp->slurm_jobid = JOBID_INIT;
- pp->jobid_set = false;
- pp->io_ready = false;
-
- pipe(fd_out);
- pipe(fd_err);
-
- if (opt->ps_jobid == NO_VAL && opt->ps_jobid_set == false)
- need_alloc = true;
- else {
- need_alloc = false;
- allocated_jobid = opt->ps_jobid;
- }
-
- switch (pid = fork()) {
- case 0: /* child: allocate job if necessary and launch job via srun */
- /* attach shm */
- pc = (sync_msg *)shmat(shmid, 0, 0);
- /*
- * save shm addr in a global variable.
- * if job allocation blocked, SLURM callback can store the pending job id at this addr,
- * so parent can get the slurm jobid without blocking.
- */
- sync_msg_addr = pc;
-
- if (need_alloc) { /* require new job allocation */
- resp = allocate_nodes(opt);
- if (resp == NULL || resp->node_list == NULL) { /* allocation fail, rarely happen */
- pc->slurm_jobid = JOBID_FAIL;
- pc->jobid_set = true;
- shmdt(pc);
- exit(EXIT_JOB_ALLOC_FAIL);
- }
-
- /* allocation granted */
- if (pc->jobid_set == false) {
- pc->slurm_jobid = resp->job_id;
- pc->jobid_set = true;
- }
-
- kill_jobid = resp->job_id;
-
- asprintf(&ptr,"%d",(int)resp->job_id);
- /* srun will no more allocate resource if SLURM_JOBID set. */
- setenv("SLURM_JOBID", ptr, 1);
- free(ptr);
- if (resp)
- slurm_free_resource_allocation_response_msg(resp);
- }
- else {
- /*
- * run in allocated job (required by ATTACH debug)
- */
- pc->slurm_jobid = allocated_jobid;
- pc->jobid_set = true;
- asprintf(&ptr,"%d",allocated_jobid);
- setenv("SLURM_JOBID", ptr, 1);
- free(ptr);
- }
- /*
- * BLOCK until parent sets io_ready to true,
- * which means the io thread is ready.
- * Parent sets this flag after getting jobid and create iothread.
- */
- while (!pc->io_ready && wait_retry()) {
- continue;
- }
-
- if (!pc->io_ready) {
- if (need_alloc){
- //slurm_complete_job(kill_jobid, 0);
- slurm_kill_job(kill_jobid, SIGKILL, 0);
- }
- shmdt(pc);
- debug_log(logfp, "child exits due to iothread fail\n");
- exit(EXIT_JOB_IOTHREAD_FAIL);
- } else { /* io thread ready */
- shmdt(pc);
- /* redirect srun's stdout and stderr */
- close(fd_out[0]);
- close(fd_err[0]);
- /* job stdout+stderr ==> srun's stdout */
- dup2(fd_out[1],1);
- /* srun outputs ==> srun's stderr */
- dup2(fd_err[1],2);
- /* spawn job with srun cmd */
- rc = execvp(srun_argv[0], srun_argv);
- if (rc < 0) {/* rarely happens */
- if (need_alloc) {
- //slurm_complete_job(kill_jobid, 0);
- slurm_kill_job(kill_jobid, SIGKILL, 0);
- }
- debug_log(logfp,"srun exec fail\n");
- exit(EXIT_EXEC_FAIL);
- }
- }
- break;
- case -1:/* error */
- debug_log(logfp,"child fork error\n");
- close(fd_out[0]);
- close(fd_out[1]);
- close(fd_err[0]);
- close(fd_err[1]);
- if (pp)
- shmdt(pp);
- shmctl(shmid,IPC_RMID, 0);
- return -1;
- default:/* parent */
- /*
- * BLOCK until child set the slurm jobid
- */
- while (!pp->jobid_set && wait_retry()) {
- continue;
- }
- if (!pp->jobid_set || pp->slurm_jobid == JOBID_FAIL) {
- msg = "Job allocation fail!\nPlease check RMS and job config parameters!";
- debug_log(logfp, msg);
- sendJobSubErrorEvent(trans_id, jobsubid, msg);
- close(fd_out[0]);
- close(fd_out[1]);
- close(fd_err[0]);
- close(fd_err[1]);
- shmdt(pp);
- kill(pid, SIGKILL);
- shmctl(shmid, IPC_RMID, 0);
- return -1;
- }
-
- /* ceate job structure after getting slurm jobid */
- in->slurm_jobid = pp->slurm_jobid;
- job = new_job(in->num_procs, in->debug, in->ptp_jobid, in->slurm_jobid, in->debug_jobid, need_alloc);
- job->srun_pid = pid;
-
-
- /* send OK event for SubmitJob cmd */
- sendOKEvent(trans_id);
-
- /* send NewJob event */
- asprintf(&name, SLURM_JOB_NAME_FMT, job->slurm_jobid);
- sendNewJobEvent(gTransID, job->ptp_jobid, name, jobsubid, JOB_STATE_INIT);
- free(name);
-
- /*
- * As required by ptp ui,
- * one NewProcess Event MUST be sent for each process of this new job.
- */
- task_id = 0;
- node_id = 0;
- proc_pid = 0;
- SetList(gMachineList);
- /* By now, only 1 machine is supported */
- m = (ptp_machine *)GetFirstElement(gMachineList);
- SetList(m->nodes);
- n = (ptp_node *)GetListElement(m->nodes);
- node_id = n->id; /* node_id calculated by generateid() */
-
- for (i = 0; i < job->num_procs; i++) {
- /*
- * SLURM provide no API to get pid ,node_id and task_id.
- * And these information can obtained ONLY after job launching.
- * So FAKE them by now.
- * sendNewProcessEvent() shouldn't make use of these fileds.
- * FIXME:
- * call slurm_job_step_layout_get() to obtain such information
- * and send to ui via sendProcessChangeEvent
- */
- p = new_process(job, node_id, task_id, proc_pid);
- sendNewProcessEvent(gTransID, job->ptp_jobid, p, PROC_STATE_STARTING);
- task_id += 1;
- proc_pid += 1;
- }
-
- close(fd_out[1]);
- close(fd_err[1]);
- job->fd_out = fd_out[0];
- job->fd_err = fd_err[0];
-
- /*
- * Create io thread to manage srun's stderr and stdout
- * Don't start it before sending the NewProcess events!
- */
- if (create_iothread(job) == 0) {
- pp->io_ready = true;
- } else {
- pp->io_ready = false;
- job->iothread_exit = true;
- }
- shmdt(pp);
- shmctl(shmid, IPC_RMID, 0);
- return 0;
- }
-
- return 0;
-}
-
-/*
- * Search $CWD and $PATH dir and return the absolute path of cmd.
- */
-static char *
-get_path(char * cmd, char * cwd, int mode)
-{
- char * path = NULL;
- char * fullpath = NULL;
- char * c;
- char * ptr;
-
- if ( (cmd[0] == '.' || cmd[0] == '/')
- && access(cmd, mode) == 0) {
- if (cmd[0] == '.')
- asprintf(&fullpath,"%s/%s",cwd,cmd);
- else
- asprintf(&fullpath,cmd);
- } else {
- /* search $PATH */
- path = getenv("PATH");
- if (path != NULL) {
- c = ptr = path;
- while((c=strchr(ptr,':')) != NULL) {
- *c = '\0';
- asprintf(&fullpath, "%s/%s",ptr,cmd);
- if (access(fullpath, mode) == 0)
- break;
- else {
- free(fullpath);
- fullpath = NULL;
- ptr = c + 1;
- }
- }
- /* handle the last element */
- if (*ptr != '\0') {
- asprintf(&fullpath, "%s/%s",ptr,cmd);
- if (access(fullpath, mode) != 0) {
- free(fullpath);
- fullpath = NULL;
- }
- }
- }
- }
- return fullpath;
-}
-
-ssize_t fd_read_line(int fd, void *buf, size_t maxlen)
-{
- ssize_t n, rc;
- unsigned char c, *p;
-
- n = 0;
- p = buf;
- while (n < maxlen - 1) { /* reserve space for NUL-termination */
- if ((rc = read(fd, &c, 1)) == 1) {
- n++;
- *p++ = c;
- if (c == '\n')
- break; /* store newline, like fgets() */
- }else if (rc == 0) {
- if (n == 0) /* EOF, no data read */
- return(0);
- else /* EOF, some data read */
- break;
- }else {
- if (errno == EINTR)
- continue;
- return(-1);
- }
- }
-
- *p = '\0'; /* NULL-terminate, like fgets() */
- return(n);
-}
-
-/*
- * Forwarding srun's stdout to ptp ui
- * FIXME:
- * How about srun's stderr? By now, it's ignored.
- */
-void *
-srun_output_forwarding(void * arg)
-{
- int fd = -1;
- char * ptr;
- ptp_job * job;
- int task_id;
- fd_set rfds;
- struct timeval tv;
- char buf[MAX_BUF_SIZE];
- FILE * fp = NULL;
- int cancel_state;
- int cancel_type;
- int ret;
- char * p;
- pid_t cpid;
- int status;
-
- pthread_setcancelstate(PTHREAD_CANCEL_ENABLE,&cancel_state);
- pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, &cancel_type);
-
- job = (ptp_job *)arg;
- job->iothread_exit = false;
- /* By now only focus on job stdout */
- fd = job->fd_out;
-
- while (1)
- {
- if (job->iothread_exit_req) {
- debug_log(logfp, "job[%d] iothread exit on exit_request.\n", job->slurm_jobid);
- job->iothread_exit = true;
- if (fp)
- fclose(fp);
- pthread_exit(NULL);
- }
-
- tv.tv_sec = 0;
- tv.tv_usec = 5000;
-
- /*
- * if timeout, the rfds will be cleared
- * rfds must be set in each iteration
- */
- FD_ZERO(&rfds);
- FD_SET(fd, &rfds);
- ret = select(fd+1,&rfds,NULL,NULL,&tv);
-
- switch(ret)
- {
- case -1: /* error */
- debug_log(logfp,"job[%d] iothread exit on select error\n",job->slurm_jobid);
- if (fp)
- fclose(fp);
- job->iothread_exit = true;
- pthread_exit(NULL);
- break;
-
- case 0: /* timeout */
- //debug_log(logfp,"select timeout\n");
- break;
-
- default: /* fd ready */
- if (fp == NULL)
- fp = fdopen(fd,"r");
- if (fgets(buf, sizeof(buf), fp) != NULL) {
- //if ((rc = fd_read_line(fd, buf, sizeof(buf)))> 0 ) {
- p = buf;
- /* get task id from srun label */
- task_id = atoi(p);
- ptr = strchr(p, ':');
- ptr ++;
- if (ptr != NULL) {
- //debug_log(logfp,"send task[%d] output to ptp ui\n", task_id);
- /*
- * no synchronization needed
- * since the event list is internally protected by pthread_mutex
- */
- ptp_process * proc;
- proc = find_process(job, task_id);
- sendProcessOutputEvent(gTransID, proc->id, ptr);
- } else
- debug_log(logfp,"process label not found\n");
- } else { /* error or EOF of pipe(write end closed) */
- debug_log(logfp,"EOF of pipe\n");
- if (fp)
- fclose(fp);
- job->iothread_exit = true;
- cpid = waitpid(job->srun_pid, &status, 0);
- if (cpid == job->srun_pid) {
- if (WIFEXITED(status)) {
- if (job->need_alloc)
- slurm_complete_job(job->slurm_jobid, 0);
- debug_log(logfp, "srun exit code:%d\n", WEXITSTATUS(status));
- }
- else if (WIFSIGNALED(status)) {
- if (job->need_alloc)
- slurm_kill_job(job->slurm_jobid, SIGKILL, 0);
- debug_log(logfp, "srun terminated by signal[%d]\n", WTERMSIG(status));
- }
- pthread_exit(NULL);
- }
- }
- break;
- }
- }
-
- return NULL;
-}
-
-/*
- * Delete removable job fro gJobList.
- */
-static void
-purge_global_joblist()
-{
- ptp_job * j;
-
- for (SetList(gJobList); (j = (ptp_job *)GetListElement(gJobList)) != NULL; ) {
- if (j->iothread_exit && !slurm_job_active(j))
- j->removable = true;
- if (j->removable) {
- RemoveFromList(gJobList, j);
- free_job(j);
- }
- }
- return;
-}
-
-
-/******************************
- * START OF DISPATCH ROUTINES *
- ******************************/
-
-int
-SLURM_Initialize(int trans_id, int nargs, char **args)
-{
- int i;
- int primary = 1;
- int secondary = 2;
- long version;
-
- debug_log(logfp, "SLURM_Initialize (%d):\n", trans_id);
-
- if (proxy_state != STATE_INIT) {
- sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "Already initialized");
- return PROXY_RES_OK;
- }
-
- for (i = 0; i < nargs; i++) {
- if (proxy_test_attribute(PROTOCOL_VERSION_ATTR, args[i])) {
- if (strcmp(proxy_get_attribute_value_str(args[i]), WIRE_PROTOCOL_VERSION) != 0) {
- sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "Wire protocol version \"%s\" not supported", args[0]);
- return PROXY_RES_OK;
- }
- } else if (proxy_test_attribute(BASE_ID_ATTR, args[i]))
- gBaseID = proxy_get_attribute_value_int(args[i]);
- }
-
- if (gBaseID < 0) {
- sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "No base ID supplied");
- return PROXY_RES_OK;
- }
-
- /* confirm slurmctld works well via slurm_ping */
- if (slurm_ping(primary) && slurm_ping(secondary)) {
- sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "No response from slurmctld. Check SLURM RMS!");
- return PROXY_RES_OK;
- }
- /*
- * SLURM version verfication,
- * Should work on more versions supporting used API.
- */
- version = slurm_api_version();
- if (version < SLURM_VERSION_NUM(1,3,4)) {
- sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "SLURM version number too low");
- return PROXY_RES_OK;
- }
-
- proxy_state = STATE_RUNNING;
- sendOKEvent(trans_id);
-
- return PROXY_RES_OK;
-}
-
-/*
- * Init the model definition phase.
- */
-int
-SLURM_ModelDef(int trans_id, int nargs, char **args)
-{
- debug_log(logfp, "SLURM_ModelDef (%d):\n", trans_id);
-
- sendOKEvent(trans_id);
- return PROXY_RES_OK;
-}
-
-int
-SLURM_StopEvents(int trans_id, int nargs, char **args)
-{
- debug_log(logfp, "SLURM_StopEvents (%d):\n", trans_id);
-
- /* Notify that tartEvents complete */
- sendOKEvent(gTransID);
- gTransID = 0;
- sendOKEvent(trans_id);
- return PROXY_RES_OK;
-}
-
-
-/*
- * Submit a job with the given executable path and arguments.
- * (1)Process cmd arguments;
- * (2)Distinguish between debug job and non-debug job;
- * (3)Allocate resource and spawn job step.
- */
-int
-SLURM_SubmitJob(int trans_id, int nargs, char **args)
-{
- int i,k;
- int num_args = 0;
- int num_env = 0;
- char * jobsubid = NULL; /* jobid assigned by RMS(ui) */
-
- /* srun options: -n, -N, -t, -p, -l, -v, --jobid, -w, -x, --job_type */
- int num_procs = 0; /* -n: number of tasks to run*/
- int num_nodes = 0; /* -N: number of nodes on which to run (N=min[-max]) */
- int tlimit = -1; /* -t: time limit */
- bool tlimit_set = false;
- char * partition = NULL; /* -p: partition requested */
- bool partition_set = false;
- bool io_label = false; /* -l: prepend task number to lines of stdout/err */
- bool io_label_set = false;
- bool verbose = false; /* -v:verbose mode */
- bool verbose_set = false;
- char * node_list=NULL; /* -w: request a specific list of hosts */
- bool nodelist_set = false;
- int allocated_jobid; /* --jobid: run under already allocated job */
- bool jobid_set = false;
- char * jobtype = NULL; /* --job_type:mpi,omp,serial */
- bool jobtype_set = false;
-
- char * full_path = NULL;
- char * cwd = NULL;
- char * exec_path = NULL; /* PATH of executable */
- char * pgm_name = NULL;
-
- /* debug job support */
- bool debug = false;
- int debug_argc = 0;
- int attach_mode;
- char * debug_exec_name = NULL;
- char * debug_exec_path = NULL;
- char * debug_full_path;
- char ** debug_args = NULL;
-
- int srun_argc = 0;
- char ** srun_argv = NULL;
- int ret;
- int ptpid = generate_id();
-
- debug_log(logfp, "SLURM_SubmitJob (%d):\n", trans_id);
- /* Process job submit args */
- debug_log(logfp, "job submit commands:\n");
- for (i = 0; i < nargs; i++) {
- debug_log(logfp, "\t%s\n", args[i]);
- if (proxy_test_attribute(SLURM_JOB_SUB_ID_ATTR, args[i])) {
- jobsubid = proxy_get_attribute_value_str(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_NUM_PROCS_ATTR, args[i])) {
- num_procs = proxy_get_attribute_value_int(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_NUM_NODES_ATTR, args[i])) {
- num_nodes = proxy_get_attribute_value_int(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_TIME_LIMIT_ATTR, args[i])) {
- tlimit_set = true;
- tlimit = proxy_get_attribute_value_int(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_PARTITION_ATTR, args[i])) {
- partition_set = true;
- partition = proxy_get_attribute_value_str(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_IOLABEL_ATTR, args[i])) {
- io_label_set = true;
- io_label = proxy_get_attribute_value_bool(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_VERBOSE_ATTR, args[i])) {
- verbose_set = true;
- verbose = proxy_get_attribute_value_bool(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_ID_ATTR, args[i])) {
- jobid_set = true;
- allocated_jobid = proxy_get_attribute_value_int(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_TYPE_ATTR, args[i])) {
- jobtype_set = true;
- jobtype = proxy_get_attribute_value_str(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_NODELIST_ATTR, args[i])) {
- nodelist_set = true;
- node_list = proxy_get_attribute_value_str(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_EXEC_NAME_ATTR, args[i])) {
- pgm_name = proxy_get_attribute_value_str(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_EXEC_PATH_ATTR, args[i])) {
- exec_path = proxy_get_attribute_value_str(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_WORKING_DIR_ATTR, args[i])) {
- cwd = proxy_get_attribute_value_str(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_PROG_ARGS_ATTR, args[i])) {
- num_args++;
- } else if (proxy_test_attribute(SLURM_JOB_ENV_ATTR, args[i])) {
- num_env++;
- } else if (proxy_test_attribute(SLURM_JOB_DEBUG_ARGS_ATTR, args[i])) {
- debug_argc++;
- } else if (proxy_test_attribute(SLURM_JOB_DEBUG_FLAG_ATTR, args[i])) {
- debug = proxy_get_attribute_value_bool(args[i]);
- }
- }
-
- /* Do some checking first */
- if (jobsubid == NULL) {
- sendErrorEvent(trans_id, RTEV_ERROR_SLURM_SUBMIT, "missing ID on job submission");
- return PROXY_RES_OK;
- }
- if (proxy_state != STATE_RUNNING) {
- sendJobSubErrorEvent(trans_id, jobsubid, "must call INIT first");
- return PROXY_RES_OK;
- }
- if (nargs < 1) {
- sendJobSubErrorEvent(trans_id, jobsubid, "incorrect arg count");
- return PROXY_RES_OK;
- }
- if (pgm_name == NULL) {
- sendJobSubErrorEvent(trans_id, jobsubid, "must specify a program name");
- return PROXY_RES_OK;
- }
- if (num_procs <= 0) {
- sendJobSubErrorEvent(trans_id, jobsubid, "must specify number of task to launch");
- return PROXY_RES_OK;
- }
-
- /*
- * Process environment variables.
- * Environment variables will be brought to compute node
- * by SLURM before launching job.
- */
- if (num_env > 0) {
- for (i = 0; i < nargs; i++) {
- if (proxy_test_attribute(SLURM_JOB_ENV_ATTR, args[i]))
- putenv(proxy_get_attribute_value_str(args[i]));
- }
- }
- /* locate execuable */
- if (exec_path == NULL) {
- full_path = get_path(pgm_name, cwd, X_OK);
- if (full_path == NULL) {
- sendJobSubErrorEvent(trans_id, jobsubid, "executable not found");
- return PROXY_RES_OK;
- }
- } else
- asprintf(&full_path, "%s/%s", exec_path, pgm_name);
- /* check access right */
- if (access(full_path, X_OK) < 0) {
- sendJobSubErrorEvent(trans_id, jobsubid, strerror(errno));
- if (full_path != NULL)
- free(full_path);
- return PROXY_RES_OK;
- }
-
- /* allocate space for srun args */
- srun_argv = (char **)malloc(sizeof(char *)*MAX_SRUN_ARG_NUM);
- if (srun_argv == NULL) {
- debug_log(logfp, "memory allocation for srun_argv fail");
- sendJobSubErrorEvent(trans_id, jobsubid, "memory allocation for srun_args fail");
- return PROXY_RES_OK;
- }
-
- /*
- *FIXME: more debug job support will be added soon.
- */
- /****************handle debug job*****************/
- if (debug) {
- debug_argc++;
- debug_args = (char **)malloc((debug_argc+1) * sizeof(char *));
- for (i = 0, k = 1; i < nargs; i++) {
- if (proxy_test_attribute(SLURM_JOB_DEBUG_ARGS_ATTR, args[i])) {
- debug_args[k++] = proxy_get_attribute_value_str(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_DEBUG_EXEC_NAME_ATTR, args[i])) {
- debug_exec_name = proxy_get_attribute_value_str(args[i]);
- } else if (proxy_test_attribute(SLURM_JOB_DEBUG_EXEC_PATH_ATTR, args[i])) {
- debug_exec_path = proxy_get_attribute_value_str(args[i]);
- }
- }
- debug_args[k] = NULL;
-
- /*
- * If no path specified, try to locate execuable.
- */
- if (debug_exec_path == NULL) {
- debug_full_path = get_path(debug_exec_name, cwd, X_OK);
- if (debug_full_path == NULL) {
- sendJobSubErrorEvent(trans_id, jobsubid, "Debugger executuable not found");
- return PROXY_RES_OK;
- }
- } else {
- asprintf(&debug_full_path, "%s/%s", debug_exec_path, debug_exec_name);
- }
-
- if (access(debug_full_path, X_OK) < 0) {
- sendJobSubErrorEvent(trans_id, jobsubid, strerror(errno));
- if (debug_full_path != NULL)
- free(debug_full_path);
- return PROXY_RES_OK;
- }
-
- debug_args[0] = strdup(debug_full_path);
- if (debug_full_path != NULL)
- free(debug_full_path);
- }
- /*******************************************************/
-
- /* set default srun options */
- set_srun_options_defaults(&opt);
-
- /*
- * change srun options based on SubmitJob cmd args
- * and prepare srun_argc,srun_argv
- */
- int index = 0;
- srun_argv[index++] = strdup("srun");
-
- if (num_procs > 0) {
- opt.ps_nprocs = num_procs;
- opt.ps_nprocs_set = true;
- asprintf(&(srun_argv[index]), "--ntasks=%d", opt.ps_nprocs);
- index += 1;
- }
- if (num_nodes > 0) {
- opt.ps_min_nodes = num_nodes;
- opt.ps_nodes_set = true;
- asprintf(&(srun_argv[index]), "--nodes=%d", opt.ps_min_nodes);
- index += 1;
- }
- if (tlimit_set) {
- opt.ps_time_limit = tlimit;
- asprintf(&(srun_argv[index]), "--time=%d", opt.ps_time_limit);
- index += 1;
- }
- if (partition_set) {
- opt.ps_partition = partition;
- asprintf(&(srun_argv[index]), "--partition=%s", opt.ps_partition);
- index += 1;
- }
- /* To distinguish task stdout, this option MUST be set */
- io_label_set = true;
- if (io_label_set) {
- opt.ps_labelio = io_label;
- asprintf(&(srun_argv[index]), "--label");
- index += 1;
- }
- if (verbose_set) {
- asprintf(&(srun_argv[index]), "--verbose");
- index += 1;
- }
- if (jobid_set) {
- opt.ps_jobid = allocated_jobid;
- opt.ps_jobid_set = true;
- asprintf(&(srun_argv[index]), "--jobid=%d", opt.ps_jobid);
- index += 1;
- }
-
- /*if (jobtype_set) {
- opt.ps_jobtype = jobtype;
- asprintf(&(srun_argv[index]), "--jobtype=%s", opt.ps_jobtype);
- index += 1;
- }
- */
- if (nodelist_set) {
- opt.ps_nodelist = strdup(node_list);
- opt.ps_nodes_set = true;
- asprintf(&(srun_argv[index]), "--nodelist=%s", opt.ps_nodelist);
- index += 1;
- }
-
- if (cwd) {
- if (opt.ps_cwd != NULL)
- free(opt.ps_cwd);
- opt.ps_cwd = strdup(cwd);
- opt.ps_cwd_set = true;
- }
-
- opt.ps_progname = full_path;
- /* set job name,otherwise be NULL */
- opt.ps_job_name = basename(full_path);
- asprintf(&(srun_argv[index]), "%s", opt.ps_progname);
- index += 1;
-
- /* program name followd by args */
- if (num_args > 0) {
- for (i = 0; i < nargs; i++) {
- if (proxy_test_attribute(SLURM_JOB_PROG_ARGS_ATTR, args[i])) {
- asprintf(&(srun_argv[index]), "%s", proxy_get_attribute_value_str(args[i]));
- index += 1;
- }
- }
- }
- srun_argv[index] = NULL; /* mark the end of srun_argv[] */
-
- srun_argc = index;
- debug_log(logfp, "srun cmd:");
- for (i = 0; i < srun_argc; i++)
- debug_log(logfp,"%s ",srun_argv[i]);
- debug_log(logfp, "\n");
-
-
- /*
- * FIXME: By now, debug job is not supported.
- */
- if (debug) {
- if (attach_mode) {
- ret = handle_attach_debug();
- } else {
- ret = handle_debug();
- }
- } else {
- ptp_job j;
- j.debug = debug;
- j.ptp_jobid = ptpid; /* model element id generated by proxy agent */
- j.num_procs = num_procs;
- allocate_and_launch_job(trans_id, jobsubid, &j, &opt, srun_argc, srun_argv);
- free_opt(&opt);
- free_srun_argv(srun_argc,srun_argv);
- }
-
- return PROXY_RES_OK;
-}
-
-/*
- * Cancel job, given ptp jobid (not slurm jobid).
- */
-int
-SLURM_TerminateJob(int trans_id, int nargs, char **args)
-{
- int i;
- int ptp_jobid = -1;
- ptp_job * j;
-
-
- if (proxy_state != STATE_RUNNING) {
- sendErrorEvent(trans_id, RTEV_ERROR_JOB, "must call INIT first");
- return PROXY_RES_OK;
- }
-
- for (i = 0; i < nargs; i++) {
- if (proxy_test_attribute(JOB_ID_ATTR, args[i])) {
- ptp_jobid = proxy_get_attribute_value_int(args[i]);
- break;
- }
- }
-
- if (ptp_jobid < 0) {
- sendJobTerminateErrorEvent(trans_id, ptp_jobid, "invalid jobid ");
- return PROXY_RES_OK;
- }
-
- /* convert ptp jobid to slurm jobid */
- if ((j = find_job(ptp_jobid, PTP_JOBID)) != NULL) {
- /*
- * Kill all job steps and request iothread to exit.
- * Removing job structure from the global job list
- * is left to purge_global_joblist().
- */
- kill(j->srun_pid, SIGKILL);
- j->iothread_exit_req = true;
- if (j->need_alloc) {
- slurm_kill_job(j->slurm_jobid, SIGKILL, 0);
- }
- }
- sendOKEvent(trans_id);
-
- return PROXY_RES_OK;
-}
-
-/*
- * Enable sending of events.
- * The first msg that must be sent is a description of the model.
- * This comprises NEW model element events
- * (NewMachine, NewNode, NewQueue) for each element in the model.
- * Once the model description has been sent, model change events will be sent as detected.
- */
-int
-SLURM_StartEvents(int trans_id, int nargs, char **args)
-{
- int num_machines;
- int m;
- ptp_machine * mach;
- int num_nodes;
-
- debug_log(logfp, "SLURM_StartEvents (%d):\n", trans_id);
-
- if (proxy_state != STATE_RUNNING) {
- sendErrorEvent(trans_id, RTEV_ERROR_SLURM_INIT, "Must call INIT first");
- return PROXY_RES_OK;
- }
-
- /* NodeChange, JobChange event use gTransID as TID to match START_EVENTS cmd */
- gTransID = trans_id;
-
- /*
- * FIXME: how to handle partition information in SLURM?
- */
- num_machines = get_num_machines();
- for(m = 0; m < num_machines; m++) {
- mach = new_machine();
- /* NewMachine element */
- sendNewMachineEvent(trans_id, mach->id, get_machine_name(m));
- num_nodes = get_num_nodes(mach->id);
- if(create_node_list(mach)) {
- sendErrorEvent(trans_id, RTEV_ERROR_NATTR, "Fail to create nodelist");
- return PROXY_RES_OK;
- }
- /* NewNode element */
- sendNewNodeEvent(trans_id, mach->id, mach);
- }
- /* NewQueue element */
- sendNewQueueEvent(trans_id);
-
- /* From now on, job state and node state update msg can be sent */
- enable_state_update = true;
-
- return PROXY_RES_OK;
-}
-
-
-/*
- * Compitable interface.
- * Proxy not allowed to stop SLURM rms.
- */
-int
-SLURM_Quit(int trans_id, int nargs, char **args)
-{
- int old_state = proxy_state;
-
- debug_log(logfp, "SLURM_Quit called\n");
-
- proxy_state = STATE_SHUTTING_DOWN;
- if (old_state == STATE_RUNNING)
- do_slurm_shutdown();
-
- sendShutdownEvent(trans_id);
-
- return PROXY_RES_OK;
-}
-
-/******************************
- * END OF DISPATCH ROUTINES *
- ******************************/
-
-/*
- * Init jobstate_update_timer.
- */
-static void
-init_job_timer()
-{
- gettimeofday(&job_update_timer, NULL);
- return;
-}
-
-/*
- * Init nodestate_update_timer.
- */
-static void
-init_node_timer()
-{
- gettimeofday(&node_update_timer, NULL);
- return;
-}
-
-/*
- * Check if timer expires given timeout value.
- */
-static bool
-update_timeout(int timer_id, const int timeout)
-{
- struct timeval * timer;
- struct timeval now;
- int val;
- bool rc = false;
-
- switch (timer_id) {
- case JOB_UPDATE_TIMER:
- timer = &job_update_timer;
- break;
- case NODE_UPDATE_TIMER:
- timer = &node_update_timer;
- break;
- default:
- return false;
- }
- gettimeofday(&now, NULL);
- val = (now.tv_sec - timer->tv_sec) * 1000000 + (now.tv_usec - timer->tv_usec) - timeout;
- if (val >= 0) {
- /* update timer */
- gettimeofday(timer, NULL);
- rc = true;
- }
-
- return rc;
-}
-
-/*
- * Wrapper routine to check job_update_timer.
- */
-static bool
-job_update_timeout()
-{
- return update_timeout(JOB_UPDATE_TIMER, JOB_UPDATE_TIMEOUT);
-}
-
-/*
- * Wrapper routine to check node_update_timer.
- */
-static bool
-node_update_timeout()
-{
- return update_timeout(NODE_UPDATE_TIMER, NODE_UPDATE_TIMEOUT);
-}
-
-/*
- * Update job/process state and send state CHANGE to ui.
- */
-static void
-update_job_state(int slurm_jobid)
-{
- int i;
- int errcode;
- bool job_find;
- ptp_job * j;
- job_info_msg_t * msg = NULL;
-
- errcode = slurm_load_jobs((time_t)NULL, &msg, SHOW_ALL);
- if (errcode) {
- debug_log(logfp,"slurm_load_jobs error");
- return;
- }
-
- for (SetList(gJobList); (j = (ptp_job *)GetListElement(gJobList)) != NULL;) {
- if (slurm_jobid > -1) {
- if (j->slurm_jobid != slurm_jobid)
- continue;
- }
- job_find = false;
- for (i = 0; i < msg->record_count; i++) {
- if (j->slurm_jobid == (msg->job_array[i]).job_id) {
- job_find = true;
- if (j->state != (msg->job_array[i]).job_state) { /*state change*/
- j->state = (msg->job_array[i]).job_state;
- /*
- * SLURM doesn't provide process state.
- * Force process state changs with job state.
- */
- sendProcessStateChangeEvent(gTransID, j, jobstate_to_string(j->state));
- sendJobStateChangeEvent(gTransID, j->ptp_jobid, jobstate_to_string(j->state));
- }
- break;
- }
- }
- if (!job_find) {
- /*
- * job not found(rarely happens).
- * In this case, simply mark this job removable.
- * SLURM keep the informatin of complete/fail jobs for MinJobAge (default to 300) seconds
- * MinJobAge can be set in slurm/etc/slurm.conf.
- */
- j->removable = true;
- }
- if (slurm_jobid > -1)
- break;
- }
- slurm_free_job_info_msg(msg);
-
- return;
-}
-
-/*
- * Update ALL nodes state and send state CHANGE to ui.
- */
-void
-update_node_state()
-{
- int i;
- ptp_node * node;
- int errcode;
- node_info_msg_t * msg;
- rangeset * unknown_set = new_rangeset();
- rangeset * idle_set = new_rangeset();
- rangeset * down_set = new_rangeset();
- rangeset * allocated_set = new_rangeset();
-
- if (unknown_set == NULL || idle_set == NULL || down_set == NULL || allocated_set == NULL)
- goto cleanup;
-
- errcode = slurm_load_node((time_t)NULL, &msg, SHOW_ALL);
- if (errcode) {
- debug_log(logfp,"slurm_load_node error.\n");
- return;
- } else {
- for (i = 0; i < msg->record_count; i++) {
- node = find_node_by_name(msg->node_array[i].name);
- if (node->state == msg->node_array[i].node_state)
- continue;
- else { /* node state change */
- node->state = msg->node_array[i].node_state;
- switch (msg->node_array[i].node_state & NODE_STATE_BASE) {
- case NODE_STATE_UNKNOWN:
- insert_in_rangeset(unknown_set,node->id);
- break;
- case NODE_STATE_DOWN:
- insert_in_rangeset(down_set,node->id);
- break;
- case NODE_STATE_IDLE:
- insert_in_rangeset(idle_set,node->id);
- break;
- case NODE_STATE_ALLOCATED:
- insert_in_rangeset(allocated_set,node->id);
- break;
- default:
- debug_log(logfp, "unrecognized node state\n");
- break;
- }
- }
- }
-
- if (!EmptyList(unknown_set->elements)) {
- sendNodeChangeEvent(gTransID,rangeset_to_string(unknown_set),nodestate_to_string(NODE_STATE_UNKNOWN));
- }
- if (!EmptyList(down_set->elements)) {
- sendNodeChangeEvent(gTransID,rangeset_to_string(down_set),nodestate_to_string(NODE_STATE_DOWN));
- }
- if (!EmptyList(idle_set->elements)) {
- sendNodeChangeEvent(gTransID,rangeset_to_string(idle_set),nodestate_to_string(NODE_STATE_IDLE));
- }
- if (!EmptyList(allocated_set->elements)) {
- sendNodeChangeEvent(gTransID,rangeset_to_string(allocated_set),nodestate_to_string(NODE_STATE_ALLOCATED));
- }
-
- slurm_free_node_info_msg(msg);
- }
-
-cleanup:
- if(unknown_set)
- free_rangeset(unknown_set);
- if(down_set)
- free_rangeset(down_set);
- if(idle_set)
- free_rangeset(idle_set);
- if (allocated_set)
- free_rangeset(allocated_set);
-
- return;
-}
-
-
-/*
- * signal handler of slurm proxy.
- */
-RETSIGTYPE
-ptp_signal_handler(int sig)
-{
- if (sig != SIGCHLD) /* proxy doesn't exit on SIGCHLD */
- ptp_signal_exit = sig;
-}
-
-/*
- * Cleanup work on proxy exiting:
- * kill srun process, release job resource,
- * terminate io_thread,and free space.
- */
-static void
-destroy_global_joblist()
-{
- ptp_job * j;
-
- for (SetList(gJobList); (j = (ptp_job *)GetListElement(gJobList)) != NULL; ) {
- if (slurm_job_active(j)) {
- kill(j->srun_pid, SIGKILL);
- slurm_kill_job(j->slurm_jobid, SIGKILL, 0);
- }
- if (j->iothread_exit == false)
- j->iothread_exit_req = true;
- RemoveFromList(gJobList, j);
- free_job(j);
- }
- return;
-}
-
-static int
-server(char *name, char *host, int port)
-{
- int rc = 0;
- struct timeval timeout = {0, 20000};
-
- gJobList = NewList();
- gMachineList = NewList();
-
- init_job_timer();
- init_node_timer();
-
- if (proxy_svr_init(name, &timeout, &helper_funcs, &command_tab, &slurm_proxy) != PROXY_RES_OK) {
- debug_log(logfp, "proxy failed to initialized\n");
- return 0;
- }
-
- if (proxy_svr_connect(slurm_proxy, host, port) == PROXY_RES_OK) {
- debug_log(logfp, "proxy connected\n");
-
- while (ptp_signal_exit == 0 && proxy_state != STATE_SHUTDOWN) {
- if (proxy_state == STATE_SHUTTING_DOWN) {
- proxy_state = STATE_SHUTDOWN;
- }
- if (proxy_svr_progress(slurm_proxy) != PROXY_RES_OK)
- break;
- /* update job and node state */
- if (enable_state_update) {
- if (job_update_timeout())
- update_job_state(ALL_JOBSTATE);
- if (node_update_timeout())
- update_node_state();
- }
- /* delete removable job */
- purge_global_joblist();
- }
- if (ptp_signal_exit != 0) {
- if (proxy_state != STATE_SHUTTING_DOWN
- && proxy_state != STATE_SHUTDOWN) {
- do_slurm_shutdown();
- }
-
- destroy_global_joblist();
-
- /* our return code = the signal that fired */
- rc = ptp_signal_exit;
- debug_log(logfp, "ptp_slurm_proxy terminated by signal [%d]\n", ptp_signal_exit);
- }
- } else
- debug_log(logfp, "proxy connection failed\n");
-
- proxy_svr_finish(slurm_proxy);
-
- return rc;
-}
-
-
-/*
- * Entry routine
- */
-int
-main(int argc, char *argv[])
-{
- int ch;
- int port = PROXY_TCP_PORT;
- char * host = DEFAULT_HOST;
- char * proxy_str = DEFAULT_PROXY;
- int rc;
-
- while ((ch = getopt_long(argc, argv, "P:p:h:", longopts, NULL)) != -1){
- switch (ch) {
- case 'P':
- proxy_str = optarg;
- break;
- case 'p':
- port = (int)strtol(optarg, NULL, 10);
- break;
- case 'h':
- host = optarg;
- break;
- default:
- fprintf(stderr, "%s [--proxy=proxy] [--host=host_name] [--port=port] \n", argv[0]);
- return 1;
- }
- }
-
- //putenv("PTP_SLURM_PROXY_LOGDIR=$HOME/log");
- logfp = init_logfp();
-
- /*
- * signal can happen any time after handlers are installed, so
- * make sure we catch it.
- */
- ptp_signal_exit = 0;
-
- /* setup signal handlers */
- xsignal(SIGINT, ptp_signal_handler);
- xsignal(SIGHUP, ptp_signal_handler);
- xsignal(SIGILL, ptp_signal_handler);
- xsignal(SIGSEGV, ptp_signal_handler);
- xsignal(SIGTERM, ptp_signal_handler);
- xsignal(SIGQUIT, ptp_signal_handler);
- xsignal(SIGABRT, ptp_signal_handler);
- xsignal(SIGCHLD, ptp_signal_handler);
-
- rc = server(proxy_str, host, port);
-
- return rc;
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/.classpath b/rms/org.eclipse.ptp.rm.slurm.ui/.classpath
deleted file mode 100644
index 941814f..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/ptp/rm/remote/core/*"/>
- <accessrule kind="accessible" pattern="org/eclipse/rm/remote/ui/*"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/.project b/rms/org.eclipse.ptp.rm.slurm.ui/.project
deleted file mode 100644
index 8512bed..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ptp.rm.slurm.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.slurm.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 6864ccc..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.slurm.ui;singleton:=true
-Bundle-Version: 2.1.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.slurm.ui.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.ptp.core,
- org.eclipse.ptp.remote.ui,
- org.eclipse.ptp.utils.ui;bundle-version="1.0.0",
- org.eclipse.ptp.rm.slurm.core
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.ptp.rm.slurm.ui,
- org.eclipse.ptp.rm.slurm.ui.preferences
-Import-Package: org.eclipse.ptp.core.attributes,
- org.eclipse.ptp.core.elements,
- org.eclipse.ptp.core.elements.attributes,
- org.eclipse.ptp.launch.ui.extensions,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.core.exception,
- org.eclipse.ptp.rm.remote.ui.preferences,
- org.eclipse.ptp.rm.remote.ui.wizards,
- org.eclipse.ptp.ui.wizards
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/about.html b/rms/org.eclipse.ptp.rm.slurm.ui/about.html
deleted file mode 100644
index 3106f3a..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>Apri 14, 2009</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). 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, "Program" 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 ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/build.properties b/rms/org.eclipse.ptp.rm.slurm.ui/build.properties
deleted file mode 100644
index ce5cf86..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
- META-INF/,\
- .,\
- bin/,\
- plugin.properties,\
- build.properties
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/plugin.properties b/rms/org.eclipse.ptp.rm.slurm.ui/plugin.properties
deleted file mode 100644
index 8886332..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
- # Copyright (c) 2008,2009 School of Computer,National University
- # of Defense Technology,P.R.China. All rights reserved. This program
- # and the accompanying materials are made available under the terms of
- # the Eclipse Public License v1.0 which accompanies this distribution,
- # and is available at http://www.eclipse.org/legal/epl-v10.html
- # Contributors:
- # School of Computer - 605 staff room
-###############################################################################
-
-pluginName=PTP Slurm UI
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/plugin.xml b/rms/org.eclipse.ptp.rm.slurm.ui/plugin.xml
deleted file mode 100644
index beadd52..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
- <extension
- point="org.eclipse.ui.preferencePages">
- <page
- category="org.eclipse.ptp.ui.preferences.rmPreferencesPage"
- class="org.eclipse.ptp.rm.slurm.ui.preferences.SLURMPreferencePage"
- id="org.eclipse.ptp.slurm.ui.preferences.OMPIPreferencePage"
- name="SLURM">
- </page>
- </extension>
- <extension
- point="org.eclipse.ptp.ui.rmConfigurationWizards">
- <configurationWizard
- class="org.eclipse.ptp.rm.slurm.ui.wizards.SLURMResourceManagerConfigurationWizardPageFactory"
- id="org.eclipse.ptp.slurm.ui.configurationWizard"/>
- </extension>
- <extension
- point="org.eclipse.ptp.launch.rmLaunchConfigurations">
- <launchConfiguration
- class="org.eclipse.ptp.rm.slurm.ui.rmLaunchConfiguration.SLURMRMLaunchConfigurationFactory"
- id="org.eclipse.ptp.slurm.ui.launchConfiguration"/>
- </extension>
-
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/Activator.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/Activator.java
deleted file mode 100644
index a357da9..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/Activator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.ptp.rm.slurm.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ptp.rm.slurm.core.SLURMPreferenceManager;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.ptp.rm.slurm.ui"; //$NON-NLS-1$
-
- // The shared instance
- private static Activator plugin;
-
- /**
- * The constructor
- */
- public Activator() {
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- SLURMPreferenceManager.initializePreferences();
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-
- /**
- * Returns an image descriptor for the image file at the given
- * plug-in relative path
- *
- * @param path the path
- * @return the image descriptor
- */
- public static ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/Messages.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/Messages.java
deleted file mode 100644
index 50d5c01..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/Messages.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.ui.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.slurm.ui.messages.messages"; //$NON-NLS-1$
-
- public static String SLURMResourceManagerConfigurationWizardPage_name;
- public static String SLURMResourceManagerConfigurationWizardPage_title;
- public static String SLURMResourceManagerConfigurationWizardPage_description;
-
- public static String SLURMRMLaunchConfigurationDynamicTab_0;
- public static String SLURMRMLaunchConfigurationDynamicTab_1;
- public static String SLURMRMLaunchConfigurationDynamicTab_2;
- public static String SLURMRMLaunchConfigurationDynamicTab_3;
- public static String SLURMRMLaunchConfigurationDynamicTab_4;
- public static String SLURMRMLaunchConfigurationDynamicTab_5;
- public static String SLURMRMLaunchConfigurationDynamicTab_6;
- public static String SLURMRMLaunchConfigurationDynamicTab_7;
- public static String SLURMRMLaunchConfigurationDynamicTab_8;
- public static String SLURMRMLaunchConfigurationDynamicTab_9;
- public static String SLURMRMLaunchConfigurationDynamicTab_10;
-
- public static String SLURMConfigurationWizardPage_name;
- public static String SLURMConfigurationWizardPage_title;
- public static String SLURMConfigurationWizardPage_description;
- public static String SLURMConfigurationWizardPage_defaultButton;
- public static String SLURMConfigurationWizardPage_browseButton;
- public static String SLURMConfigurationWizardPage_path;
- public static String SLURMConfigurationWizardPage_arguments;
- public static String SLURMConfigurationWizardPage_invalid;
- public static String SLURMConfigurationWizardPage_select;
- public static String SLURMConfigurationWizardPage_connection_error;
- public static String SLURMConfigurationWizardPage_connection_error_msg;
- public static String SLURMConfigurationWizardPage_numProcsInvalid;
- public static String SLURMConfigurationWizardPage_timeLimitInvalid;
-
- public static String SLURMPreferencesPage_group_slurmd;
- public static String SLURMPreferencesPage_slurmdFile_text;
- public static String SLURMPreferencesPage_Select_SLURMd_FILE;
- public static String SLURMPreferencesPage_Incorrect_SLURMd_file;
- public static String SLURMPreferencesPage_slurmdArgs_text;
- public static String SLURMPreferencesPage_slurmdFull_text;
- public static String SLURMPreferencesPage_group_proxy;
- public static String SLURMPreferencesPage_slurmServer_text;
- public static String SLURMPreferencesPage_Select_SLURM_PROXY_FILE;
- public static String SLURMPreferencesPage_Incorrect_server_file;
- public static String SLURMPreferencesPage_manual;
- public static String SLURMPreferencesPage_browseButton;
-
- static {
- // initialize resource bundle
- NLS.initializeMessages(BUNDLE_NAME, Messages.class);
- }
-
- private Messages() {
- // Prevent instances.
- }
-}
-
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/messages.properties b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/messages.properties
deleted file mode 100644
index 41d5a82..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/messages/messages.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-SLURMResourceManagerConfigurationWizardPage_name=SLURM Proxy Configuration
-SLURMResourceManagerConfigurationWizardPage_title=SLURM Proxy Configuration
-SLURMResourceManagerConfigurationWizardPage_description=Enter information to connect to an SLURM proxy server
-SLURMRMLaunchConfigurationDynamicTab_0=Number of Processes(-n):
-SLURMRMLaunchConfigurationDynamicTab_1=Time Limit(-t):
-SLURMRMLaunchConfigurationDynamicTab_10=Please input the limit(>=1) of running time(minutes)\!
-SLURMRMLaunchConfigurationDynamicTab_2=Partation Requested(-p):
-SLURMRMLaunchConfigurationDynamicTab_3=Job Type(--jobtype):
-SLURMRMLaunchConfigurationDynamicTab_4=true
-SLURMRMLaunchConfigurationDynamicTab_5=Job Io Label(-l):
-SLURMRMLaunchConfigurationDynamicTab_6=true
-SLURMRMLaunchConfigurationDynamicTab_7=Job Verbose Mode(-v):
-SLURMRMLaunchConfigurationDynamicTab_8=Job Nodelist(-w):
-SLURMRMLaunchConfigurationDynamicTab_9=Please input the integer number(>=1) of processes\!
-
-SLURMConfigurationWizardPage_name=SLURMD Configuration
-SLURMConfigurationWizardPage_title=SLURMD Configuration
-SLURMConfigurationWizardPage_description=Enter information to configure SLURMD
-SLURMConfigurationWizardPage_defaultButton=Use default settings
-SLURMConfigurationWizardPage_browseButton=Browse
-SLURMConfigurationWizardPage_path=Path to SLURMD:
-SLURMConfigurationWizardPage_arguments=Extra SLURMD arguments:
-SLURMConfigurationWizardPage_invalid=Invalid SLURMD path
-SLURMConfigurationWizardPage_select=Select SLURMD executable
-SLURMConfigurationWizardPage_connection_error=Connection Error
-SLURMConfigurationWizardPage_connection_error_msg=Could not open connection
-SLURMConfigurationWizardPage_numProcsInvalid=
-SLURMConfigurationWizardPage_timeLimitInvalid=
-SLURMPreferencesPage_group_slurmd=Open Runtime Environment Daemon
-SLURMPreferencesPage_slurmdFile_text=SLURMd file:
-SLURMPreferencesPage_Select_SLURMd_FILE=Select SLURMd file
-SLURMPreferencesPage_Incorrect_SLURMd_file=Invalid SLURM daemon file
-SLURMPreferencesPage_slurmdArgs_text=SLURMd arguments:
-SLURMPreferencesPage_slurmdFull_text=SLURMd run command:
-SLURMPreferencesPage_group_proxy=Slurm PTP Proxy Server
-SLURMPreferencesPage_slurmServer_text=SLURM|PTP proxy server file:
-SLURMPreferencesPage_Select_SLURM_PROXY_FILE=Select SLURM|PTP Proxy server file
-SLURMPreferencesPage_Incorrect_server_file=Invalid SLURM|PTP proxy server file
-SLURMPreferencesPage_manual=Launch SLURM server manually
-SLURMPreferencesPage_browseButton=Browse
-
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/preferences/SLURMPreferencePage.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/preferences/SLURMPreferencePage.java
deleted file mode 100644
index 6e8a01b..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/preferences/SLURMPreferencePage.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.ui.preferences;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.ptp.rm.slurm.core.SLURMPreferenceManager;
-import org.eclipse.ptp.rm.remote.ui.preferences.AbstractRemotePreferencePage;
-
-public class SLURMPreferencePage extends AbstractRemotePreferencePage {
- /* (non-Javadoc)
- * @see org.eclipse.ptp.remote.ui.preferences.AbstractRemotePreferencePage#getPreferences()
- */
- public Preferences getPreferences() {
- return SLURMPreferenceManager.getPreferences();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.remote.ui.preferences.AbstractRemotePreferencePage#savePreferences()
- */
- public void savePreferences() {
- SLURMPreferenceManager.savePreferences();
- }
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 05f5862..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.ui.rmLaunchConfiguration;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.rm.slurm.core.SLURMJobAttributes;
-import org.eclipse.ptp.rm.slurm.ui.Activator;
-import org.eclipse.ptp.rm.slurm.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class SLURMRMLaunchConfigurationDynamicTab extends
- AbstractRMLaunchConfigurationDynamicTab {
-
- //jobNumProces
- private Text numProcsText;
- private String numProcsString = "1"; //$NON-NLS-1$
- private static final String NUMBER_OF_PROCESSES_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_0;
- //jobNumNodes
- /*
- private Text NumNodesText;
- private String numbernodesString = "2";
- private static final String JOB_NUMBER_OF_NODES_LABEL = "Number of Nodes(-N): ";
- */
- //jobTimeLimit
- private Text TimeLimitText;
- private String timeLimitString = "2"; //$NON-NLS-1$
- private static final String JOB_TIME_LIMIT_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_1;
- //jobPartition
- private String partationRequestedString = "3"; //$NON-NLS-1$
- private static final String JOB_PARTATION_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_2;
- //jobType
- private String jobTypeComboString = "mpi"; //$NON-NLS-1$
- private static final String JOB_TYPE_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_3;
- //jobIoLabel
- private String jobIoString = Messages.SLURMRMLaunchConfigurationDynamicTab_4;
- private static final String JOB_IO_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_5;
- //jobVerbose
- private String jobVerboseModString = Messages.SLURMRMLaunchConfigurationDynamicTab_6;
- private static final String JOB_VERBOSE_MODE_LABEL = Messages.SLURMRMLaunchConfigurationDynamicTab_7;
- //jobNodeList
- private String jobNodeListString = "node0,node1"; //$NON-NLS-1$
- private static final String JOB_NODE_LIST_LABEL =Messages.SLURMRMLaunchConfigurationDynamicTab_8;
-
- private static final String ATTR_PREFIX = Activator.PLUGIN_ID + ".launchAttributes"; //$NON-NLS-1$
- private static final String ATTR_NUMPROCS = ATTR_PREFIX + ".numProcs"; //$NON-NLS-1$
- private static final String ATTR_NUMNODES = ATTR_PREFIX + ".numNodes"; //$NON-NLS-1$
- private static final String ATTR_TIMELIMIT = ATTR_PREFIX + ".timeLimit"; //$NON-NLS-1$
- private static final String ATTR_JOBPARTATION = ATTR_PREFIX + ".jobpartation"; //$NON-NLS-1$
- private static final String ATTR_JOBTYPE = ATTR_PREFIX + ".jobtype"; //$NON-NLS-1$
- private static final String ATTR_JOBIO = ATTR_PREFIX + ".jobio"; //$NON-NLS-1$
- private static final String ATTR_JOBVERBOSEMODE = ATTR_PREFIX + ".jobverbosemode"; //$NON-NLS-1$
- private static final RMLaunchValidation success = new RMLaunchValidation(true, ""); //$NON-NLS-1$
-
- private Composite control;
-
- public SLURMRMLaunchConfigurationDynamicTab(IResourceManager rm) {
- // TODO Auto-generated constructor stub
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#canSave(org.eclipse.swt.widgets.Control, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)
- */
- public RMLaunchValidation canSave(Control control, IResourceManager rm, IPQueue queue) {
- try {
- IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(numProcsAttrDef, numProcsString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL + e.getMessage());
- }
-
- /*
- try {
- IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(jobNumNodesAttrDef, numbernodesString);
- //System.out.println("the iattr value is:"+iattr+"the numprocsString value is:"+numProcsString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL + e.getMessage());
- }
- */
-
- try {
- IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(jobTimeLimitAttrDef, timeLimitString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL + e.getMessage());
- }
- /*
-
- try {
- IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(jobPartationAttrDef, partationRequestedString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_PARTATION_LABEL + e.getMessage());
- }
-
-
- try {
- IntegerAttributeDefinition jobTypeComboAttrDef = getJobTypeComboAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(jobTypeComboAttrDef, jobTypeComboString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_TYPE_LABEL + e.getMessage());
- }
-
-
- try {
- IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(jobIoAttrDef, jobIoString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_IO_LABEL + e.getMessage());
- }
- */
-
- return new RMLaunchValidation(true, ""); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#createControl(org.eclipse.swt.widgets.Composite, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)
- */
- public void createControl(Composite parent, IResourceManager rm, IPQueue queue) {
- control = new Composite(parent, SWT.NONE);
- control.setLayout(new GridLayout(1, true));
- GridData gd;
-
- final int numColumns = 2;
-
- final Composite comp = new Composite(control, SWT.BORDER);
- GridLayout launchConfigLayout = new GridLayout(numColumns, true);
- launchConfigLayout.marginHeight = 0;
- launchConfigLayout.marginWidth = 0;
- launchConfigLayout.numColumns = numColumns;
- comp.setLayout(launchConfigLayout);
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = numColumns;
- comp.setLayoutData(gd);
-
-
- Label numberOfProcessesnLabel = new Label(comp, SWT.NONE);
- numberOfProcessesnLabel.setText(NUMBER_OF_PROCESSES_LABEL);
- final GridData gd_numberOfProcessesnLabel = new GridData(SWT.FILL, SWT.FILL, true, false, 1, 1);
- gd_numberOfProcessesnLabel.minimumWidth = numberOfProcessesnLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
- numberOfProcessesnLabel.setLayoutData(gd_numberOfProcessesnLabel);
-
-
- numProcsText = new Text(comp, SWT.BORDER | SWT.WRAP);
- numProcsText.setTextLimit(10);
- numProcsText.setToolTipText(Messages.SLURMRMLaunchConfigurationDynamicTab_9);
- gd = new GridData(SWT.FILL, SWT.FILL, true, false, numColumns-1, 1);
- gd.minimumWidth = numProcsText.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
- numProcsText.setLayoutData(gd);
-
- // Tell the client of this dynamic tab that the
- // contents of this tab are affected by the contents
- // of this widget.
- numProcsText.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- //System.out.println("The value of numProcsString:"+numProcsString);
- numProcsString = numProcsText.getText();
- //System.out.println("The value of numProcsString1:"+numProcsString);
- fireContentsChanged();
- }});
- /*
- final Label numberOfNodesLabel = new Label(comp, SWT.NONE);
- numberOfNodesLabel.setText(JOB_NUMBER_OF_NODES_LABEL);
-
- NumNodesText = new Text(comp, SWT.BORDER | SWT.WRAP);
- NumNodesText.setTextLimit(10);
- NumNodesText.setToolTipText("Please input the number of nodes!");
- final GridData gd_numNodesText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- NumNodesText.setLayoutData(gd_numNodesText);
- //NumNodesText value
- NumNodesText.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- //System.out.println("The value of numbernodesString:"+numbernodesString);
- numbernodesString = NumNodesText.getText();
- //System.out.println("The value of numbernodesString1:"+numbernodesString);
- fireContentsChanged();
- }});
-
- */
- final Label timeLimitLabel = new Label(comp, SWT.NONE);
- timeLimitLabel.setText(JOB_TIME_LIMIT_LABEL);
-
- TimeLimitText = new Text(comp, SWT.BORDER | SWT.WRAP);
- TimeLimitText.setTextLimit(10);
- TimeLimitText.setToolTipText(Messages.SLURMRMLaunchConfigurationDynamicTab_10);
- final GridData gd_timeLimitText = new GridData(SWT.FILL, SWT.CENTER, true, false);
- TimeLimitText.setLayoutData(gd_timeLimitText);
- //TimeLimitText value
- TimeLimitText.addModifyListener(new ModifyListener(){
-
- public void modifyText(ModifyEvent e) {
- //System.out.println("The value of timeLimitString:"+timeLimitString);
- timeLimitString = TimeLimitText.getText();
- //System.out.println("The value of timeLimitString1:"+timeLimitString);
- fireContentsChanged();
- }});
- //partationRequestedCombo value
- //JobIdText value
- //jobTypeCombo value
- //JobIOLableText value
- //JobVerboseModeText value
- //JobNodelistText value
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#getAttributes(org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue, org.eclipse.debug.core.ILaunchConfiguration)
- */
- public IAttribute<?,?,?>[] getAttributes(IResourceManager rm, IPQueue queue,
- ILaunchConfiguration configuration, String mode) throws CoreException {
-
- int numProcs = configuration.getAttribute(ATTR_NUMPROCS, -1);
- IntegerAttribute iattr = null;
- try {
- IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);
- iattr = new IntegerAttribute(numProcsAttrDef, numProcs);
- } catch (IllegalValueException e) {
- return new IAttribute[0];
- }
-
- /*
- int jobNumNodes = configuration.getAttribute(ATTR_NUMNODES, -1);
- //System.out.println("The value of jobNumNodes is: "+jobNumNodes);
-
- IntegerAttribute iattr1 = null;
- try {
- IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);
- iattr1 = new IntegerAttribute(jobNumNodesAttrDef, jobNumNodes);
- //System.out.println("The value of NumNodes is: "+iattr1);
- } catch (IllegalValueException e) {
- return new IAttribute[1];
- }
- */
- int jobTimeLimit = configuration.getAttribute(ATTR_TIMELIMIT, -1);
- IntegerAttribute iattr2 = null;
- try {
- IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);
- iattr2 = new IntegerAttribute(jobTimeLimitAttrDef, jobTimeLimit);
- //System.out.println("The value of TimeLimit is: "+iattr2);
- } catch (IllegalValueException e) {
- return new IAttribute[2];
- }
-
- /*
- int jobPartation = configuration.getAttribute(ATTR_JOBPARTATION, -1);
- IntegerAttribute iattr3 = null;
- try {
- IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);
- iattr2 = new IntegerAttribute(jobPartationAttrDef, jobPartation);
- } catch (IllegalValueException e) {
- return new IAttribute[3];
- }
-
- int jobTypeCombo = configuration.getAttribute(ATTR_JOBTYPE, -1);
- IntegerAttribute iattr3 = null;
- try {
- IntegerAttributeDefinition jobTypeComboAttrDef = getJobTimeLimitAttrDef(rm, queue);
- iattr2 = new IntegerAttribute(jobTypeComboAttrDef, jobTypeCombo);
- } catch (IllegalValueException e) {
- return new IAttribute[3];
- }
-
- int jobIo = configuration.getAttribute(ATTR_JOBIO, -1);
- IntegerAttribute iattr3 = null;
- try {
- IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);
- iattr3 = new IntegerAttribute(jobIoAttrDef, jobIo);
- } catch (IllegalValueException e) {
- return new IAttribute[3];
- }
- */
-
-
-
- return new IAttribute[]{iattr,iattr2};
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#getControl()
- */
- public Control getControl() {
- return control;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#initializeFrom(org.eclipse.swt.widgets.Control, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue, org.eclipse.debug.core.ILaunchConfiguration)
- */
- public RMLaunchValidation initializeFrom(Control control, IResourceManager rm,
- IPQueue queue, ILaunchConfiguration configuration) {
-
- int numProcs;
- try {
- numProcs = configuration.getAttribute(ATTR_NUMPROCS, 1);
- } catch (CoreException e) {
- try {
- IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);
- numProcsText.setText(numProcsAttrDef.create().getValueAsString());
- } catch (IllegalValueException e1) {
- return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL +
- e.getMessage() + " : " + e1.getMessage()); //$NON-NLS-1$
- }
- return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL + e.getMessage());
- }
- numProcsText.setText(Integer.toString(numProcs));
- /*
- int jobNumNodes;
- try {
- jobNumNodes = configuration.getAttribute(ATTR_NUMNODES, 1);
- } catch (CoreException e) {
- try {
- IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);
- NumNodesText.setText(jobNumNodesAttrDef.create().getValueAsString());
- } catch (IllegalValueException e1) {
- return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL +
- e.getMessage() + " : " + e1.getMessage());
- }
- return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL + e.getMessage());
- }
- NumNodesText.setText(Integer.toString(jobNumNodes));
- */
- int jobTimeLimit;
- try {
- jobTimeLimit = configuration.getAttribute(ATTR_TIMELIMIT, 1);
- } catch (CoreException e) {
- try {
- IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);
- TimeLimitText.setText(jobTimeLimitAttrDef.create().getValueAsString());
- } catch (IllegalValueException e1) {
- return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL +
- e.getMessage() + " : " + e1.getMessage()); //$NON-NLS-1$
- }
- return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL + e.getMessage());
- }
- TimeLimitText.setText(Integer.toString(jobTimeLimit));
- /*
- int jobPartation;
- try {
- jobPartation = configuration.getAttribute(ATTR_JOBPARTATION, 1);
- } catch (CoreException e) {
- try {
- IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);
- partationRequestedCombo.setText(jobPartationAttrDef.create().getValueAsString());
- } catch (IllegalValueException e1) {
- return new RMLaunchValidation(false, JOB_PARTATION_LABEL +
- e.getMessage() + " : " + e1.getMessage());
- }
- return new RMLaunchValidation(false, JOB_PARTATION_LABEL + e.getMessage());
- }
- partationRequestedCombo.setText(Integer.toString(jobPartation));
- int jobTypeCom;
- try {
- jobTypeCom = configuration.getAttribute(ATTR_JOBTYPE, 1);
- } catch (CoreException e) {
- try {
- IntegerAttributeDefinition jobTypeComboAttrDef = getJobTypeComboAttrDef(rm, queue);
- jobTypeCombo.setText(jobTypeComboAttrDef.create().getValueAsString());
- } catch (IllegalValueException e1) {
- return new RMLaunchValidation(false, JOB_TYPE_LABEL +
- e.getMessage() + " : " + e1.getMessage());
- }
- return new RMLaunchValidation(false, JOB_TYPE_LABEL + e.getMessage());
- }
- jobTypeCombo.setText(Integer.toString(jobTypeCom));
- int jobIo;
- try {
- jobIo = configuration.getAttribute(ATTR_JOBIO, 1);
- } catch (CoreException e) {
- try {
- IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);
- JobIOLableText.setText(jobIoAttrDef.create().getValueAsString());
- } catch (IllegalValueException e1) {
- return new RMLaunchValidation(false, JOB_IO_LABEL +
- e.getMessage() + " : " + e1.getMessage());
- }
- return new RMLaunchValidation(false, JOB_IO_LABEL + e.getMessage());
- }
- JobIOLableText.setText(Integer.toString(jobIo));
- */
- return success;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#isValid(org.eclipse.debug.core.ILaunchConfiguration, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)
- */
-
- public RMLaunchValidation isValid(ILaunchConfiguration configuration,
- IResourceManager rm, IPQueue queue) {
-
- try {
- IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(numProcsAttrDef, numProcsString);
- if (iattr.getValue() < 1) {
- return new RMLaunchValidation(false, Messages.SLURMConfigurationWizardPage_numProcsInvalid);
- }
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL + e.getMessage());
- }
- /*
- try {
- IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(jobNumNodesAttrDef, numbernodesString);
- if (iattr.getValue() < 1) {
- return new RMLaunchValidation(false, Messages.getString("SLURMConfigurationWizardPage.numbernodesInvalid")); //$NON-NLS-1$
- }
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL + e.getMessage());
- }
- */
- try {
- IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(jobTimeLimitAttrDef, timeLimitString);
- if (iattr.getValue() < 1) {
- return new RMLaunchValidation(false, Messages.SLURMConfigurationWizardPage_timeLimitInvalid);
- }
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL + e.getMessage());
- }
- /*
- try {
- IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(jobPartationAttrDef, partationRequestedString);
- if (iattr.getValue() < 1) {
- return new RMLaunchValidation(false, Messages.getString("SLURMConfigurationWizardPage.numProcsInvalid")); //$NON-NLS-1$
- }
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_PARTATION_LABEL + e.getMessage());
- }
- try {
- IntegerAttributeDefinition jobTypeComboAttrDef = getJobTypeComboAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(jobTypeComboAttrDef, jobTypeComboString);
- if (iattr.getValue() < 1) {
- return new RMLaunchValidation(false, Messages.getString("SLURMConfigurationWizardPage.numProcsInvalid")); //$NON-NLS-1$
- }
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_TYPE_LABEL + e.getMessage());
- }
- try {
- IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);
- @SuppressWarnings("unused")
- IntegerAttribute iattr = new IntegerAttribute(jobIoAttrDef, jobIoString);
- if (iattr.getValue() < 1) {
- return new RMLaunchValidation(false, Messages.getString("SLURMConfigurationWizardPage.numProcsInvalid")); //$NON-NLS-1$
- }
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_IO_LABEL + e.getMessage());
- }
- */
- return new RMLaunchValidation(true, ""); //$NON-NLS-1$
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#performApply(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)
- */
- public RMLaunchValidation performApply(ILaunchConfigurationWorkingCopy configuration,
- IResourceManager rm, IPQueue queue) {
- IntegerAttribute iattr = null;
- try {
- IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);
- iattr = new IntegerAttribute(numProcsAttrDef, numProcsString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL + e.getMessage());
- }
- configuration.setAttribute(ATTR_NUMPROCS, iattr.getValue());
- /*
- IntegerAttribute iattr1 = null;
- try {
- IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);
- iattr1 = new IntegerAttribute(jobNumNodesAttrDef, numbernodesString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL + e.getMessage());
- }
- configuration.setAttribute(ATTR_NUMNODES, iattr1.getValue());
- */
- IntegerAttribute iattr2 = null;
- try {
- IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);
- iattr2 = new IntegerAttribute(jobTimeLimitAttrDef, timeLimitString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL + e.getMessage());
- }
- configuration.setAttribute(ATTR_TIMELIMIT, iattr2.getValue());
- /*
- try {
- IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);
- iattr = new IntegerAttribute(jobPartationAttrDef, partationRequestedString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_PARTATION_LABEL + e.getMessage());
- }
- configuration.setAttribute(ATTR_JOBPARTATION, iattr.getValue());
- try {
- IntegerAttributeDefinition jobTypeComboAttrDef = getJobTypeComboAttrDef(rm, queue);
- iattr = new IntegerAttribute(jobTypeComboAttrDef, jobTypeComboString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_TYPE_LABEL + e.getMessage());
- }
- configuration.setAttribute(ATTR_TIMELIMIT, iattr.getValue());
- try {
- IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);
- iattr = new IntegerAttribute(jobIoAttrDef, jobIoString);
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_IO_LABEL + e.getMessage());
- }
- configuration.setAttribute(ATTR_JOBIO, iattr.getValue());
- */
- //System.out.println(ATTR_NUMNODES);
-
- return new RMLaunchValidation(true, ""); //$NON-NLS-1$
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy, org.eclipse.ptp.rmsystem.IResourceManager, org.eclipse.ptp.core.IPQueue)
- */
- public RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy configuration,
- IResourceManager rm, IPQueue queue) {
- try {
- IntegerAttributeDefinition numProcsAttrDef = getNumProcsAttrDef(rm, queue);
- configuration.setAttribute(ATTR_NUMPROCS, numProcsAttrDef.create().getValue());
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, NUMBER_OF_PROCESSES_LABEL + e.getMessage());
- }
- /*
- try {
- IntegerAttributeDefinition jobNumNodesAttrDef = getJobNumNodesAttrDef(rm, queue);
- configuration.setAttribute(ATTR_NUMNODES, jobNumNodesAttrDef.create().getValue());
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_NUMBER_OF_NODES_LABEL + e.getMessage());
- }
- */
- try {
- IntegerAttributeDefinition jobTimeLimitAttrDef = getJobTimeLimitAttrDef(rm, queue);
- configuration.setAttribute(ATTR_TIMELIMIT, jobTimeLimitAttrDef.create().getValue());
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_TIME_LIMIT_LABEL + e.getMessage());
- }
- /*
- try {
- IntegerAttributeDefinition jobPartationAttrDef = getJobPartationAttrDef(rm, queue);
- configuration.setAttribute(ATTR_JOBPARTATION, jobPartationAttrDef.create().getValue());
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_PARTATION_LABEL + e.getMessage());
- }
- try {
- IntegerAttributeDefinition jobTypeComboAttrDef = getJobTypeComboAttrDef(rm, queue);
- configuration.setAttribute(ATTR_JOBTYPE, jobTypeComboAttrDef.create().getValue());
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_TYPE_LABEL + e.getMessage());
- }
- try {
- IntegerAttributeDefinition jobIoAttrDef = getJobIoAttrDef(rm, queue);
- configuration.setAttribute(ATTR_JOBIO, jobIoAttrDef.create().getValue());
- } catch (IllegalValueException e) {
- return new RMLaunchValidation(false, JOB_IO_LABEL + e.getMessage());
- }
- */
- return success;
- }
-
- /**
- * Get the attribute definition for the number of processes job launch attribute
- *
- * @param rm
- * @param queue
- * @return
- */
- private IntegerAttributeDefinition getNumProcsAttrDef(IResourceManager rm, IPQueue queue) {
- return JobAttributes.getNumberOfProcessesAttributeDefinition();
- }
- private IntegerAttributeDefinition getJobNumNodesAttrDef(IResourceManager rm, IPQueue queue) {
- return SLURMJobAttributes.getNumberOfNodesAttributeDefinition();
- }
- private IntegerAttributeDefinition getJobTimeLimitAttrDef(IResourceManager rm, IPQueue queue) {
- return SLURMJobAttributes.getTimeLimitAttributeDefinition();
- }
- /*
- private IntegerAttributeDefinition getJobPartationAttrDef(IResourceManager rm, IPQueue queue) {
- return JobAttributes.getJobPartationAttributeDefinition();
- }
- private IntegerAttributeDefinition getJobTypeComboAttrDef(IResourceManager rm, IPQueue queue) {
- return JobAttributes.getJobTypeComboAttributeDefinition();
- }
- private IntegerAttributeDefinition getJobIoAttrDef(IResourceManager rm, IPQueue queue) {
- return JobAttributes.getJobIoAttributeDefinition();
- }
- */
- //need to modify JobAttributes.java
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationFactory.java
deleted file mode 100644
index 401bc3e..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/rmLaunchConfiguration/SLURMRMLaunchConfigurationFactory.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.ui.rmLaunchConfiguration;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.elements.IResourceManager;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManager;
-
-public class SLURMRMLaunchConfigurationFactory extends
- AbstractRMLaunchConfigurationFactory {
-
- @Override
- protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm) throws CoreException {
- return new SLURMRMLaunchConfigurationDynamicTab(rm);
- }
-
- @Override
- public Class<? extends IResourceManager> getResourceManagerClass() {
- return SLURMResourceManager.class;
- }
-
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMConfigurationWizardPage.java
deleted file mode 100644
index 953f80d..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMConfigurationWizardPage.java
+++ /dev/null
@@ -1,461 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.ui.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.FieldEditor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;
-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManagerConfiguration;
-import org.eclipse.ptp.rm.slurm.ui.Activator;
-import org.eclipse.ptp.rm.slurm.ui.messages.Messages;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.utils.ui.swt.SWTUtil;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-public class SLURMConfigurationWizardPage extends RMConfigurationWizardPage {
-
- protected class WidgetListener extends SelectionAdapter implements ModifyListener, IPropertyChangeListener
- {
- public void modifyText(ModifyEvent evt) {
- Object source = evt.getSource();
- if(!loading && (source == pathText || source == argsText)) {
- updatePage();
- }
- }
-
- public void propertyChange(PropertyChangeEvent event) {
- if (event.getProperty().equals(FieldEditor.IS_VALID)) {
- updatePage();
- }
- }
-
- public void widgetSelected(SelectionEvent e) {
- Object source = e.getSource();
- if (source == browseButton) {
- handlePathBrowseButtonSelected();
- } else {
- updateSettings();
- updatePage();
- }
- }
- }
-
- public static final String EMPTY_STRING = ""; //$NON-NLS-1$
-
- private SLURMResourceManagerConfiguration config;
- private String slurmdPath = EMPTY_STRING;
- private String slurmdArgs = EMPTY_STRING;
- private IRemoteServices remoteServices = null;
- private IRemoteConnection connection = null;
- private boolean loading = true;
- private boolean isValid;
- private boolean useDefaults;
- private Text pathText = null;
-
- private Text argsText = null;
- private Button browseButton = null;
- private Button defaultButton = null;
- private WidgetListener listener = new WidgetListener();
-
- public SLURMConfigurationWizardPage(RMConfigurationWizard wizard) {
- super(wizard, Messages.SLURMConfigurationWizardPage_name);
- setTitle(Messages.SLURMConfigurationWizardPage_title);
- setDescription(Messages.SLURMConfigurationWizardPage_description);
- setPageComplete(true);
- isValid = true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout topLayout = new GridLayout();
- composite.setLayout(topLayout);
- createContents(composite);
- setControl(composite);
- }
-
- /**
- * Save the current state in the RM configuration. This is called whenever
- * anything is changed.
- *
- * @return
- */
- public boolean performOk()
- {
- store();
- config.setUseDefaults(useDefaults);
- if (!useDefaults) {
- config.setSlurmdPath(slurmdPath);
- config.setSlurmdArgs(slurmdArgs);
- }
- return true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
- */
- @Override
- public void setVisible(boolean visible) {
- if (visible) {
- initContents();
- }
- super.setVisible(visible);
- }
-
- /**
- * Create the contents of the wizard page.
- *
- * @param parent
- * @param colSpan
- */
- private void createContents(Composite parent) {
- /*
- * Composite for remote provider and proxy location combo's
- */
- Composite contents = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 3;
- layout.marginWidth = 0;
- contents.setLayout(layout);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- contents.setLayoutData(gd);
-
- /*
- * Default
- */
- defaultButton = createCheckButton(contents, Messages.SLURMConfigurationWizardPage_defaultButton);
- defaultButton.addSelectionListener(listener);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 3;
- defaultButton.setLayoutData(gd);
-
- /*
- * SLURMD path
- */
- Label label = new Label(contents, SWT.NONE);
- label.setText(Messages.SLURMConfigurationWizardPage_path);
-
- pathText = new Text(contents, SWT.SINGLE | SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 1;
- gd.widthHint = 60;
- pathText.setLayoutData(gd);
- pathText.addModifyListener(listener);
-
- browseButton = SWTUtil.createPushButton(contents, Messages.SLURMConfigurationWizardPage_browseButton, null);
- browseButton.addSelectionListener(listener);
-
- /*
- * SLURMD args
- */
- label = new Label(contents, SWT.NONE);
- label.setText(Messages.SLURMConfigurationWizardPage_arguments);
-
- argsText = new Text(contents, SWT.SINGLE | SWT.BORDER);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- gd.horizontalSpan = 2;
- argsText.setLayoutData(gd);
- argsText.addModifyListener(listener);
- }
-
- /**
- * Initialize the contents of the controls.
- */
- private void initContents() {
- loading = true;
- config = (SLURMResourceManagerConfiguration)getConfigurationWizard().getConfiguration();
- loadSaved();
- updateSettings();
- defaultSetting();
- loading = false;
- updatePage();
- }
-
- /**
- * Load the initial wizard state from the configuration settings.
- */
- private void loadSaved()
- {
- useDefaults = config.useDefaults();
- slurmdPath = config.getSlurmdPath();
- slurmdArgs = config.getSlurmdArgs();
- }
-
- /**
- * @param b
- */
- private void setValid(boolean b) {
- isValid = b;
- setPageComplete(isValid);
- }
-
- /**
- *
- */
- private void store()
- {
- if (!loading) {
- if (defaultButton != null) {
- useDefaults = defaultButton.getSelection();
- }
- if (pathText != null) {
- slurmdPath = pathText.getText();
- }
- if (argsText != null) {
- slurmdArgs = argsText.getText();
- }
- }
- }
-
- /**
- * Update wizard UI selections from settings. This should be called whenever any
- * settings are changed.
- */
- private void updateSettings() {
- store();
- pathText.setEnabled(!useDefaults);
- argsText.setEnabled(!useDefaults);
- browseButton.setEnabled(!useDefaults);
- }
-
- /**
- * Convenience method for creating a button widget.
- *
- * @param parent
- * @param label
- * @param type
- * @return the button widget
- */
- protected Button createButton(Composite parent, String label, int type) {
- Button button = new Button(parent, type);
- button.setText(label);
- GridData data = new GridData();
- button.setLayoutData(data);
- return button;
- }
-
- /**
- * Convenience method for creating a check button widget.
- *
- * @param parent
- * @param label
- * @return the check button widget
- */
- protected Button createCheckButton(Composite parent, String label) {
- return createButton(parent, label, SWT.CHECK | SWT.LEFT);
- }
-
- /**
- * Convenience method for creating a grid layout.
- *
- * @param columns
- * @param isEqual
- * @param mh
- * @param mw
- * @return the new grid layout
- */
- protected GridLayout createGridLayout(int columns, boolean isEqual, int mh, int mw) {
- GridLayout gridLayout = new GridLayout();
- gridLayout.numColumns = columns;
- gridLayout.makeColumnsEqualWidth = isEqual;
- gridLayout.marginHeight = mh;
- gridLayout.marginWidth = mw;
- return gridLayout;
- }
-
- /**
- * Creates an new radio button instance and sets the default
- * layout data.
- *
- * @param group the composite in which to create the radio button
- * @param label the string to set into the radio button
- * @param value the string to identify radio button
- * @return the new radio button
- */
- protected Button createRadioButton(Composite parent, String label, String value, SelectionListener listener) {
- Button button = createButton(parent, label, SWT.RADIO | SWT.LEFT);
- button.setData((null == value) ? label : value);
- GridData data = new GridData(GridData.FILL_HORIZONTAL);
- data.horizontalAlignment = GridData.FILL;
- data.verticalAlignment = GridData.BEGINNING;
- button.setLayoutData(data);
- if(null != listener) {
- button.addSelectionListener(listener);
- }
- return button;
- }
-
- /**
- *
- */
- protected void defaultSetting()
- {
- defaultButton.setSelection(useDefaults);
- pathText.setText(slurmdPath);
- argsText.setText(slurmdArgs);
- }
-
- /**
- * Clean up the content of a text field.
- *
- * @param text
- * @return cleaned up text.
- */
- protected String getFieldContent(String text)
- {
- if (text.trim().length() == 0 || text.equals(EMPTY_STRING))
- return null;
-
- return text;
- }
-
- /**
- * Show a dialog that lets the user select a file.
- */
- protected void handlePathBrowseButtonSelected()
- {
- /*
- * Need to do this here because the connection may have been changed
- * by the previous wizard page
- */
- String rmID = config.getRemoteServicesId();
- if (rmID != null) {
- remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(rmID);
- String conn = config.getConnectionName();
- if (remoteServices != null && conn != null) {
- connection = remoteServices.getConnectionManager().getConnection(conn);
- }
- }
-
- if (connection != null) {
- if (!connection.isOpen()) {
- IRunnableWithProgress op = new IRunnableWithProgress() {
- public void run(IProgressMonitor monitor)
- throws InvocationTargetException,
- InterruptedException {
- try {
- connection.open(monitor);
- } catch (RemoteConnectionException e) {
- ErrorDialog.openError(getShell(), Messages.SLURMConfigurationWizardPage_connection_error,
- Messages.SLURMConfigurationWizardPage_connection_error_msg,
- new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage()));
- }
- }
-
- };
- try {
- new ProgressMonitorDialog(getShell()).run(true, true, op);
- } catch (InvocationTargetException e) {
- ErrorDialog.openError(getShell(), Messages.SLURMConfigurationWizardPage_connection_error,
- Messages.SLURMConfigurationWizardPage_connection_error_msg,
- new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage()));
- } catch (InterruptedException e) {
- ErrorDialog.openError(getShell(), Messages.SLURMConfigurationWizardPage_connection_error,
- Messages.SLURMConfigurationWizardPage_connection_error_msg,
- new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage()));
- }
- }
- IRemoteUIServices remoteUIServices = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(remoteServices);
- IRemoteUIFileManager fileMgr = remoteUIServices.getUIFileManager();
-
- String initialPath = "//"; // Start at root since SLURMD is probably installed in the system somewhere //$NON-NLS-1$
- IPath selectedPath = fileMgr.browseFile(getControl().getShell(), Messages.SLURMConfigurationWizardPage_select, initialPath);
- if (selectedPath != null) {
- pathText.setText(selectedPath.toString());
- }
- }
- }
-
- /**
- * @return
- */
- protected boolean isValidSetting()
- {
- if (defaultButton != null && defaultButton.getSelection()) {
- return true;
- }
-
- if (pathText != null) {
- String name = getFieldContent(pathText.getText());
- if (name == null) {
- setErrorMessage(Messages.SLURMConfigurationWizardPage_invalid);
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * @param style
- * @param space
- * @return
- */
- protected GridData spanGridData(int style, int space)
- {
- GridData gd = null;
- if (style == -1)
- gd = new GridData();
- else
- gd = new GridData(style);
- gd.horizontalSpan = space;
- return gd;
- }
-
- /**
- *
- */
- protected void updatePage()
- {
- setErrorMessage(null);
- setMessage(null);
-
- if (!isValidSetting()) {
- setValid(false);
- } else {
- performOk();
- setValid(true);
- }
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPage.java
deleted file mode 100644
index e4034cf..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPage.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.ui.wizards;
-
-import org.eclipse.ptp.rm.remote.ui.wizards.AbstractRemoteProxyResourceManagerConfigurationWizardPage;
-import org.eclipse.ptp.rm.slurm.ui.messages.Messages;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-
-public final class SLURMResourceManagerConfigurationWizardPage extends
- AbstractRemoteProxyResourceManagerConfigurationWizardPage {
-
- public SLURMResourceManagerConfigurationWizardPage(RMConfigurationWizard wizard) {
- super(wizard, Messages.SLURMResourceManagerConfigurationWizardPage_name);
- setTitle(Messages.SLURMResourceManagerConfigurationWizardPage_title);
- setDescription(Messages.SLURMResourceManagerConfigurationWizardPage_description);
- }
-}
diff --git a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPageFactory.java
deleted file mode 100644
index 77c62b9..0000000
--- a/rms/org.eclipse.ptp.rm.slurm.ui/src/org/eclipse/ptp/rm/slurm/ui/wizards/SLURMResourceManagerConfigurationWizardPageFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008,2009
- * School of Computer, National University of Defense Technology, P.R.China
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Peichang Shi <pcmutates@163.com>/<pcshi@nudt.edu.cn>
- *******************************************************************************/
-package org.eclipse.ptp.rm.slurm.ui.wizards;
-
-import org.eclipse.ptp.rm.slurm.core.rmsystem.SLURMResourceManagerFactory;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-
-public class SLURMResourceManagerConfigurationWizardPageFactory extends
- RMConfigurationWizardPageFactory {
-
- public SLURMResourceManagerConfigurationWizardPageFactory() {
- // no-op
- }
-
- public RMConfigurationWizardPage[] getPages(RMConfigurationWizard wizard) {
- return new RMConfigurationWizardPage[]{
- new SLURMResourceManagerConfigurationWizardPage(wizard),
- //new SLURMConfigurationWizardPage(wizard)
- };
- }
-
- public Class<SLURMResourceManagerFactory> getRMFactoryClass() {
- return SLURMResourceManagerFactory.class;
- }
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath b/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore
deleted file mode 100644
index 2cc8dd1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-icons-old
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/.project b/tools/pldt/org.eclipse.ptp.pldt.upc/.project
deleted file mode 100644
index 6349367..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.ptp.pldt.upc</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
deleted file mode 100644
index d56ae3f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.pldt.upc;singleton:=true
-Bundle-Version: 3.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.upc.UPCPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.cdt.ui,
- org.eclipse.ptp.pldt.common,
- org.eclipse.help,
- org.eclipse.cdt.doc.user,
- org.eclipse.cdt.core.parser.upc;bundle-version="5.0.0"
-Eclipse-AutoStart: true
-Bundle-ClassPath: .
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties b/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties
deleted file mode 100644
index 33c2c65..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- icons/,\
- html/,\
- plugin.properties
diff --git a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html b/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html
deleted file mode 100644
index 367221c..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.upc/html/id_MYTHREAD.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<h2><code>MYTHREAD</code> keyword</h2>
-
-
-<h4>Description</h4>
-<p>
-<code>MYTHREAD</code> is an expression with a value of type int; it specifies the unique
-thread index.
-<br>The range of possible values is <code>0..THREADS-16</code>.
-<h4>Example</h4>
-<p>The following program prints the numbers 0
-through <code>THREADS-1</code>, in some order.
-<pre>
- #include <upc.h>
- main(){
- printf("%d ",MYTHREAD);
- }
-</pre>
-<p>See also <a href="id_THREADS.html"><code>THREADS</code></a>,
-
-<p> 
-<p> 
-<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> 
-<p> 
-<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> 
-<p> 
-<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> 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> 
-<p> 
-<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> 
-<p> 
-<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>
-<execution-time action> 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- #include <upc_collective.h>
- 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 <upc.h>
-#include <upc_collective.h>
-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 <upc.h>
-#include <upc_collective.h>
-#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 <upc.h>
-#include <upc_collective.h>
-#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> 
-<p> 
-<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 <upc.h>
- #include <upc_collective.h>
- 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 <upc.h>
-#include <upc_collective.h>
-#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 <upc.h>
-#include <upc_collective.h>
-#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<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> 
-<p> 
-<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 <upc.h>
- #include <upc_collective.h>
- 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 <upc.h>
-#include <upc_collective.h>
-#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 <upc.h>
-#include <upc_collective.h>
-#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> 
-<p> 
-<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 <upc.h>
- #include <upc_collective.h>
- 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 <upc.h>
-#include <upc_collective.h>
-#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 <upc.h>
-#include <upc_collective.h>
-#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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- #include <upc_collective.h>
- 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 <upc.h>
-#include <upc_collective.h>
-#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> 
-<p> 
-<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 <upc.h>
- #include <upc_collective.h>
- 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 <upc.h>
-#include <upc_collective.h>
-#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 <upc.h>
-#include <upc_collective.h>
-#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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <i>deprecated</i> </h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre>
- #include <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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 </h2>
-
-<h4>Synopsis</h4>
-<p>
-<pre>
- #include <upc.h>
- 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> 
-<p> 
-<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 <upc.h>
- 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> 
-<p> 
-<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);
- }
-}
