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

Sprout from master 2011-10-20 13:19:45 UTC Greg Watson <g.watson@computer.org> 'Add pom.xml'
Delete:
    core/org.eclipse.ptp.core.tests/.classpath
    core/org.eclipse.ptp.core.tests/.project
    core/org.eclipse.ptp.core.tests/.settings/org.eclipse.jdt.core.prefs
    core/org.eclipse.ptp.core.tests/META-INF/MANIFEST.MF
    core/org.eclipse.ptp.core.tests/build.properties
    core/org.eclipse.ptp.core.tests/plugin.properties
    core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/AttributeIndexSetTests.java
    core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/RangeSetTests.java
    core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/suite/CoreTestSuite.java
    core/org.eclipse.ptp.doc.isv/.classpath
    core/org.eclipse.ptp.doc.isv/.cvsignore
    core/org.eclipse.ptp.doc.isv/.project
    core/org.eclipse.ptp.doc.isv/META-INF/MANIFEST.MF
    core/org.eclipse.ptp.doc.isv/aaa-how-to-add-things.txt
    core/org.eclipse.ptp.doc.isv/about.html
    core/org.eclipse.ptp.doc.isv/book.css
    core/org.eclipse.ptp.doc.isv/build.properties
    core/org.eclipse.ptp.doc.isv/buildDoc.xml
    core/org.eclipse.ptp.doc.isv/customBuildCallbacks.xml
    core/org.eclipse.ptp.doc.isv/guide.xml
    core/org.eclipse.ptp.doc.isv/guide/api/actions/uiActionsAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/dialogs/browseFolderDialog.gif
    core/org.eclipse.ptp.doc.isv/guide/api/dialogs/deleteDialog.gif
    core/org.eclipse.ptp.doc.isv/guide/api/dialogs/dialogSample.html
    core/org.eclipse.ptp.doc.isv/guide/api/dialogs/renameManyDialog.gif
    core/org.eclipse.ptp.doc.isv/guide/api/dialogs/renameOneDialog.gif
    core/org.eclipse.ptp.doc.isv/guide/api/dialogs/sampleDlg.gif
    core/org.eclipse.ptp.doc.isv/guide/api/dialogs/selectTypesDialog.gif
    core/org.eclipse.ptp.doc.isv/guide/api/dialogs/simpleSelectDialog.gif
    core/org.eclipse.ptp.doc.isv/guide/api/dialogs/uiDialogsAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/logger/logPreferences.gif
    core/org.eclipse.ptp.doc.isv/guide/api/logger/uiLoggerAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/massagers/uiMassagersAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/messages/msgDialog.gif
    core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_dialog.gif
    core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_properties.gif
    core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_wizard.gif
    core/org.eclipse.ptp.doc.isv/guide/api/messages/msgSample_msgDlg.gif
    core/org.eclipse.ptp.doc.isv/guide/api/messages/msgSample_msgline.gif
    core/org.eclipse.ptp.doc.isv/guide/api/messages/sampleMessageFile.html
    core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessageAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessageFile.html
    core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessagesCore.html
    core/org.eclipse.ptp.doc.isv/guide/api/modelAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/plugin/uiPluginAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_checkBox.gif
    core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_comboBox.gif
    core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_keyValue.gif
    core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_string.gif
    core/org.eclipse.ptp.doc.isv/guide/api/preferences/rsePreferences.gif
    core/org.eclipse.ptp.doc.isv/guide/api/preferences/uiPreferencesAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/properties/uiPropertiesAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/resourceAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/uiAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/validators/uiValidatorsAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample1.html
    core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample2.html
    core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample3.html
    core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample4.html
    core/org.eclipse.ptp.doc.isv/guide/api/widgets/uiWidgetsAPI.html
    core/org.eclipse.ptp.doc.isv/guide/api/wizards/uiWizardsAPI.html
    core/org.eclipse.ptp.doc.isv/guide/arch/Artifacts.html
    core/org.eclipse.ptp.doc.isv/guide/arch/Extensions.html
    core/org.eclipse.ptp.doc.isv/guide/arch/Model.html
    core/org.eclipse.ptp.doc.isv/guide/arch/ModelRSE.png
    core/org.eclipse.ptp.doc.isv/guide/architecture.html
    core/org.eclipse.ptp.doc.isv/guide/file_conn.gif
    core/org.eclipse.ptp.doc.isv/guide/file_profiles.gif
    core/org.eclipse.ptp.doc.isv/guide/guide.html
    core/org.eclipse.ptp.doc.isv/guide/images/configexample.jpg
    core/org.eclipse.ptp.doc.isv/guide/images/layers.jpg
    core/org.eclipse.ptp.doc.isv/guide/overview.html
    core/org.eclipse.ptp.doc.isv/guide/plugin/ChangeFilterDialog_Default.gif
    core/org.eclipse.ptp.doc.isv/guide/plugin/NewConnection.gif
    core/org.eclipse.ptp.doc.isv/guide/plugin/NewFilterWizard_Default.gif
    core/org.eclipse.ptp.doc.isv/guide/plugin/RSView_iSeries.gif
    core/org.eclipse.ptp.doc.isv/guide/plugin/other.html
    core/org.eclipse.ptp.doc.isv/guide/plugin/popup.html
    core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage.html
    core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage_figure1.gif
    core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage_figure2.gif
    core/org.eclipse.ptp.doc.isv/guide/plugin/subsystem.html
    core/org.eclipse.ptp.doc.isv/guide/plugin/systemtype.html
    core/org.eclipse.ptp.doc.isv/guide/plugin/view_Cmds.gif
    core/org.eclipse.ptp.doc.isv/guide/plugin/view_RS.gif
    core/org.eclipse.ptp.doc.isv/guide/plugin/view_Table.gif
    core/org.eclipse.ptp.doc.isv/guide/plugin/view_Team.gif
    core/org.eclipse.ptp.doc.isv/guide/preference_activeProfiles.gif
    core/org.eclipse.ptp.doc.isv/guide/preferences.gif
    core/org.eclipse.ptp.doc.isv/guide/rse.gif
    core/org.eclipse.ptp.doc.isv/guide/rse_int_connectorservices.html
    core/org.eclipse.ptp.doc.isv/guide/rse_int_files.html
    core/org.eclipse.ptp.doc.isv/guide/rse_int_filters.html
    core/org.eclipse.ptp.doc.isv/guide/rse_int_hosts.html
    core/org.eclipse.ptp.doc.isv/guide/rse_int_overview.html
    core/org.eclipse.ptp.doc.isv/guide/rse_int_processes.html
    core/org.eclipse.ptp.doc.isv/guide/rse_int_services.html
    core/org.eclipse.ptp.doc.isv/guide/rse_int_shells.html
    core/org.eclipse.ptp.doc.isv/guide/rse_int_subsystems.html
    core/org.eclipse.ptp.doc.isv/guide/rse_int_ui.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperAdapterFactory.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperConnectorService.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperConnectorServiceManager.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterDialog.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterStringEditPane.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterWizard.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperResource.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperResourceAdapter.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystem.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystem2.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/FolderInfoPropertyPage1.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/FolderInfoPropertyPage2.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/IDeveloperSubSystem.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/InitializeImageRegistry.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/InitializeImageRegistry2.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterActions.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterIcons.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterWizard.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/RSESamplesPlugin.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/RSESamplesPlugin2.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/ShowJarContents1.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/ShowJarContents2.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamFilterDialog.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamFilterWizard.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamResource.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamResourceAdapter.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/index.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/newFilterAction.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_1.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props1.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2_addvar1.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2_addvar2.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3_addvar1.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3_addvar2.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props4.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar1.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar1_selectFolder.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar2.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar3.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar4.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar5.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_newVar_msg.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_after.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page1.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page3.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page4.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProject.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/popup.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_newClass.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_run.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_see.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/preferences_JavaFormatting.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_newClass.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_run_done.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_run_during.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_see.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/renameAction.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/renameDialog.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesMessages2.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources2.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources3.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources4.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/runIt1.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/runIt2.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/startup.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/subsystem.html
    core/org.eclipse.ptp.doc.isv/guide/tutorial/testFilter.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorial/testRename.gif
    core/org.eclipse.ptp.doc.isv/guide/tutorials.html
    core/org.eclipse.ptp.doc.isv/guide/usingAPIs.html
    core/org.eclipse.ptp.doc.isv/guide/view_RS.gif
    core/org.eclipse.ptp.doc.isv/guide/view_pulldown.gif
    core/org.eclipse.ptp.doc.isv/icons/developer.gif
    core/org.eclipse.ptp.doc.isv/icons/developerFilter.gif
    core/org.eclipse.ptp.doc.isv/icons/team.gif
    core/org.eclipse.ptp.doc.isv/icons/teamFilter.gif
    core/org.eclipse.ptp.doc.isv/notices.html
    core/org.eclipse.ptp.doc.isv/options.txt
    core/org.eclipse.ptp.doc.isv/plugin.properties
    core/org.eclipse.ptp.doc.isv/plugin.xml
    core/org.eclipse.ptp.doc.isv/pom.xml
    core/org.eclipse.ptp.doc.isv/provisional_api.html
    core/org.eclipse.ptp.doc.isv/reference.xml
    core/org.eclipse.ptp.doc.isv/reference/.cvsignore
    core/org.eclipse.ptp.doc.isv/reference/extension-points/.cvsignore
    core/org.eclipse.ptp.doc.isv/reference/extension-points/index.html
    core/org.eclipse.ptp.doc.isv/reference/misc/index.html
    core/org.eclipse.ptp.doc.isv/reference/misc/overview-rse.html
    core/org.eclipse.ptp.doc.isv/reference/misc/runtime-options.html
    core/org.eclipse.ptp.doc.isv/samples/samples.html
    core/org.eclipse.ptp.doc.isv/schema.css
    core/org.eclipse.ptp.doc.isv/toc.xml
    core/org.eclipse.ptp.doc.user/.classpath
    core/org.eclipse.ptp.doc.user/.cvsignore
    core/org.eclipse.ptp.doc.user/.project
    core/org.eclipse.ptp.doc.user/.settings/org.eclipse.jdt.core.prefs
    core/org.eclipse.ptp.doc.user/META-INF/MANIFEST.MF
    core/org.eclipse.ptp.doc.user/about.html
    core/org.eclipse.ptp.doc.user/build.properties
    core/org.eclipse.ptp.doc.user/html/00newNoteworthy.html
    core/org.eclipse.ptp.doc.user/html/00overview.html
    core/org.eclipse.ptp.doc.user/html/00prereqs.html
    core/org.eclipse.ptp.doc.user/html/01buildMPIprog.html
    core/org.eclipse.ptp.doc.user/html/02resMgrRemoteLaunch.html
    core/org.eclipse.ptp.doc.user/html/02resMgrSetup.html
    core/org.eclipse.ptp.doc.user/html/03pLaunchConfig.html
    core/org.eclipse.ptp.doc.user/html/05monitoring.html
    core/org.eclipse.ptp.doc.user/html/06parDebugging.html
    core/org.eclipse.ptp.doc.user/html/07ptpPrefs.html
    core/org.eclipse.ptp.doc.user/html/help.css
    core/org.eclipse.ptp.doc.user/html/images/.cvsignore
    core/org.eclipse.ptp.doc.user/html/images/01mpiProjSettings.png
    core/org.eclipse.ptp.doc.user/html/images/01newMPIproject.png
    core/org.eclipse.ptp.doc.user/html/images/01proj.png
    core/org.eclipse.ptp.doc.user/html/images/01projBasicSettings.png
    core/org.eclipse.ptp.doc.user/html/images/01wbSrcEditor.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Configuration.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Local.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote0.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote1.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Edit.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-List.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Machines.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Remove.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Running.png
    core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Start.png
    core/org.eclipse.ptp.doc.user/html/images/02ChangeResMgrStartup.png
    core/org.eclipse.ptp.doc.user/html/images/02ChooseResMgrNameAndDesc.png
    core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch01.png
    core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch02.png
    core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch03.png
    core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch04.png
    core/org.eclipse.ptp.doc.user/html/images/02RuntimePerspEmpty.png
    core/org.eclipse.ptp.doc.user/html/images/02addResMgr.png
    core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType.png
    core/org.eclipse.ptp.doc.user/html/images/02newRemoteHost.png
    core/org.eclipse.ptp.doc.user/html/images/02remoteBrowseProxy.png
    core/org.eclipse.ptp.doc.user/html/images/02resMgrEdit.png
    core/org.eclipse.ptp.doc.user/html/images/02resMgrListOrteLocal.png
    core/org.eclipse.ptp.doc.user/html/images/02resMgrRemove.png
    core/org.eclipse.ptp.doc.user/html/images/02resMgrRunning.png
    core/org.eclipse.ptp.doc.user/html/images/02resMgrStart.png
    core/org.eclipse.ptp.doc.user/html/images/02rmServiceConfig.png
    core/org.eclipse.ptp.doc.user/html/images/03combinedConsole1.png
    core/org.eclipse.ptp.doc.user/html/images/03launch1.png
    core/org.eclipse.ptp.doc.user/html/images/03launch1a.png
    core/org.eclipse.ptp.doc.user/html/images/03launch2.png
    core/org.eclipse.ptp.doc.user/html/images/03launch3.png
    core/org.eclipse.ptp.doc.user/html/images/03launch4.png
    core/org.eclipse.ptp.doc.user/html/images/03launch5.png
    core/org.eclipse.ptp.doc.user/html/images/03launch6.png
    core/org.eclipse.ptp.doc.user/html/images/03launch7.png
    core/org.eclipse.ptp.doc.user/html/images/03launch8.png
    core/org.eclipse.ptp.doc.user/html/images/03launch9.png
    core/org.eclipse.ptp.doc.user/html/images/03launchResTab.png
    core/org.eclipse.ptp.doc.user/html/images/05activeJobs1.png
    core/org.eclipse.ptp.doc.user/html/images/05activeJobs2.png
    core/org.eclipse.ptp.doc.user/html/images/05activeJobs3.png
    core/org.eclipse.ptp.doc.user/html/images/05inactiveJobs1.png
    core/org.eclipse.ptp.doc.user/html/images/05inactiveJobs2.png
    core/org.eclipse.ptp.doc.user/html/images/05legendIcon.png
    core/org.eclipse.ptp.doc.user/html/images/05parallel_perspective.png
    core/org.eclipse.ptp.doc.user/html/images/05ptpLegend.png
    core/org.eclipse.ptp.doc.user/html/images/05ptpLegendJobProcess.png
    core/org.eclipse.ptp.doc.user/html/images/05ptpLegendMachines.png
    core/org.eclipse.ptp.doc.user/html/images/05ptpLegendResMgr.png
    core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeConsoleView.png
    core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsView.png
    core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsViewHover.png
    core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeProcessDetails.png
    core/org.eclipse.ptp.doc.user/html/images/05runtimeMachinesView.png
    core/org.eclipse.ptp.doc.user/html/images/05runtimeNodeDetails.png
    core/org.eclipse.ptp.doc.user/html/images/05runtimePerspAnn.png
    core/org.eclipse.ptp.doc.user/html/images/05runtimeResMgrView.png
    core/org.eclipse.ptp.doc.user/html/images/05sysMonPersp.png
    core/org.eclipse.ptp.doc.user/html/images/05sysMonView1.png
    core/org.eclipse.ptp.doc.user/html/images/06bkptHover.png
    core/org.eclipse.ptp.doc.user/html/images/06bkptSetContext.png
    core/org.eclipse.ptp.doc.user/html/images/06bkptsView.png
    core/org.eclipse.ptp.doc.user/html/images/06bkptsViewByProcessSet.png
    core/org.eclipse.ptp.doc.user/html/images/06bkptsViewMenu.png
    core/org.eclipse.ptp.doc.user/html/images/06cipHover.png
    core/org.eclipse.ptp.doc.user/html/images/06createProcessSetIcon.png
    core/org.eclipse.ptp.doc.user/html/images/06downArrowSelect.png
    core/org.eclipse.ptp.doc.user/html/images/06globalBreakpoint.png
    core/org.eclipse.ptp.doc.user/html/images/06ipMult.png
    core/org.eclipse.ptp.doc.user/html/images/06ipReg.png
    core/org.eclipse.ptp.doc.user/html/images/06ipUnreg.png
    core/org.eclipse.ptp.doc.user/html/images/06launchConfig.png
    core/org.eclipse.ptp.doc.user/html/images/06mip.png
    core/org.eclipse.ptp.doc.user/html/images/06pSetChange.png
    core/org.eclipse.ptp.doc.user/html/images/06pSetChooseIcon.png
    core/org.eclipse.ptp.doc.user/html/images/06pSetDelete.png
    core/org.eclipse.ptp.doc.user/html/images/06pSetRemove.png
    core/org.eclipse.ptp.doc.user/html/images/06pSetSelect.png
    core/org.eclipse.ptp.doc.user/html/images/06pSets.png
    core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewCmds.png
    core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewSets.png
    core/org.eclipse.ptp.doc.user/html/images/06ptpDebugPersp.png
    core/org.eclipse.ptp.doc.user/html/images/06reg1.png
    core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreate.png
    core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreateAdd.png
    core/org.eclipse.ptp.doc.user/html/images/06setBreakpoint.png
    core/org.eclipse.ptp.doc.user/html/images/06terminate.png
    core/org.eclipse.ptp.doc.user/html/images/06terminateAll.png
    core/org.eclipse.ptp.doc.user/html/images/07prefsAll.png
    core/org.eclipse.ptp.doc.user/html/images/07prefsDebug.png
    core/org.eclipse.ptp.doc.user/html/images/07prefsDebugSDM.png
    core/org.eclipse.ptp.doc.user/html/images/07prefsExternal.png
    core/org.eclipse.ptp.doc.user/html/images/07prefsExternal2.png
    core/org.eclipse.ptp.doc.user/html/images/07prefsExternal3.png
    core/org.eclipse.ptp.doc.user/html/images/07prefsRM.png
    core/org.eclipse.ptp.doc.user/html/images/07prefsServiceConfig.png
    core/org.eclipse.ptp.doc.user/html/images/07prefsViewer.png
    core/org.eclipse.ptp.doc.user/html/images/rm-new-project-provider.png
    core/org.eclipse.ptp.doc.user/html/images/sync-contextMenu.png
    core/org.eclipse.ptp.doc.user/html/images/sync-conversionWizard.png
    core/org.eclipse.ptp.doc.user/html/images/sync-newproj.png
    core/org.eclipse.ptp.doc.user/html/images/sync-newprojConfigLocn.png
    core/org.eclipse.ptp.doc.user/html/images/sync-newprojConnect.png
    core/org.eclipse.ptp.doc.user/html/images/sync-newprojConnection.png
    core/org.eclipse.ptp.doc.user/html/images/sync-newprojContext.png
    core/org.eclipse.ptp.doc.user/html/images/sync-newprojCreate.png
    core/org.eclipse.ptp.doc.user/html/images/sync-newprojLocn.png
    core/org.eclipse.ptp.doc.user/html/images/sync-newprojNewConnection.png
    core/org.eclipse.ptp.doc.user/html/images/sync-projProperties.png
    core/org.eclipse.ptp.doc.user/html/images/sync-project-provider.png
    core/org.eclipse.ptp.doc.user/html/images/sync-selectConversionWizard.png
    core/org.eclipse.ptp.doc.user/html/images/toc_parallel_perspective_lg.png
    core/org.eclipse.ptp.doc.user/html/localVsRemote.html
    core/org.eclipse.ptp.doc.user/html/sync.html
    core/org.eclipse.ptp.doc.user/html/thumb.js
    core/org.eclipse.ptp.doc.user/html/thumb2.js
    core/org.eclipse.ptp.doc.user/html/toc.html
    core/org.eclipse.ptp.doc.user/intro/css/graphics/ptp_logo_intro.png
    core/org.eclipse.ptp.doc.user/intro/css/graphics/ptp_logo_intro_hov.png
    core/org.eclipse.ptp.doc.user/intro/css/sample.css
    core/org.eclipse.ptp.doc.user/intro/ptpOverview.xml
    core/org.eclipse.ptp.doc.user/intro/ptpTutorial.xml
    core/org.eclipse.ptp.doc.user/intro/ptpWhatsnew.xml
    core/org.eclipse.ptp.doc.user/plugin.properties
    core/org.eclipse.ptp.doc.user/plugin.xml
    core/org.eclipse.ptp.doc.user/pom.xml
    core/org.eclipse.ptp.doc.user/toc.xml
    core/org.eclipse.ptp.remote.core.tests/.classpath
    core/org.eclipse.ptp.remote.core.tests/.project
    core/org.eclipse.ptp.remote.core.tests/.settings/org.eclipse.jdt.core.prefs
    core/org.eclipse.ptp.remote.core.tests/META-INF/MANIFEST.MF
    core/org.eclipse.ptp.remote.core.tests/build.properties
    core/org.eclipse.ptp.remote.core.tests/plugin.properties
    core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/FileStoreTests.java
    core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteConnectionTests.java
    core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteProcessTests.java
    core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteToolsTests.java
    core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/SFTPTests.java
    core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/remote/core/tests/suite/RemoteCoreTestSuite.java
    core/org.eclipse.ptp.utils.core.tests/.classpath
    core/org.eclipse.ptp.utils.core.tests/.project
    core/org.eclipse.ptp.utils.core.tests/.settings/org.eclipse.jdt.core.prefs
    core/org.eclipse.ptp.utils.core.tests/META-INF/MANIFEST.MF
    core/org.eclipse.ptp.utils.core.tests/build.properties
    core/org.eclipse.ptp.utils.core.tests/plugin.properties
    core/org.eclipse.ptp.utils.core.tests/src/org/eclipse/ptp/utils/core/tests/ArgumentParserTests.java
    core/org.eclipse.ptp.utils.core.tests/src/org/eclipse/ptp/utils/core/tests/suite/UtilsCoreTestSuite.java
    debug/org.eclipse.ptp.debug.core.tests/.classpath
    debug/org.eclipse.ptp.debug.core.tests/.project
    debug/org.eclipse.ptp.debug.core.tests/.settings/org.eclipse.jdt.core.prefs
    debug/org.eclipse.ptp.debug.core.tests/META-INF/MANIFEST.MF
    debug/org.eclipse.ptp.debug.core.tests/build.properties
    debug/org.eclipse.ptp.debug.core.tests/plugin.properties
    debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/AIFTests.java
    debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/TaskSetTests.java
    debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/suite/DebugCoreTestSuite.java
    pom.xml
    rdt/org.eclipse.ptp.rdt.sync.core.tests/.classpath
    rdt/org.eclipse.ptp.rdt.sync.core.tests/.project
    rdt/org.eclipse.ptp.rdt.sync.core.tests/.settings/org.eclipse.jdt.core.prefs
    rdt/org.eclipse.ptp.rdt.sync.core.tests/META-INF/MANIFEST.MF
    rdt/org.eclipse.ptp.rdt.sync.core.tests/about.html
    rdt/org.eclipse.ptp.rdt.sync.core.tests/build.properties
    rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/BasicGitSyncTests.java
    rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/TemporaryGitRemoteSyncConnection.java
    rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/remotehost.properties.sample
    rdt/org.eclipse.ptp.rdt.sync.rsync.core/.classpath
    rdt/org.eclipse.ptp.rdt.sync.rsync.core/.project
    rdt/org.eclipse.ptp.rdt.sync.rsync.core/META-INF/MANIFEST.MF
    rdt/org.eclipse.ptp.rdt.sync.rsync.core/build.properties
    rdt/org.eclipse.ptp.rdt.sync.rsync.core/plugin.properties
    rdt/org.eclipse.ptp.rdt.sync.rsync.core/plugin.xml
    rdt/org.eclipse.ptp.rdt.sync.rsync.core/src/org/eclipse/ptp/rdt/sync/rsync/core/Activator.java
    rdt/org.eclipse.ptp.rdt.sync.rsync.core/src/org/eclipse/ptp/rdt/sync/rsync/core/RSyncServiceProvider.java
    rdt/org.eclipse.ptp.rdt.sync.rsync.ui/.classpath
    rdt/org.eclipse.ptp.rdt.sync.rsync.ui/.project
    rdt/org.eclipse.ptp.rdt.sync.rsync.ui/META-INF/MANIFEST.MF
    rdt/org.eclipse.ptp.rdt.sync.rsync.ui/build.properties
    rdt/org.eclipse.ptp.rdt.sync.rsync.ui/plugin.properties
    rdt/org.eclipse.ptp.rdt.sync.rsync.ui/plugin.xml
    rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/Activator.java
    rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/RSyncParticipant.java
    rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/messages/Messages.java
    rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/messages/messages.properties
    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.fortran-feature/.project
    releng/org.eclipse.ptp.pldt.fortran-feature/build.properties
    releng/org.eclipse.ptp.pldt.fortran-feature/feature.properties
    releng/org.eclipse.ptp.pldt.fortran-feature/feature.xml
    releng/org.eclipse.ptp.pldt.fortran-feature/pom.xml
    releng/org.eclipse.ptp.rdt.sdk-feature/.project
    releng/org.eclipse.ptp.rdt.sdk-feature/build.properties
    releng/org.eclipse.ptp.rdt.sdk-feature/epl-v10.html
    releng/org.eclipse.ptp.rdt.sdk-feature/feature.properties
    releng/org.eclipse.ptp.rdt.sdk-feature/feature.xml
    releng/org.eclipse.ptp.rdt.sdk-feature/license.html
    releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg
    releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/epl-v10.html
    releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/feature.properties
    releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/license.html
    releng/org.eclipse.ptp.rdt.xlc.sdk-feature/.project
    releng/org.eclipse.ptp.rdt.xlc.sdk-feature/build.properties
    releng/org.eclipse.ptp.rdt.xlc.sdk-feature/epl-v10.html
    releng/org.eclipse.ptp.rdt.xlc.sdk-feature/feature.properties
    releng/org.eclipse.ptp.rdt.xlc.sdk-feature/feature.xml
    releng/org.eclipse.ptp.rdt.xlc.sdk-feature/license.html
    releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg
    releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/epl-v10.html
    releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/feature.properties
    releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/license.html
    releng/org.eclipse.ptp.releng/.cvsignore
    releng/org.eclipse.ptp.releng/.project
    releng/org.eclipse.ptp.releng/addDownloadStats.xsl
    releng/org.eclipse.ptp.releng/build.sh
    releng/org.eclipse.ptp.releng/build.xml
    releng/org.eclipse.ptp.releng/buildindex.html
    releng/org.eclipse.ptp.releng/buildsite.xml
    releng/org.eclipse.ptp.releng/index.html
    releng/org.eclipse.ptp.releng/maps/photran.map
    releng/org.eclipse.ptp.releng/maps/ptp.map
    releng/org.eclipse.ptp.releng/master/build.properties
    releng/org.eclipse.ptp.releng/master/customTargets.xml
    releng/org.eclipse.ptp.releng/pack.properties
    releng/org.eclipse.ptp.releng/ptpbuild
    releng/org.eclipse.ptp.releng/update_versions
    releng/org.eclipse.ptp.releng/web/site.css
    releng/org.eclipse.ptp.releng/web/site.xsl
    releng/org.eclipse.ptp.repo/.project
    releng/org.eclipse.ptp.repo/category.xml
    releng/org.eclipse.ptp.repo/pom.xml
    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.pbs-feature/.project
    releng/org.eclipse.ptp.rm.pbs-feature/build.properties
    releng/org.eclipse.ptp.rm.pbs-feature/feature.properties
    releng/org.eclipse.ptp.rm.pbs-feature/feature.xml
    rms/org.eclipse.ptp.rm.jaxb.openmpi/.project
    rms/org.eclipse.ptp.rm.jaxb.openmpi/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.jaxb.openmpi/about.html
    rms/org.eclipse.ptp.rm.jaxb.openmpi/about.ini
    rms/org.eclipse.ptp.rm.jaxb.openmpi/about.mappings
    rms/org.eclipse.ptp.rm.jaxb.openmpi/about.properties
    rms/org.eclipse.ptp.rm.jaxb.openmpi/build.properties
    rms/org.eclipse.ptp.rm.jaxb.openmpi/data/openmpi-generic.xml
    rms/org.eclipse.ptp.rm.jaxb.openmpi/plugin.properties
    rms/org.eclipse.ptp.rm.jaxb.openmpi/plugin.xml
    rms/org.eclipse.ptp.rm.jaxb.openmpi/pom.xml
    rms/org.eclipse.ptp.rm.jaxb.openmpi/ptp_logo_icon32.png
    rms/org.eclipse.ptp.rm.jaxb.tests/.classpath
    rms/org.eclipse.ptp.rm.jaxb.tests/.project
    rms/org.eclipse.ptp.rm.jaxb.tests/.settings/org.eclipse.jdt.core.prefs
    rms/org.eclipse.ptp.rm.jaxb.tests/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.jaxb.tests/build.properties
    rms/org.eclipse.ptp.rm.jaxb.tests/data/browse-example.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/button-group-example.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/control-state-example.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/demo-example-with-action.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/demo-example.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/discovered-properties-example.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/namelist-example.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/pbs-test-local.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/sharedvar-example-2.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/sharedvar-example.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/tokenizer-examples.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/data/viewer-example.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/plugin.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/pom.xml
    rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/JAXBTestsPlugin.java
    rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/ManagedFilesTest.java
    rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/Messages.java
    rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/RMDataTest.java
    rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/RMLaunchTest.java
    rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/StreamParserTest.java
    rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/messages.properties
    rms/org.eclipse.ptp.rm.pbs.core.server/.classpath
    rms/org.eclipse.ptp.rm.pbs.core.server/.cvsignore
    rms/org.eclipse.ptp.rm.pbs.core.server/.project
    rms/org.eclipse.ptp.rm.pbs.core.server/.settings/org.eclipse.jdt.core.prefs
    rms/org.eclipse.ptp.rm.pbs.core.server/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.pbs.core.server/META-INF/eclipse.inf
    rms/org.eclipse.ptp.rm.pbs.core.server/about.html
    rms/org.eclipse.ptp.rm.pbs.core.server/build.properties
    rms/org.eclipse.ptp.rm.pbs.core.server/plugin.properties
    rms/org.eclipse.ptp.rm.pbs.core.server/plugin.xml
    rms/org.eclipse.ptp.rm.pbs.core.server/src/org/eclipse/ptp/rm/pbs/core/server/Activator.java
    rms/org.eclipse.ptp.rm.pbs.core.server/src/org/eclipse/ptp/rm/pbs/core/server/PBSProxyServerRunner.java
    rms/org.eclipse.ptp.rm.pbs.core/.classpath
    rms/org.eclipse.ptp.rm.pbs.core/.cvsignore
    rms/org.eclipse.ptp.rm.pbs.core/.project
    rms/org.eclipse.ptp.rm.pbs.core/.settings/org.eclipse.jdt.core.prefs
    rms/org.eclipse.ptp.rm.pbs.core/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.pbs.core/about.html
    rms/org.eclipse.ptp.rm.pbs.core/about.ini
    rms/org.eclipse.ptp.rm.pbs.core/about.mappings
    rms/org.eclipse.ptp.rm.pbs.core/about.properties
    rms/org.eclipse.ptp.rm.pbs.core/build.properties
    rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Pro.job_attributes.xml
    rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Torque_SMP.job_attributes.xml
    rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Torque_Standard.job_attributes.xml
    rms/org.eclipse.ptp.rm.pbs.core/plugin.properties
    rms/org.eclipse.ptp.rm.pbs.core/plugin.xml
    rms/org.eclipse.ptp.rm.pbs.core/ptp_logo_icon32.png
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/Activator.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/ConfigUtils.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/IPBSNonNLSConstants.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/AttributePlaceholder.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/IPBSJobAttributeData.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/PBSXMLJobAttributeData.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/Messages.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/messages.properties
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManager.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerConfiguration.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerControl.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerFactory.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerMonitor.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSProxyRuntimeClient.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystem.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystemFactory.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/IPBSAttributeToTemplateConverter.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSAttributeToTemplateConverterFactory.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBaseAttributeToTemplateConverter.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBatchScriptTemplate.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBatchScriptTemplateManager.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSModelDefinitionAttributeToTemplateConverter.java
    rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSXMLAttributeToTemplateConverter.java
    rms/org.eclipse.ptp.rm.pbs.help/.classpath
    rms/org.eclipse.ptp.rm.pbs.help/.project
    rms/org.eclipse.ptp.rm.pbs.help/.settings/org.eclipse.jdt.core.prefs
    rms/org.eclipse.ptp.rm.pbs.help/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.pbs.help/about.html
    rms/org.eclipse.ptp.rm.pbs.help/build.properties
    rms/org.eclipse.ptp.rm.pbs.help/html/PBSHelpPage.html
    rms/org.eclipse.ptp.rm.pbs.help/html/help.css
    rms/org.eclipse.ptp.rm.pbs.help/html/images/00Preferences.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/01PrefiguredTypes.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/02Basic.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/03Configuration.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/04Script.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/05AdvancedSettings.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/06Imported.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/07Interactive.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/08Actions.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/09Output.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/10Import.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/11Import.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/12Import.png
    rms/org.eclipse.ptp.rm.pbs.help/html/images/13Import.png
    rms/org.eclipse.ptp.rm.pbs.help/html/toc.html
    rms/org.eclipse.ptp.rm.pbs.help/plugin.properties
    rms/org.eclipse.ptp.rm.pbs.help/plugin.xml
    rms/org.eclipse.ptp.rm.pbs.help/src/org/eclipse/ptp/rm/pbs/help/Activator.java
    rms/org.eclipse.ptp.rm.pbs.help/toc.xml
    rms/org.eclipse.ptp.rm.pbs.jproxy/.classpath
    rms/org.eclipse.ptp.rm.pbs.jproxy/.externalToolBuilders/ANT JAR Builder.launch
    rms/org.eclipse.ptp.rm.pbs.jproxy/.project
    rms/org.eclipse.ptp.rm.pbs.jproxy/.settings/org.eclipse.jdt.core.prefs
    rms/org.eclipse.ptp.rm.pbs.jproxy/.settings/org.eclipse.ltk.core.refactoring.prefs
    rms/org.eclipse.ptp.rm.pbs.jproxy/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Definitions-old.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Definitions.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/PBS2Protocol-KeyMap.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/PBS2Protocol-ValueMap.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-job.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-node.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-queue.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-job.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-node.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-queue.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-job.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-node.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-queue.txt
    rms/org.eclipse.ptp.rm.pbs.jproxy/about.html
    rms/org.eclipse.ptp.rm.pbs.jproxy/build.properties
    rms/org.eclipse.ptp.rm.pbs.jproxy/build.xml
    rms/org.eclipse.ptp.rm.pbs.jproxy/com.chartle.ant.jar
    rms/org.eclipse.ptp.rm.pbs.jproxy/customBuild.xml
    rms/org.eclipse.ptp.rm.pbs.jproxy/plugin.properties
    rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/Messages.java
    rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/PBSProxyRuntimeServer.java
    rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/messages.properties
    rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeDefinitionReader.java
    rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeKeyMapReader.java
    rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeValueMapReader.java
    rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/QstatJobXMLReader.java
    rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/QstatQueuesReader.java
    rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/RequiredAttributeKeyReader.java
    rms/org.eclipse.ptp.rm.pbs.proxy/.cproject
    rms/org.eclipse.ptp.rm.pbs.proxy/.cvsignore
    rms/org.eclipse.ptp.rm.pbs.proxy/.project
    rms/org.eclipse.ptp.rm.pbs.proxy/AUTHORS
    rms/org.eclipse.ptp.rm.pbs.proxy/COPYING
    rms/org.eclipse.ptp.rm.pbs.proxy/ChangeLog
    rms/org.eclipse.ptp.rm.pbs.proxy/INSTALL
    rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/eclipse.inf
    rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.am
    rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.in
    rms/org.eclipse.ptp.rm.pbs.proxy/NEWS
    rms/org.eclipse.ptp.rm.pbs.proxy/README
    rms/org.eclipse.ptp.rm.pbs.proxy/about.html
    rms/org.eclipse.ptp.rm.pbs.proxy/aclocal.m4
    rms/org.eclipse.ptp.rm.pbs.proxy/build.properties
    rms/org.eclipse.ptp.rm.pbs.proxy/compile
    rms/org.eclipse.ptp.rm.pbs.proxy/config.guess
    rms/org.eclipse.ptp.rm.pbs.proxy/config.h.in
    rms/org.eclipse.ptp.rm.pbs.proxy/config.sub
    rms/org.eclipse.ptp.rm.pbs.proxy/configure
    rms/org.eclipse.ptp.rm.pbs.proxy/configure.in
    rms/org.eclipse.ptp.rm.pbs.proxy/depcomp
    rms/org.eclipse.ptp.rm.pbs.proxy/include/ptp_pbs_job.h
    rms/org.eclipse.ptp.rm.pbs.proxy/install-sh
    rms/org.eclipse.ptp.rm.pbs.proxy/missing
    rms/org.eclipse.ptp.rm.pbs.proxy/plugin.properties
    rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_job.c
    rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_job_tests.c
    rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_proxy.c
    rms/org.eclipse.ptp.rm.pbs.ui/.classpath
    rms/org.eclipse.ptp.rm.pbs.ui/.project
    rms/org.eclipse.ptp.rm.pbs.ui/.settings/org.eclipse.jdt.core.prefs
    rms/org.eclipse.ptp.rm.pbs.ui/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.pbs.ui/about.html
    rms/org.eclipse.ptp.rm.pbs.ui/build.properties
    rms/org.eclipse.ptp.rm.pbs.ui/plugin.properties
    rms/org.eclipse.ptp.rm.pbs.ui/plugin.xml
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSUIPlugin.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/dialogs/ComboEntryDialog.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/dialogs/ScrollingEditableMessageDialog.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationDynamicTab.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationFactory.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/Messages.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/messages.properties
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/providers/AttributeContentProvider.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/providers/AttributeLabelProvider.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/utils/WidgetUtils.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSBatchScriptTemplateWizard.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSBatchScriptTemplateWizardPage.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSRMConfigurationWizardPageFactory.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSRMLaunchConfigurationDynamicTabWizardPage.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSResourceManagerConfigurationWizardPage.java
    rms/org.eclipse.ptp.rm.pbs.ui/src/rm_configurations.properties
    rms/org.eclipse.ptp.rm.smoa.core/.classpath
    rms/org.eclipse.ptp.rm.smoa.core/.project
    rms/org.eclipse.ptp.rm.smoa.core/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.smoa.core/NOTICE.txt
    rms/org.eclipse.ptp.rm.smoa.core/about.html
    rms/org.eclipse.ptp.rm.smoa.core/build.properties
    rms/org.eclipse.ptp.rm.smoa.core/plugin.properties
    rms/org.eclipse.ptp.rm.smoa.core/plugin.xml
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOAConfiguration.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOACoreActivator.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOARemoteServicesFactory.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/Messages.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAJobAttributes.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAMachineAttributes.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOANodeAttributes.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAQueueAttributes.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOARMAttributes.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/StringMapAttribute.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/StringMapAttributeDefinition.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/messages.properties
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/JobThread.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/Messages.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/PoolingIntervals.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/PoolingIntervalsAndStatic.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManager.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerConfiguration.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerControl.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerFactory.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerMonitor.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/messages.properties
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/Messages.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAConnection.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAConnectionManager.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileManager.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileStagingHandler.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileStore.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOARemoteServices.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/messages.properties
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rtsystem/SMOARuntimeSystem.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rtsystem/SMOARuntimeSystemFactory.java
    rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/util/NotifyShell.java
    rms/org.eclipse.ptp.rm.smoa.ui/.classpath
    rms/org.eclipse.ptp.rm.smoa.ui/.project
    rms/org.eclipse.ptp.rm.smoa.ui/META-INF/MANIFEST.MF
    rms/org.eclipse.ptp.rm.smoa.ui/NOTICE.txt
    rms/org.eclipse.ptp.rm.smoa.ui/about.html
    rms/org.eclipse.ptp.rm.smoa.ui/build.properties
    rms/org.eclipse.ptp.rm.smoa.ui/plugin.properties
    rms/org.eclipse.ptp.rm.smoa.ui/plugin.xml
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/SMOAUIPlugin.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/Messages.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOACustomSyncAction.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOAToLocalSyncAction.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOAToRemoteSyncAction.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SelectConnetionAndDestDir.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/messages.properties
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/Messages.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/SMOARMLaunchConfigurationDynamicTab.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/SMOARMLaunchConfigurationFactory.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/messages.properties
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/Messages.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/SMOAPreferencePage.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/messages.properties
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIConnectionManager.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIFileManager.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIServices.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIServicesFactory.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/Messages.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOARMConfigurationWizardPageFactory.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOAResourceManagerConfigurationWizardPage.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOAResourceManagerFileServicesPage.java
    rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/messages.properties
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.classpath
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.project
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.settings/org.eclipse.jdt.core.prefs
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/META-INF/MANIFEST.MF
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/build.properties
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/data/sample.c
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/data/sample.xml
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/feedback_action.gif
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/feedback_view.gif
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/sample.gif
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/plugin.xml
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/Activator.java
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackItem.java
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackParser.java
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackView.java
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleShowFeedbackHandler.java
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/actions/SampleFeedbackAction.java
    tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/internal/FeedbackIDs.java
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.classpath
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.cvsignore
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.project
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.settings/org.eclipse.jdt.core.prefs
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/META-INF/MANIFEST.MF
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/about.html
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/build.properties
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/plugin.properties
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/pom.xml
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/Activator.java
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/actions/AnalyseMPIFortranHandler.java
    tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/analysis/MpiFortranASTVisitor.java
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.classpath
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.cvsignore
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.project
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.settings/org.eclipse.jdt.core.prefs
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/META-INF/MANIFEST.MF
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/about.html
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/build.properties
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/plugin.properties
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/pom.xml
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/Activator.java
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/actions/AnalyseOpenMPFortranHandler.java
    tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/analysis/OpenMPFortranASTVisitor.java
    tools/pldt/org.eclipse.ptp.pldt.tests/.classpath
    tools/pldt/org.eclipse.ptp.pldt.tests/.project
    tools/pldt/org.eclipse.ptp.pldt.tests/.settings/org.eclipse.jdt.core.prefs
    tools/pldt/org.eclipse.ptp.pldt.tests/META-INF/MANIFEST.MF
    tools/pldt/org.eclipse.ptp.pldt.tests/build.properties
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/HelloFortranMPI.f90
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloMPIcpp.cpp
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloOpenMP.c
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloOpenMPpragmas.c
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/includes/readme.txt
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/openMP.f90
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPI.c
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIMacro.c
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriers.c
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersErr.c
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersFnCall.c
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersTiny.c
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/testUPC.upc
    tools/pldt/org.eclipse.ptp.pldt.tests/resources/testUPCmacro.upc
    tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Activator.java
    tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/PldtBaseTestFramework.java
    tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/TestFortran.java
    tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_MPI.java
    tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_MPI_barriers.java
    tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_OpenMP.java
    tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_UPC.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.classpath
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/.project
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/META-INF/MANIFEST.MF
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/build.properties
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/calls.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsC.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/callsCF.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/class_hi.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphC.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/graphW.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/icons/sample.gif
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/plugin.xml
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/Hello.c
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/graph.c
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast.c
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast_edge.c
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/samples/walkast_edge_comments.c
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/Activator.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/actions/ASTWalkerAction.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCFGraphHandler.java
    tools/samples/org.eclipse.ptp.pldt.sampleCDTstaticAnalysis/src/org/eclipse/ptp/pldt/sampleCDTstaticAnalysis/handlers/BuildCallGraphHandler.java
diff --git a/core/org.eclipse.ptp.core.tests/.classpath b/core/org.eclipse.ptp.core.tests/.classpath
deleted file mode 100644
index 16d067f..0000000
--- a/core/org.eclipse.ptp.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/core/org.eclipse.ptp.core.tests/.project b/core/org.eclipse.ptp.core.tests/.project
deleted file mode 100644
index 6c8add1..0000000
--- a/core/org.eclipse.ptp.core.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.core.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/core/org.eclipse.ptp.core.tests/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d830758..0000000
--- a/core/org.eclipse.ptp.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,74 +0,0 @@
-#Sat Nov 07 12:58:41 EST 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.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=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=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-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=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-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
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.ptp.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 8a1db88..0000000
--- a/core/org.eclipse.ptp.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.core.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.ptp.core,
- org.eclipse.ptp.utils.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/org.eclipse.ptp.core.tests/build.properties b/core/org.eclipse.ptp.core.tests/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/core/org.eclipse.ptp.core.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/core/org.eclipse.ptp.core.tests/plugin.properties b/core/org.eclipse.ptp.core.tests/plugin.properties
deleted file mode 100644
index b3cca65..0000000
--- a/core/org.eclipse.ptp.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 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=PTP Core Tests
-pluginProvider=Eclipse PTP
diff --git a/core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/AttributeIndexSetTests.java b/core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/AttributeIndexSetTests.java
deleted file mode 100644
index cbfdb7b..0000000
--- a/core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/AttributeIndexSetTests.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2010 Los Alamos National Laboratory 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:
-* 	LANL - Initial API and implementation
-*******************************************************************************/
-
-package org.eclipse.ptp.core.tests;
-
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-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.attributes.AttributeIndexSet;
-
-
-/**
- * @author Randy M. Roberts
- *
- */
-public class AttributeIndexSetTests extends TestCase {
-	
-	private static void assertComplete(AttributeIndexSet<IntegerAttribute> indexSet) {
-		BitSet expected = indexSet.getIndexSet();
-		BitSet actual = new BitSet();
-		for (IntegerAttribute i1 : indexSet.getAttributes()) {
-			BitSet bs1 = indexSet.getIndexSet(i1);
-			actual.or(bs1);
-		}
-		assertEquals(expected, actual);
-	}
-	
-	private static void assertDisjoint(AttributeIndexSet<IntegerAttribute> indexSet) {
-		for (IntegerAttribute i1 : indexSet.getAttributes()) {
-			BitSet bs1 = indexSet.getIndexSet(i1);
-			for (IntegerAttribute i2 : indexSet.getAttributes()) {
-				if (i1.equals(i2)) {
-					continue;
-				}
-				BitSet bs2 = indexSet.getIndexSet(i2);
-				boolean intersects = bs1.intersects(bs2);
-				if (intersects) {
-					fail(bs1 + " and " + bs2 + " are not disjoint index sets");
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param bitset
-	 * @param is
-	 */
-	private static void set(BitSet bitset, int[] is) {
-		for (int i : is) {
-			bitset.set(i);
-		}
-	}
-	
-	private IntegerAttributeDefinition definition;
-	
-	private AttributeIndexSet<IntegerAttribute> testingIndexSet;
-	
-	@Override
-	public void setUp() {
-		try {
-			testingIndexSet = new AttributeIndexSet<IntegerAttribute>();
-			final BitSet indices = new BitSet();
-			definition = new IntegerAttributeDefinition("xxx", "name", "description", true, -42);
-			IntegerAttribute attr;
-			
-			attr = definition.create(1);
-			indices.set(0, 5);
-			indices.set(100, 105);
-			testingIndexSet.setIndicesOfAttribute(attr, indices);
-			
-			attr = definition.create(3);
-			indices.clear();
-			indices.set(200, 205);
-			indices.set(300, 305);
-			testingIndexSet.setIndicesOfAttribute(attr, indices);
-			
-			attr = definition.create(5);
-			indices.clear();
-			set(indices, new int[]{1,101,201,301,401});
-			testingIndexSet.setIndicesOfAttribute(attr, indices);
-			
-		} catch (IllegalValueException e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Override
-	public void tearDown() {
-		testingIndexSet = null;
-		definition = null;
-	}
-	
-	public void testAndAttrs() throws IllegalValueException {
-		IntegerAttribute attr = definition.create(1);
-		BitSet newIndices = new BitSet();
-		newIndices.set(99, 103);
-		testingIndexSet.addIndicesToAttribute(attr, newIndices);
-		
-		assertDisjoint(testingIndexSet);
-		assertComplete(testingIndexSet);
-
-		BitSet expected;
-		BitSet actual;
-
-		expected = new BitSet();
-		set(expected, new int[]{0, 1, 2, 3, 4, 99, 100, 101, 102, 103, 104, 200, 201, 202, 203, 204, 300, 301, 302, 303, 304, 401});
-		actual = testingIndexSet.getIndexSet();
-		assertEquals(expected, actual);
-
-		expected = new BitSet();
-		set(expected, new int[]{0, 2, 3, 4, 99, 100, 101, 102, 103, 104});
-		actual = getIndexSet(testingIndexSet, 1);
-		assertEquals(expected, actual);
-
-		expected = new BitSet();
-		set(expected, new int[]{200, 202, 203, 204, 300, 302, 303, 304});
-		actual = getIndexSet(testingIndexSet, 3);
-		assertEquals(expected, actual);
-
-		expected = new BitSet();
-		set(expected, new int[]{1,201,301,401});
-		actual = getIndexSet(testingIndexSet, 5);
-		assertEquals(expected, actual);		
-	}
-	
-	public void testClearIndices() throws IllegalValueException {
-		BitSet clearedSet = new BitSet();
-		set(clearedSet, new int[]{2,102,202,302,402,1000});
-		testingIndexSet.clearIndices(clearedSet);
-		
-		assertDisjoint(testingIndexSet);
-		assertComplete(testingIndexSet);
-
-		BitSet expected;
-		BitSet actual;
-
-		expected = new BitSet();
-		set(expected, new int[]{0, 1, 3, 4, 100, 101, 103, 104, 200, 201, 203, 204, 300, 301, 303, 304, 401});
-		actual = testingIndexSet.getIndexSet();
-		assertEquals(expected, actual);
-		
-		expected = new BitSet();
-		set(expected, new int[]{0, 3, 4, 100, 103, 104});
-		actual = getIndexSet(testingIndexSet, 1);
-		assertEquals(expected, actual);
-		
-		expected = new BitSet();
-		set(expected, new int[]{200, 203, 204, 300, 303, 304});
-		actual = getIndexSet(testingIndexSet, 3);
-		assertEquals(expected, actual);
-		
-		expected = new BitSet();
-		set(expected, new int[]{1, 101, 201, 301, 401});
-		actual = getIndexSet(testingIndexSet, 5);
-		assertEquals(expected, actual);
-		
-		// let's do another clearAttributes
-		clearedSet.clear();
-		clearedSet.set(200, 400);
-		testingIndexSet.clearIndices(clearedSet);
-		
-		assertDisjoint(testingIndexSet);
-		assertComplete(testingIndexSet);
-
-		expected.clear();
-		set(expected, new int[]{0, 1, 3, 4, 100, 101, 103, 104, 401});
-		actual = testingIndexSet.getIndexSet();
-		assertEquals(expected, actual);
-
-		expected = new BitSet();
-		set(expected, new int[]{0, 3, 4, 100, 103, 104});
-		actual = getIndexSet(testingIndexSet, 1);
-		assertEquals(expected, actual);
-		
-		actual = getIndexSet(testingIndexSet, 3);
-		assertTrue(actual.isEmpty());
-		
-		expected = new BitSet();
-		set(expected, new int[]{1, 101, 401});
-		actual = getIndexSet(testingIndexSet, 5);
-		assertEquals(expected, actual);
-		
-		Set<IntegerAttribute> actualAttrs = testingIndexSet.getAttributes();
-		Set<IntegerAttribute> expectedAttrs = new HashSet<IntegerAttribute>(
-				Arrays.asList(definition.create(1),	definition.create(5)));
-		assertEquals(expectedAttrs, actualAttrs);
-	}
-	
-	public void testClearIndicesForAttribute() throws IllegalValueException {
-		IntegerAttribute attr = definition.create(1);
-		BitSet clearedSet = new BitSet();
-		// 300 is not part of attr 1's set, so it shouldn't be cleared
-		set(clearedSet, new int[]{3, 4, 100, 102, 300, 1000});
-		testingIndexSet.clearIndicesForAttribute(attr, clearedSet);
-		
-		assertDisjoint(testingIndexSet);
-		assertComplete(testingIndexSet);
-
-		BitSet expected;
-		BitSet actual;
-
-		expected = new BitSet();
-		// notice 300 is still here
-		set(expected, new int[]{0, 1, 2, 101, 103, 104, 200, 201, 202, 203, 204, 300, 301, 302, 303, 304, 401});
-		actual = testingIndexSet.getIndexSet();
-		assertEquals(expected, actual);
-
-		expected = new BitSet();
-		set(expected, new int[]{0, 2, 103, 104});
-		actual = getIndexSet(testingIndexSet, 1);
-		assertEquals(expected, actual);
-
-		actual = getIndexSet(testingIndexSet, 2);
-		assertTrue(actual.isEmpty());
-
-		expected = new BitSet();
-		// notice 300 is still here
-		set(expected, new int[]{200, 202, 203, 204, 300, 302, 303, 304});
-		actual = getIndexSet(testingIndexSet, 3);
-		assertEquals(expected, actual);
-
-		expected = new BitSet();
-		set(expected, new int[]{1,101,201,301,401});
-		actual = getIndexSet(testingIndexSet, 5);
-		assertEquals(expected, actual);		
-	}
-	
-	public void testGetAttributes() throws IllegalValueException {
-		Set<IntegerAttribute> expected = new HashSet<IntegerAttribute>();
-		expected.add(definition.create(1));
-		expected.add(definition.create(3));
-		expected.add(definition.create(5));
-		Set<IntegerAttribute> actual = testingIndexSet.getAttributes();
-		assertEquals(expected, actual);
-	}
-	
-	public void testGetAtttribute() throws IllegalValueException {
-		IntegerAttribute ia;
-		ia = testingIndexSet.getAttribute(1);		
-		assertEquals(definition.create(5), ia);
-		
-		ia = testingIndexSet.getAttribute(2);		
-		assertEquals(definition.create(1), ia);
-		
-		ia = testingIndexSet.getAttribute(500);		
-		assertNull(ia);
-	}
-
-	public void testSetAttrsSubset() throws IllegalValueException {
-		IntegerAttribute attr = definition.create(1);
-		BitSet newIndices = new BitSet();
-		newIndices.set(101, 103);
-		testingIndexSet.setIndicesOfAttribute(attr, newIndices);
-		
-		assertDisjoint(testingIndexSet);
-		assertComplete(testingIndexSet);
-
-		BitSet expected;
-		BitSet actual;
-
-		expected = new BitSet();
-		set(expected, new int[]{1, 101, 102, 200, 201, 202, 203, 204, 300, 301, 302, 303, 304, 401});
-		actual = testingIndexSet.getIndexSet();
-		assertEquals(expected, actual);
-
-		expected = new BitSet();
-		set(expected, new int[]{101, 102});
-		actual = getIndexSet(testingIndexSet, 1);
-		assertEquals(expected, actual);
-
-		expected = new BitSet();
-		set(expected, new int[]{200, 202, 203, 204, 300, 302, 303, 304});
-		actual = getIndexSet(testingIndexSet, 3);
-		assertEquals(expected, actual);
-
-		expected = new BitSet();
-		set(expected, new int[]{1,201,301,401});
-		actual = getIndexSet(testingIndexSet, 5);
-		assertEquals(expected, actual);		
-	}
-
-	public void testSubset() throws IllegalValueException {
-		final BitSet expected = new BitSet();
-		BitSet actual;
-
-		BitSet subSet = new BitSet();
-		subSet.set(3, 5);
-		subSet.set(103, 201);
-		AttributeIndexSet<IntegerAttribute> results = testingIndexSet.getSubset(subSet);
-
-		assertDisjoint(results);
-		assertComplete(results);
-
-		set(expected, new int[]{3,4,103,104,200});
-		actual = results.getIndexSet();
-		assertEquals(expected, actual);
-
-		expected.clear();
-		set(expected, new int[]{3,4,103,104});
-		actual = getIndexSet(results, 1);
-		assertEquals(expected, actual);
-
-		expected.clear();
-		set(expected, new int[]{200});
-		actual = getIndexSet(results, 3);
-		assertEquals(expected, actual);
-
-		actual = getIndexSet(results, 5);
-		assertTrue(actual.isEmpty());
-	}
-
-	public void testTotalClearAttribute() throws IllegalValueException {
-		IntegerAttribute attr = definition.create(1);
-		testingIndexSet.clearAttribute(attr);
-		
-		assertDisjoint(testingIndexSet);
-		assertComplete(testingIndexSet);
-
-		BitSet expected;
-		BitSet actual;
-
-		expected = new BitSet();
-		set(expected, new int[]{1, 101, 200, 201, 202, 203, 204, 300, 301, 302, 303, 304, 401});
-		actual = testingIndexSet.getIndexSet();
-		assertEquals(expected, actual);
-
-		actual = getIndexSet(testingIndexSet, 1);
-		assertTrue(actual.isEmpty());
-
-		expected = new BitSet();
-		set(expected, new int[]{200, 202, 203, 204, 300, 302, 303, 304});
-		actual = getIndexSet(testingIndexSet, 3);
-		assertEquals(expected, actual);
-
-		expected = new BitSet();
-		set(expected, new int[]{1,101,201,301,401});
-		actual = getIndexSet(testingIndexSet, 5);
-		assertEquals(expected, actual);		
-	}
-
-	public void testValIndexSetupByAttr1() throws IllegalValueException {
-		BitSet expected = new BitSet();
-		set(expected, new int[]{0, 2, 3, 4, 100, 102, 103, 104});
-		
-		BitSet actual = getIndexSet(testingIndexSet, 1);
-		assertEquals(expected, actual);
-	}
-	
-	public void testValIndexSetupByAttr2() throws IllegalValueException {
-		BitSet actual = getIndexSet(testingIndexSet, 2);
-		assertTrue(actual.isEmpty());
-	}
-	
-	public void testValIndexSetupByAttr3() throws IllegalValueException {
-		BitSet expected = new BitSet();
-		set(expected, new int[]{200, 202, 203, 204, 300, 302, 303, 304});
-		
-		BitSet actual = getIndexSet(testingIndexSet, 3);
-		assertEquals(expected, actual);
-	}
-
-	public void testValIndexSetupByAttr5() throws IllegalValueException {
-		BitSet expected = new BitSet();
-		set(expected, new int[]{1,101,201,301,401});
-		
-		BitSet actual = getIndexSet(testingIndexSet, 5);
-		assertEquals(expected, actual);
-	}
-
-	public void testValIndexSetupIsComplete() {
-		assertComplete(testingIndexSet);
-	}
-
-	public void testValIndexSetupIsDisjoint() {
-		assertDisjoint(testingIndexSet);
-	}
-	
-	public void testValIndexSetupTotalBitSet() {
-		BitSet expected = new BitSet();
-		set(expected, new int[]{0, 1, 2, 3, 4, 100, 101, 102, 103, 104, 200, 201, 202, 203, 204, 300, 301, 302, 303, 304, 401});
-		assertEquals(expected, testingIndexSet.getIndexSet());
-	}
-	
-	private BitSet getIndexSet(AttributeIndexSet<IntegerAttribute> indexSet, int value) throws IllegalValueException {
-		return indexSet.getIndexSet(definition.create(value));
-	}
-}
diff --git a/core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/RangeSetTests.java b/core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/RangeSetTests.java
deleted file mode 100644
index 0ba5cd0..0000000
--- a/core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/RangeSetTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.tests;
-
-import junit.framework.TestCase;
-
-public class RangeSetTests extends TestCase {
-	
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		
-	}
-	
-}
diff --git a/core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/suite/CoreTestSuite.java b/core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/suite/CoreTestSuite.java
deleted file mode 100644
index 0a285a9..0000000
--- a/core/org.eclipse.ptp.core.tests/src/org/eclipse/ptp/core/tests/suite/CoreTestSuite.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.core.tests.suite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ptp.core.tests.AttributeIndexSetTests;
-import org.eclipse.ptp.core.tests.RangeSetTests;
-
-public class CoreTestSuite {
-	public static Test suite() {
-		TestSuite suite = new TestSuite(CoreTestSuite.class.getName());
-		
-		suite.addTestSuite(RangeSetTests.class);
-		suite.addTestSuite(AttributeIndexSetTests.class);
-		return suite;
-	}
-
-}
diff --git a/core/org.eclipse.ptp.doc.isv/.classpath b/core/org.eclipse.ptp.doc.isv/.classpath
deleted file mode 100755
index ce675f9..0000000
--- a/core/org.eclipse.ptp.doc.isv/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.rse.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/core/org.eclipse.ptp.doc.isv/.cvsignore b/core/org.eclipse.ptp.doc.isv/.cvsignore
deleted file mode 100755
index 0700bef..0000000
--- a/core/org.eclipse.ptp.doc.isv/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-index
-build.xml
-javadoc.link.location
-temp.bin.log
-temp.convert.txt
-temp.options.txt
diff --git a/core/org.eclipse.ptp.doc.isv/.project b/core/org.eclipse.ptp.doc.isv/.project
deleted file mode 100644
index e76786d..0000000
--- a/core/org.eclipse.ptp.doc.isv/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.doc.isv</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/core/org.eclipse.ptp.doc.isv/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.doc.isv/META-INF/MANIFEST.MF
deleted file mode 100755
index 2c03b6a..0000000
--- a/core/org.eclipse.ptp.doc.isv/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.doc.isv;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName
diff --git a/core/org.eclipse.ptp.doc.isv/aaa-how-to-add-things.txt b/core/org.eclipse.ptp.doc.isv/aaa-how-to-add-things.txt
deleted file mode 100755
index d73e72b..0000000
--- a/core/org.eclipse.ptp.doc.isv/aaa-how-to-add-things.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Last revised July 27, 2006
-(This file is for information only; it is not included in the release.)
-
-See also
-  http://wiki.eclipse.org/index.php/How_to_add_things_to_the_Eclipse_doc
-with the following exceptions:
-- platformOptions.txt    -> options.txt
-- overview-platform.html -> /reference/misc/overview-rse.html
-
-To add new plug-ins you need to make changes in several places in
-this doc plug-in:
-
-1) options.txt
-- the plug-in's source folder(s) must be included on the -sourcepath
-- code of required plug-ins must be added on the -classpath (the JAR(s)for non-JARed plug-ins and <plugin>/@dot for JARed plug-ins
-- the API package names must be included in the (alphabetical) package list at the end of the file
-- note that the @sep@ token is replaced during build by the appropriate separator character for the build platform.
-
-2) buildDoc.xml
-- add a line in convertSchemaToHtml target to handle a new plug-ins extension point schemas
-
-Adding new extension points:
-
-1) reference/extension-points/index.html
-- add a line for each extension point
-
-2) topics_Reference.xml
-- add a line for each extension point
-- add a line for each API package
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/about.html b/core/org.eclipse.ptp.doc.isv/about.html
deleted file mode 100755
index d4cc693..0000000
--- a/core/org.eclipse.ptp.doc.isv/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2007</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/book.css b/core/org.eclipse.ptp.doc.isv/book.css
deleted file mode 100644
index 9f32143..0000000
--- a/core/org.eclipse.ptp.doc.isv/book.css
+++ /dev/null
@@ -1,112 +0,0 @@
-P.Code {
-	display: block;
-	text-align: left;
-	text-indent: 0.00pt;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 15pt;
-	font-size: 10.000000pt;
-	font-weight: normal;
-	font-style: normal;
-	color: #4444CC;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New", Courier, monospace;
-}
-H6.CaptionFigColumn {
-	display: block;
-	text-align: left;
-	text-indent: 0.000000pt;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-	font-size: 9.000000pt;
-	font-weight: bold;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-P.Note {
-	display: block;
-	text-align: left;
-	text-indent: 0pt;
-	margin-top: 19.500000pt;
-	margin-bottom: 19.500000pt;
-	margin-right: 0.000000pt;
-	margin-left: 30pt;
-	font-size: 11.000000pt;
-	font-weight: normal;
-	font-style: Italic;
-	color: #000000;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-EM.UILabel {
-	font-weight: Bold;
-	font-style: normal;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-}
-EM.CodeName {
-	font-weight: Bold;
-	font-style: normal;
-	text-decoration: none;
-	vertical-align: baseline;
-	text-transform: none;
-	font-family: "Courier New", Courier, monospace;
-}
-
-body, html { border: 0px }
-
-
-/* following font face declarations need to be removed for DBCS */
-
-body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, Helvetica, sans-serif; color: #000000}
-pre				{ font-family: "Courier New", Courier, monospace;}
-
-/* end font face declarations */
-
-/* following font size declarations should be OK for DBCS */
-body, h1, h2, h3, h4, h5, h6, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; }
-pre				{ font-size: 10pt}
-
-/* end font size declarations */
-
-body	     { background: #FFFFFF; margin-bottom: 1em }
-h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	
-h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
-h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
-h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
-p            { margin-top: 10px; margin-bottom: 10px }
-pre          { margin-left: 6; font-size: 9pt; color: #4444CC } 
-a:link	     { color: #0000FF }
-a:hover	     { color: #000080 }
-a:visited    { text-decoration: underline }
-ul	     { margin-top: 10px; margin-bottom: 10px; }
-li	     { margin-top: 5px; margin-bottom: 5px; } 
-li p	     { margin-top: 5px; margin-bottom: 5px; }
-ol	     { margin-top: 10px; margin-bottom: 10px; }
-dl	     { margin-top: 10px; margin-bottom: 10px; }
-dt	     { margin-top: 5px; margin-bottom: 5px; font-weight: bold; }
-dd	     { margin-top: 5px; margin-bottom: 5px; }
-strong	     { font-weight: bold}
-em	     { font-style: italic}
-var	     { font-style: italic}
-div.revision { border-left-style: solid; border-left-width: thin; 
-				   border-left-color: #7B68EE; padding-left:5 }
-th	     { font-weight: bold }
-
-a.command-link {
-}
-a.command-link img {
-	border-width: 0px;
-	border-style: none;
-	vertical-align: middle;
-}
diff --git a/core/org.eclipse.ptp.doc.isv/build.properties b/core/org.eclipse.ptp.doc.isv/build.properties
deleted file mode 100755
index fbafa18..0000000
--- a/core/org.eclipse.ptp.doc.isv/build.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 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
-# Martin Oberhuber (Wind River) - Declare API provisional
-###############################################################################
-bin.includes = META-INF/,\
-               about.html,\
-               book.css,\
-               notices.html,\
-               plugin.properties,\
-               plugin.xml,\
-               schema.css,\
-               toc.xml,\
-               guide.xml,\
-               topics_Questions.xml,\
-               reference.xml,\
-               topics_Samples.xml,\
-               guide/,\
-               icons/,\
-               index/,\
-               questions/,\
-               reference/,\
-               samples/,\
-               provisional_api.html
-customBuildCallbacks = customBuildCallbacks.xml
diff --git a/core/org.eclipse.ptp.doc.isv/buildDoc.xml b/core/org.eclipse.ptp.doc.isv/buildDoc.xml
deleted file mode 100755
index 1158d27..0000000
--- a/core/org.eclipse.ptp.doc.isv/buildDoc.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="PTP ISV Doc Build" default="all" basedir=".">
-
-	<property name="javadoc.link.location" value="${basedir}/javadoc.link.location"/>
-
-	<target name="init">
-		<available file="${basedir}/index" property="index.present" />
-		<path id="path_bootclasspath">
-			<fileset dir="${java.home}/lib">
-				<include name="*.jar"/>
-			</fileset>
-		</path>
-		<property name="bootclasspath" refid="path_bootclasspath"/>
-		<condition property="safeBaseLocation"
-			value="${baseLocation}"
-			else="${eclipse.home}">
-			<isset property="baseLocation"/>
-		</condition>
-		<delete dir="${javadoc.link.location}" />
-	</target>
-
-	<target name="computeClasspath" unless="javadoc.classpath">
-		<!-- Construct the javadoc classpath and store it in a property. -->
-		<echo level="info" message="Computing classpath ..."/>
-		
-		<!-- Add platform dependencies required by your plug-in here.
-			 Note that this pattern expects Eclipse to have 
-			 been installed into the platform directory structure, as is
-			 the case during the build. -->
-		<patternset id="platform.classpath.pattern">
-			<include name="**/org.eclipse.core*.jar"/>
-			<include name="**/org.eclipse.core*/**/*.jar"/>
-			<include name="**/org.eclipse.compare*.jar"/>
-			<include name="**/org.eclipse.debug.core*.jar"/>
-			<include name="**/org.eclipse.debug.ui*.jar"/>
-			<include name="**/org.eclipse.help*.jar"/>
-			<include name="**/org.eclipse.search*.jar"/>
-        	<include name="**/org.eclipse.swt*.jar"/>
-        	<include name="**/org.eclipse.swt*/**/*.jar"/>
-        	<include name="**/org.eclipse.ui*.jar"/>
-        	<include name="**/org.eclipse.ui*/**/*.jar"/>
-        	<include name="**/org.eclipse.update*.jar"/>
-        	<include name="**/org.eclipse.update*/**/*.jar"/>
-        	<include name="**/org.eclipse.osgi*.jar"/>
-        	<include name="**/org.eclipse.osgi*/**/*.jar"/>
-        	<include name="**/org.eclipse.equinox*.jar"/>
-        	<include name="**/org.eclipse.equinox*/**/*.jar"/>
-        	<include name="**/org.eclipse.jface*.jar"/>
-        	<include name="**/org.eclipse.jface*/**/*.jar"/>
-          	<include name="**/org.eclipse.jsch*.jar"/>
-        	<include name="**/org.eclipse.text*.jar"/>
-        	<include name="**/org.eclipse.text*/**/*.jar"/>
-        	<include name="**/org.eclipse.team*.jar"/>
-        	<include name="**/org.eclipse.team*/**/*.jar"/>
-        	<include name="**/org.junit*.jar"/>
-        	<include name="**/org.junit*/**/*.jar"/>
-			<include name="**/com.ibm.icu*.jar"/>
-			<include name="**/com.jcraft.jsch*.jar"/>
-		</patternset>
-			
-		<pathconvert property="javadoc.classpath">
-			<path>				
-				<fileset dir="${safeBaseLocation}">
-					<patternset refid="platform.classpath.pattern"/>
-		    	</fileset>
-			</path>
-		</pathconvert>
-		<echo level="info" message="Done computing classpath."/>
-		<echo level="info" message="Bootclasspath is: ${bootclasspath}"/>
-		<echo level="debug" message="Classpath is: ${javadoc.classpath}"/>
-	</target>
-
-	<target name="extractLinks">
-		<mkdir dir="${javadoc.link.location}"/>
-		
-		<patternset id="package.list">
-			<include name="**/package-list"/>
-		</patternset>
-		
-		<!-- We only need the package-list files out of these -->
-		<unzip dest="${javadoc.link.location}/platform/">
-			<patternset refid="package.list"/>
-			<fileset dir="${safeBaseLocation}/plugins">
-				<include name="org.eclipse.platform.doc.isv*.jar"/>
-			</fileset>
-		</unzip>
-	</target>
-
-	<target name="all" depends="init" unless="index.present">
-		<antcall target="convertSchemaToHtml" />
-		<antcall target="generateJavadoc" />
-		<antcall target="build.index" />
-	</target>
-
-	<target name="build.index" description="Builds search index for the plug-in: org.eclipse.rse.doc.isv" if="eclipse.running">
-		<help.buildHelpIndex manifest="${basedir}/plugin.xml" destination="${basedir}" />
-	</target>
-
-	<target name="convertSchemaToHtml" if="eclipse.running">
-		<property name="dest" value="reference/extension-points" />
-		<record name="${basedir}/temp.convert.txt" action="start" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ptp.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ptp.debug.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ptp.debug.ui/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ptp.launch/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ptp.remote.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ptp.remote.ui/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ptp.services.core/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ptp.services.ui/plugin.xml" destination="${dest}" />
-		<pde.convertSchemaToHTML manifest="../org.eclipse.ptp.ui/plugin.xml" destination="${dest}" />
-		<record name="${basedir}/temp.convert.txt" action="stop" />
-	</target>
-
-	<target name="getJavadocPath">
-		<available file="${java.home}/../bin/javadoc.exe" property="javadoc" value="${java.home}/../bin/javadoc.exe" />
-		<available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
-	</target>
-
-	<target name="generateJavadoc" depends="getJavadocPath,extractLinks,computeClasspath" if="javadoc">
-		<property name="optionsFile" value="temp.options.txt" />
-		<copy file="options.txt" tofile="${optionsFile}" overwrite="true" />
-		
-		<condition property="argsListDelimiter" value=":">
-			<os family="unix" />
-		</condition>
-		<condition property="argsListDelimiter" value=";">
-			<os family="windows" />
-		</condition>
-
-		<replaceregexp file="${basedir}/${optionsFile}" flags="g" match="(\r\n?|\n);" replace="${argsListDelimiter}" />
-		<replace file="${basedir}/${optionsFile}" token="@rt@" value="${bootclasspath}" />
-		<replace file="${basedir}/${optionsFile}" token="@cp@" value="${javadoc.classpath}" />
-		<replace file="${basedir}/${optionsFile}" token="@baseLocation@" value="${safeBaseLocation}" />
-		<replace file="${basedir}/${optionsFile}" token="@javadoc.link.location@" value="${javadoc.link.location}" />
-
-		<!--scrub isv plugin directories of any preexisting api doc content-->
-		<delete dir="reference/api" />
-		<mkdir dir="reference/api" />
-
-		<echo message="sep = ${argsListDelimiter}"/>
-		<echo message="javadoc = ${javadoc}"/>
-		<exec dir="." executable="${javadoc}" output="temp.bin.log" resultproperty="javadocResult">
-			<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
-		</exec>
-		<echo message="javadoc result = ${javadocResult}"/>
-	</target>
-
-</project>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/org.eclipse.ptp.doc.isv/customBuildCallbacks.xml b/core/org.eclipse.ptp.doc.isv/customBuildCallbacks.xml
deleted file mode 100644
index 7e14739..0000000
--- a/core/org.eclipse.ptp.doc.isv/customBuildCallbacks.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<!-- ===================================================================== -->
-<!-- Custom targets called from a project's generated build.xml            -->
-<!-- Set customBuildCallbacks=<path/to/this/file> in your build.properties.-->
-<!-- ===================================================================== -->
-<project name="Build specific targets and properties" default="noDefault">
-
-	<!-- ===================================================================== -->
-	<!-- Default target                                                        -->
-	<!-- ===================================================================== -->
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars">
-		<ant antfile="buildDoc.xml" />
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<!--
-	<target name="pre.compileTarget.jar">
-	</target>
-	-->
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after compilation but before jaring					   -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<!--
-	<target name="post.compile.compileTarget.jar">
-	</target>
-	-->
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<!--
-	<target name="post.compileTarget.jar">
-	</target>
-	-->
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   base.dir - root of the project                                      -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts">
-
-	</target>
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                                -->
-	<!--   base.dir - root of the project                                      -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts">
-	</target>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources">
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs">        
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs">       
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean">              
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean">             
-	</target>
-</project>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide.xml b/core/org.eclipse.ptp.doc.isv/guide.xml
deleted file mode 100755
index 2b6ebaf..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- ============================================================================= -->
-<!-- Define topics for the main guide                                              -->
-<!-- ============================================================================= -->
-<toc label="Guide">
-	<topic label="PTP Architecture" href="guide/architecture.html">
-		<topic label="Overview" href="guide/arch/overview.html"/>
-		<topic label="Model" href="guide/arch/model.html"/>
-		<topic label="Attributes" href="guide/arch/attributes.html"/>
-		<topic label="Resource Manager System" href="guide/arch/rm.html"/>
-		<topic label="Runtime System" href="guide/arch/runtime.html"/>
-		<topic label="Proxy System" href="guide/arch/proxy.html"/>
-	</topic>
-	<topic label="Using the PTP API" href="guide/ptp_api.html">
-		<topic label="Model API" href="guide/api/model.html" />
-	</topic>
-	<topic label="Plugging into PTP" href="provisional_api.html">
-		<topic label="Extensions" href="guide/Extensions.html"/>
-		<topic label="Plugging in a Popup Menu" href="guide/plugin/popup.html" />
-		<topic label="Plugging in a Property Page" href="guide/plugin/propertypage.html" />
-		<topic label="Plugging in a System Type" href="guide/plugin/systemtype.html" />
-		<topic label="Plugging in a Subsystem" href="guide/plugin/subsystem.html" />
-		<topic label="Relevant Eclipse Extension Points" href="guide/plugin/other.html" />
-	</topic>
-	<topic label="Tutorials" href="guide/tutorials.html">
-	</topic>
-</toc>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/actions/uiActionsAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/actions/uiActionsAPI.html
deleted file mode 100755
index 841132b..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/actions/uiActionsAPI.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Actions API</title>
-<STYLE type="text/css">
-<!--
-TH {
-	background-color: #e5e5e5
-}
--->
-</STYLE>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Actions API</h1>
-<p>In Eclipse, we typically launch our dialogs and wizards and menu items from an action, which is
-a class that implements the JFace <samp>IAction</samp> interface. The Remote System Explorer offers classes to
-help simplify the creation of action classes, especially when used together with the RSE classes for
-<a href="../dialogs/uiDialogsAPI.html">dialogs</a> and <a href="../wizards/uiWizardsAPI.html">wizards</a>.
-</p>
-<p>There are two ways the Remote System Explorer API set can help you when it comes to actions:
-<ol>
-<li>A set of base action classes from which to base your own action classes.
-<li>A set of re-usable actions for specific requirements.
-</ol>
-</p>
-
-<h2>RSE-Supplied Base Classes for Actions</h2>
-<p>Here are the primary base classes the RSE supplies for actions, all of which are found in the
-package <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/package-summary.html"org.eclipse.rse.ui.actions</A></samp>
-in the plugin <samp>org.eclipse.rse.ui</samp>:</p>
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html">SystemBaseAction</A></samp></TD>
-			<TD>This is the base action class for the other classes, and is only used directly for actions that do not
-			result in a dialog or wizard being presented to the user. It extends the JFace <samp>Action</samp> class,
-			adding to it support for properties such as the current shell and viewer and selection, as well as
-			overridable methods for easily enabling/disabling the action based on the selection, and a method for
-			setting the context help for the action. There are many other useful methods, such
-			as <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html#allowOnMultipleSelection(boolean)">allowOnMultipleSelection(boolean)</A></samp>
-			and <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html#setContextMenuGroup(java.lang.String)">setContextMenuGroup(String)</A></samp>, to
-			simplify when the action is enabled and where it appears in a popup menu.
-            </TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.html">SystemBaseSubMenuAction</A></samp></TD>
-			<TD>This base action class extends <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html">SystemBaseAction</A></samp>, and is used as the parent class when
-			for popup menu actions that are to cascade. A cascading menu is itself another menu, really, containing actions just like the primary
-			menu does. So, to create a cascading menu action, you simply subclass this class and override the method
-			<samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.html#populateSubMenu(org.eclipse.jface.action.IMenuManager)">populateSubMenu</A></samp>, where
-			you add all the actions to show in this cascading menu. And yes, one or more of those can themselves be cascading. The RSE views will
-			automatically call the method <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseSubMenuAction.html#getSubMenu()">getSubMenu</A></samp> when populating the initial popup menu, but your own views will need to do this.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseDialogAction.html">SystemBaseDialogAction</A></samp></TD>
-			<TD>This base action class extends <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html">SystemBaseAction</A></samp>, and is used when the action presents the
-			user with a dialog, preferably a dialog that extends the RSE
-			<samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html">SystemPromptDialog</A></samp> class. To use this class, subclass it and override the methods </TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseWizardAction.html">SystemBaseWizardAction</A></samp></TD>
-			<TD>This base action class extends <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseAction.html">SystemBaseAction</A></samp>, and is used when the action presents the
-			user with a wizard, preferably a wizard that extends the RSE <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html">AbstractSystemWizard</A></samp> class.</TD>
-		</TR>
-
-	</TBODY>
-</TABLE>
-
-<h2>Actions Pre-Supplied by RSE</h2>
-<p>You may find some of the actions supplied by the RSE to be immediately re-usable in your own code, saving some
-development and test effort.
-All these actions can be found in package
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/package-summary.html">org.eclipse.rse.ui.actions</A></samp>.
-Further, you can find many useful actions related to the selection of remote files or folders, in package
-<samp><A href="../../../reference/api/org/eclipse/rse/files/ui/actions/package-summary.html">org.eclipse.rse.files.ui.actions</A></samp>.
-</p>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/browseFolderDialog.gif b/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/browseFolderDialog.gif
deleted file mode 100755
index 07af5fc..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/browseFolderDialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/deleteDialog.gif b/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/deleteDialog.gif
deleted file mode 100755
index 2119a53..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/deleteDialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/dialogSample.html b/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/dialogSample.html
deleted file mode 100755
index 05d6a71..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/dialogSample.html
+++ /dev/null
@@ -1,265 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" CHARSET="UTF-8" TYPE="text/css">
-<title>RSE Validator Sample One</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Dialog Sample</h1>
-<p>This is an example of a sample<A href="sampleDlg.gif"> dialog</A> written on top of the RSE base dialog class, and with
-typical full error checking.
-<pre>
-
-package org.eclipse.rse.samples.ui.frameworks.dialogs;
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.events.*;
-
-import org.eclipse.rse.samples.*;
-
-import org.eclipse.rse.ui.dialogs.SystemPromptDialog;
-import org.eclipse.rse.ui.*;
-import org.eclipse.rse.ui.widgets.*;
-import org.eclipse.rse.ui.messages.*;
-import org.eclipse.rse.ui.validators.*;
-
-/**
- * <I>A simple example of using the SystemPromptDialog class as the basis for a new dialog</I>.
- */
-public class <B>SampleDialog</B> extends SystemPromptDialog
-{
-	// <I>gui widgets</I>
-	private SystemHistoryCombo namePrompt;
-	private Text yearPrompt, monthPrompt, dayPrompt;
-	// <I>input</I>
-	private SampleCustomer inpCust;
-	// <I>validators</I>
-	private ISystemValidator nameValidator, yearValidator, monthValidator, dayValidator;
-	// <I>message</I>
-	private SystemMessage errorMessage;
-
-	/**
-	 * <I>Constructor for SampleDialog</I>.
-	 */
-	public <B>SampleDialog</B>(Shell shell)
-	{
-		super(shell, SamplesPlugin.getString(&quot;org.eclipse.rse.samples.ui.dialogs.dialog1.title&quot;));
-		setHelp(SamplesPlugin.HELPPREFIX + &quot;dlg11000&quot;);
-		nameValidator = new <A href="../validators/validatorSample1.html">SampleNameValidator</A>();
-		yearValidator = new <A href="../validators/validatorSample2.html">SampleBirthYearValidator</A>();
-		monthValidator = new <A href="../validators/validatorSample3.html">SampleBirthMonthValidator</A>();
-		dayValidator = new <A href="../validators/validatorSample4.html">SampleBirthDayValidator</A>();
-	}
-
-	/**
-	 * <I>Required parent override.</I>
-	 * <I>This is where we populate the client area</I>
-	 */
-	protected Control <B>createInner</B>(Composite parent)
-	{
-		int nbrColumns = 2;
-		Composite parentComposite = SystemWidgetHelpers.createComposite(parent, nbrColumns);
-
-		// <I>add gui widgets</I>...				
-		SystemWidgetHelpers.createLabel(parentComposite, SamplesPlugin.getResourceBundle(), &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.name.&quot;);
-		boolean readonly = false;
-		namePrompt = SystemWidgetHelpers.createHistoryCombo(parentComposite, null, &quot;name.history.key&quot;, readonly,
-		                 SamplesPlugin.getResourceBundle(), &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.name.tooltip&quot;);
-		
-		addSeparatorLine(parentComposite, nbrColumns);
-		boolean wantBorder = false;
-		SystemWidgetHelpers.createLabel(parentComposite, SamplesPlugin.getResourceBundle(),
-		      &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.birthday.verbiage.&quot;, nbrColumns, wantBorder);
-		
-		yearPrompt = SystemWidgetHelpers.createLabeledTextField(parentComposite, null,
-		                 SamplesPlugin.getResourceBundle(), &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.birthday.year.&quot;);
-		monthPrompt = SystemWidgetHelpers.createLabeledTextField(parentComposite, null,
-		                 SamplesPlugin.getResourceBundle(), &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.birthday.month.&quot;);
-		dayPrompt = SystemWidgetHelpers.createLabeledTextField(parentComposite, null,
-		                 SamplesPlugin.getResourceBundle(), &quot;org.eclipse.rse.samples.ui.dialogs.dialog1.birthday.day.&quot;);
-		
-		// <I>if given an existing object, prefill it</I>...
-		inpCust = (SampleCustomer)getInputObject();
-		if (inpCust != null)
-		{
-			namePrompt.setText(inpCust.getName());
-			yearPrompt.setText(inpCust.getYear());
-			monthPrompt.setText(inpCust.getMonth());
-			dayPrompt.setText(inpCust.getDay());
-		}
-		
-		
-		// <I>add modify listeners</I>...	
-	        namePrompt.addModifyListener( new ModifyListener()
-	        {
-	      	   public void modifyText(ModifyEvent event)
-	      	   {
-	      	 	if (validateName())
-	      	 	  validate(namePrompt.getCombo());
-	      	   }
-	        } );
-	        yearPrompt.addModifyListener( new ModifyListener()
-	        {
-	      	   public void modifyText(ModifyEvent event)
-	      	   {
-	      	 	if (validateYear())
-	      	 	  validate(yearPrompt);
-	      	   }
-	        } );
-	        monthPrompt.addModifyListener( new ModifyListener()
-	        {
-	      	   public void modifyText(ModifyEvent event)
-	      	   {
-	      	 	if (validateMonth())
-	      	 	  validate(monthPrompt);
-	      	   }
-	        } );
-	        dayPrompt.addModifyListener( new ModifyListener()
-	        {
-	      	   public void modifyText(ModifyEvent event)
-	      	   {
-	      	 	if (validateDay())
-	      	 	  validate(monthPrompt);
-	      	   }
-	        } );
-	    		
-		// <I>initialize enabled state</I>...
-		setPageComplete(isPageComplete());
-			
-		return parentComposite;
-	}
-
-	/**
-	 * <I>Required parent override</I>.
-	 * <I>This is where we return the first input control, to give it focus when the dialog appears</I>.
-	 */
-	protected Control <B>getInitialFocusControl</B>()
-	{
-		return namePrompt.getCombo();
-	}
-
-	/**
-	 * <I>Typical parent override</I>.
-	 * <I>This is where we get control when the user presses OK</I>.
-	 */
-	protected boolean <B>processOK</B>()
-	{
-		errorMessage = null;
-		Control controlInError = validate(null);		
-		if (controlInError != null)
-		  controlInError.setFocus();
-		else
-		{
-			SampleCustomer newCust = inpCust;
-			if (newCust == null)
-			  newCust = new SampleCustomer();
-			newCust.setName(namePrompt.getText().trim());
-			newCust.setYear(yearPrompt.getText().trim());
-			newCust.setMonth(monthPrompt.getText().trim());
-			newCust.setDay(dayPrompt.getText().trim());
-			setOutputObject(newCust);
-			
-			SystemMessage completionMsg = null;
-			if (inpCust == null)
-				completionMsg = SamplesPlugin.getPluginMessage(&quot;SPPD1010&quot;);
-		    else
-				completionMsg = SamplesPlugin.getPluginMessage(&quot;SPPD1011&quot;);
-			completionMsg.makeSubstitution(newCust.getName());
-		    SystemMessageDialog msgDlg = new SystemMessageDialog(getShell(), completionMsg);
-		    msgDlg.open();
-		}		
-		return isPageComplete();
-	}
-
-	// ---------------------	
-	// <I>Validation methods</I>...
-	// ---------------------
-	/**
-	 * <I>Do full validation of all entry fields, optionally skipping a given one</I>.
-	 * <I>@return first control that is found to contain errors. Can be used to set focus</I>.
-	 */
-	protected Control <B>validate</B>(Control controlToSkip)
-	{
-		Control controlInError = null;
-		
-		if ((controlToSkip != namePrompt.getCombo()) &amp;&amp; !validateName())
-		  controlInError = namePrompt.getCombo();
-		if ((controlInError==null) &amp;&amp; (controlToSkip != yearPrompt) &amp;&amp; !validateYear())
-		  controlInError = yearPrompt;
-		if ((controlInError==null) &amp;&amp; (controlToSkip != monthPrompt) &amp;&amp; !validateMonth())
-		  controlInError = monthPrompt;
-		if ((controlInError==null) &amp;&amp; (controlToSkip != dayPrompt) &amp;&amp; !validateDay())
-		  controlInError = dayPrompt;
-		
-		return controlInError;		
-	}
-	/**
-	 * <I>Validate the customer name prompt. We only ensure it is not-empty.</I>
-	 */
-	protected boolean <B>validateName</B>()
-	{
-		String input = namePrompt.getText().trim();
-		setErrorMessageAndPageCompletionStatus(nameValidator.validate(input));
-		return (errorMessage==null);
-	}
-	/**
-	 * <I>Validate the customer birth year prompt</I>.
-	 */
-	protected boolean <B>validateYear</B>()
-	{
-		String input = yearPrompt.getText().trim();
-		setErrorMessageAndPageCompletionStatus(yearValidator.validate(input));
-		return (errorMessage==null);
-	}
-	/**
-	 * <I>Validate the customer birth month prompt</I>.
-	 */
-	protected boolean <B>validateMonth</B>()
-	{
-		String input = monthPrompt.getText().trim();
-		setErrorMessageAndPageCompletionStatus(monthValidator.validate(input));
-		return (errorMessage==null);
-	}
-	/**
-	 * <I>Validate the customer birth day prompt</I>.
-	 */
-	protected boolean <B>validateDay</B>()
-	{
-		String input = dayPrompt.getText().trim();
-		setErrorMessageAndPageCompletionStatus(dayValidator.validate(input));
-		return (errorMessage==null);
-	}
-	
-	/**
-	 * <I>A convenience method that issues or clears the error message on the message line</I>,
-	 *  <I>and sets the page completion status</I>
-	 */
-	protected void <B>setErrorMessageAndPageCompletionStatus</B>(SystemMessage errorMessage)
-	{
-		this.errorMessage = errorMessage;
-		if (errorMessage == null)
-		  clearErrorMessage();
-		else
-		  setErrorMessage(errorMessage);
-		setPageComplete(isPageComplete());
-	}
-	/**
-	 * <I>Return true if the OK button can be enabled</I>.
-	 */
-	protected boolean <B>isPageComplete</B>()
-	{
-		return ((errorMessage == null) &amp;&amp;
-		        (namePrompt.getText().trim().length()&gt;0) &amp;&amp;
-		        (yearPrompt.getText().trim().length()&gt;0) &amp;&amp;
-		        (monthPrompt.getText().trim().length()&gt;0) &amp;&amp;
-		        (dayPrompt.getText().trim().length()&gt;0));
-	}	
-}</pre>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/renameManyDialog.gif b/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/renameManyDialog.gif
deleted file mode 100755
index cfeb0c6..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/renameManyDialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/renameOneDialog.gif b/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/renameOneDialog.gif
deleted file mode 100755
index cc6256c..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/renameOneDialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/sampleDlg.gif b/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/sampleDlg.gif
deleted file mode 100755
index 0d55573..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/sampleDlg.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/selectTypesDialog.gif b/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/selectTypesDialog.gif
deleted file mode 100755
index be5361a..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/selectTypesDialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/simpleSelectDialog.gif b/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/simpleSelectDialog.gif
deleted file mode 100755
index b9bfca6..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/simpleSelectDialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/uiDialogsAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/uiDialogsAPI.html
deleted file mode 100755
index 2a47252..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/dialogs/uiDialogsAPI.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Dialogs API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Dialogs API</h1>
-<p>There are two ways the Remote System Explorer API set can help you when it comes to dialogs:
-<ol>
-<li>A base dialog class from which to base your own dialog classes.
-<li>A set of re-usable dialogs for specific requirements.
-</ol>
-</p>
-
-<h2>RSE-Supplied Base Class for Dialogs</h2>
-<p>Dialogs are secondary windows that prompt the user for information or display information to the user. They are typically
-<i>modal</i>, meaning the rest of the application (in this case eclipse) is disabled while the dialog is showing.
-Eclipse supplies a raw dialog class in SWT, as well as more robust dialog class in JFace. The RSE supplies its own
-class,
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html">SystemPromptDialog</A></samp>
-in package
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/package-summary.html">org.eclipse.rse.ui.dialogs</A></samp>
-, that extends
-the JFace dialog class and adds to it the following capabilities inherited by all classes which extend it:
-</p>
-<ul>
-<li>Support for an optional visual message line at the bottom, on which messages can be displayed to the user. These can be either
-<samp>SystemMessage</samp> objects, or simple string messages. <samp><A
-		href="../messages/uiMessageAPI.html#SystemMessage">SystemMessage</A></samp> objects are preferred, as using these enables a button
-beside the message line which users can press to see the details for the message. This is supported via the <samp><A
-		href="../messages/uiMessageAPI.html#ISystemMessageLine">ISystemMessageLine</A></samp>
-interface, and so offers a consistent programming interface with the RSE property page and wizard page classes.
-<li>Support of automatic assignment of mnemonics for input-capable widgets such as buttons. This saves tremendous development
-effort if your user interface is translated as the assignment of unique mnemonics can be difficult after translation.
-<li>Built-in support for a number of typical push buttons at the bottom of the dialog: OK, Cancel, Browse, Test, Add and
-Details. You control via setters which buttons to show, and you can affect their label and tooltip text, although the
-default labels and tips are already translated for you. To program what happens when pressed, override the appropriate
-<samp>processXXX()</samp> method, such as <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#processOK()">processOK()</A></samp>. By default, you get OK and Cancel buttons.
-<li>Support for an optional built-in progress monitor at the bottom of the dialog, just like what eclipse offers for wizards.
-<li>Support of a simple <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#wasCancelled()">wasCancelled()</A></samp> method to easily test if the dialog was cancelled or not.
-<li>Support for methods to set an input object, and retrieving an output object, making it easy to pass in data and
-get back data. Your calling code sets the input object, your subclass code sets the output object (typically in
-its <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#processOK()">processOK()</A></samp> method) and your calling code gets the output object,
-if <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#wasCancelled()">wasCancelled()</A></samp> returns false.
-<li>Support of a <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#setPageComplete(boolean)">setPageComplete(boolean)</A></samp> method, consistent with wizard pages, to enable/disable the OK button.
-This is typically called by your keystroke and button validators. That is, if an error is detected as input is entered, a message
-is issued to the message line and the OK button is disabled.
-<li>Support of a simple <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#setHelp(java.lang.String)">setHelp(String helpId)</A></samp> method to set the dialog's popup help.
-<li>A simple way to toggle the cursor between busy and normal, using
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#setBusyCursor(boolean)">setBusyCursor(boolean)</A></samp>
-<li>Helper methods for adding <A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#addFillerLine(org.eclipse.swt.widgets.Composite, int)">filler lines</A>
-and <A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#addSeparatorLine(org.eclipse.swt.widgets.Composite, int)">separator lines</A>.
-</ul>
-<p>To create your own dialog:</p>
-<ol>
-<li>Subclass <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html">SystemPromptDialog</A></samp>, picking the appropriate constructor, the simplest
-of which simply requires the shell of the parent window and the title string for this dialog.
-<li>If buttons beyond OK and Cancel are desired, in your own constructor call the appropriate <samp>setShowXXXButton(true)</samp> methods to enable
-these buttons, and override the appropriate <samp>processXXX()</samp> methods to process these buttons when pressed by the user.
-<li>If a progress monitor is desired, in your own constructor call <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#setNeedsProgressMonitor(boolean)">setNeedsProgressMonitor(true)</A></samp>. Later, to run
-a long-running operation that displays the progress monitor, use <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#getProgressMonitor()">getProgressMonitor()</A></samp>.
-<li>Override the <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#createInner(org.eclipse.swt.widgets.Composite)">createInner(Composite)</A></samp> method to populate the client area of the dialog with SWT widgets. Typically
-you create your composite with a GridLayout layout, populate it, and return it. To ease this programming burden, use the many
-static helper methods in <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemWidgetHelpers.html">SystemWidgetHelpers</A></samp>.
-<li>Override the <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#getInitialFocusControl()">getInitialFocusControl()</A></samp> method to supply the control to get initial focus when the dialog is displayed.
-<li>Override the <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#processOK()">processOK()</A></samp> method to supply the processing for when OK is pressed. You typically first validate
-the user input, and then return true if there are no errors found.
-<li>To allow the caller to get user-entered information out of the dialog, either supply getter methods,
-or call <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#setOutputObject(java.lang.Object)">setOuputObject(Object)</A></samp>
-in your processOK logic so that your caller can code <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html#getOutputObject()">getOutputObject()</A></samp>.
-</ol>
-<P>One of the more difficult efforts in building a dialog with multiple entry fields, is the code to do the validation of those entry fields. A common strategy is to add modify listeners to the entry fields, and for each one validate the data as it typed. If the validation fails, a message is issued. If the validation succeeds, then the other fields on the dialog are validated. At the end of the validation, the OK button is enabled or disabled depending on the error message status, and whether the required information has been supplied. The RSE can help with this effort, somewhat, through the use of re-usable <A
-	href="../validators/uiValidatorsAPI.html">validators</A> for various types of input.<BR>
-<BR>
-Follow this <A href="dialogSample.html">link</A> for an example of a fully-formed dialog class written on top of this RSE base class, complete with
-error checking.</P>
-
-<p>Typically, after creating your dialog, you will create an action to invoke it. The RSE can help with this too, via the
-supplied <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseDialogAction.html">SystemBaseDialogAction</A></samp> base class.
-
-<h2>Dialogs Pre-Supplied by RSE</h2>
-<p>You may find some of the dialogs supplied by the RSE to be immediately re-usable in your own code, saving some
-development and test effort. All these dialogs are in package <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/package-summary.html">org.eclipse.rse.ui.dialogs</A></samp>:
-</p>
-
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Class</TH>
-			<TH>Description</TH>
-			<TH>Sample</TH>
-			<TH>Action</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemRenameDialog.html">SystemRenameDialog</A></samp></TD>
-			<TD>Rename multiple items. Provides a table listing the old names and new names, which are editable. If your input objects
-			    do not adapt to <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp>
-			    or <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">ISystemRemoteElementAdapter</A></samp>,
-			    you should call <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemRenameDialog.html#setNameValidator(org.eclipse.rse.ui.validators.ISystemValidator)">setNameValidator</A></samp> to specify a validator that ensures the new name is correct, and your
-			    input objects should also either be IResource objects or implement
-			    <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/ISystemTypedObject.html">ISystemTypedObject</A></samp>.
-			</TD>
-			<TD align="center"><A href="renameManyDialog.gif">Sample image</A></TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemCommonRenameAction.html">SystemCommonRenameAction</A></samp></TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.html">SystemRenameSingleDialog</A></samp></TD>
-			<TD>Rename a single item. Provides a simple entry field for the new name. If your input object
-			    does not adapt to <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp> or
-			    <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">ISystemRemoteElementAdapter</A></samp>,
-			    you should call <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemRenameSingleDialog.html#setNameValidator(org.eclipse.rse.ui.validators.ISystemValidator)">setNameValidator</A></samp> to specify a validator that ensures the new name is correct, and your
-			    input object should also either be an IResource object or implement <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/ISystemTypedObject.html">ISystemTypedObject</A></samp>.
-			</TD>
-			<TD align="center"><A href="renameOneDialog.gif">Sample image</A></TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemCommonRenameAction.html">SystemCommonRenameAction</A></samp></TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemDeleteDialog.html">SystemDeleteDialog</A></samp></TD>
-			<TD>Confirm delete of one or more items. Provides a table listing the names of input objects. If your input objects
-			    do not adapt to <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp> or
-			    <samp><A href="../../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">ISystemRemoteElementAdapter</A></samp>,
-			    your input objects should either be IResource objects or implement <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/ISystemTypedObject.html">ISystemTypedObject</A></samp>.
-			</TD>
-			<TD align="center"><A href="deleteDialog.gif">Sample image</A></TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemCommonDeleteAction.html">SystemCommonDeleteAction</A></samp></TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemSelectFileTypesDialog.html">SystemSelectFileTypesDialog</A></samp></TD>
-			<TD>Presents a dialog listing all the file types defined in the eclipse File Associations preferences page, and
-			allows the user to select one or more of these types, or enter additional types not defined in eclipse.</TD>
-			<TD align="center"><A href="selectTypesDialog.gif">Sample image</A></TD>
-			<TD><samp></samp></TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemSimpleSelectDialog.html">SystemSimpleSelectDialog</A></samp></TD>
-			<TD>Eclipse has a CheckboxTreeViewer that is designed to allow the user to select multiple items from a hierarchical model.
-			This is a nice viewer, but very difficult to program to, as you have to handle reflecting the state of the selected children
-			for each parent node yourself. This dialog makes that trivial. The trick is to create wrappers of your model objects using
-			<samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemSimpleContentElement.html">SystemSimpleContentElement</A></samp>, maintaining the parent/child hierarchy, and pass the root element to the dialog. The rest is
-			done for you, and the result is the selected state set for those elements selected by the user. Note this can also be used
-			as a simple flat list checkbox selection dialog, just by passing a non-visible root with a flat list of children.</TD>
-			<TD align="center"><A href="simpleSelectDialog.gif">Sample image</A></TD>
-			<TD>None</TD>
-		</TR>
-
-	</TBODY>
-</TABLE>
-		<P><BR>While the dialogs can be instantiated directly, it is perhaps best to use them by instantiating their action class, and calling the run method on it.
-The action classes are all in <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/package-summary.html">org.eclipse.rse.ui.actions</A></samp> package.
-</P>
-		<p>In addition to these universal dialogs, there are dialogs specific to the predefined Files subsystem. These enable selection of remote files or folders. They can be found in the <a href="../../../reference/api/org/eclipse/rse/files/ui/dialogs/package-summary.html"><samp>org.eclipse.rse.files.ui.dialogs</samp></a> package.</p>
-		<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Class</TH>
-			<TH>Description</TH>
-			<TH>Sample</TH>
-			<TH>Action</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/files/ui/dialogs/SystemSelectRemoteFileOrFolderDialog.html">SystemSelectRemoteFileOrFolderDialog</A></samp></TD>
-			<TD>Allows users to select a remote file, or folder (configurable) using a dialog similar to what is used in Eclipse for local file or
-			folder selection. Can be configured to allow user to select from any existing connection, or to be scoped to a particular connection,
-			or even a particular folder in a particular connection.
-			</TD>
-			<TD align="center"><A href="browseFolderDialog.gif">Sample image</A></TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFileAction.html">SystemSelectRemoteFileAction</A></samp> or
-			    <samp><A href="../../../reference/api/org/eclipse/rse/files/ui/actions/SystemSelectRemoteFolderAction.html">SystemSelectRemoteFolderAction</A></samp></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-		<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/logger/logPreferences.gif b/core/org.eclipse.ptp.doc.isv/guide/api/logger/logPreferences.gif
deleted file mode 100755
index 9d465a2..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/logger/logPreferences.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/logger/uiLoggerAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/logger/uiLoggerAPI.html
deleted file mode 100755
index f41f445..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/logger/uiLoggerAPI.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Logger API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Logger API</h1>
-<p>To use the RSE logging framework, you must first decide if you want your own log file,
-or want to use the common RSE log file.
-</p>
-
-<h2>Using Your Own Log File</h2>
-<p>
-The log file support is encapsulated in the <b><samp>org.eclipse.rse.logging</samp></b> package, which
-defines the primary <samp><A href="../../../reference/api/org/eclipse/rse/logging/Logger.html">org.eclipse.rse.logging.Logger</a></samp> class that manages the log file.
-This log file support offers the ability to log the following types of log messages:</p>
-<ul>
-<li><b>Error</b>. These are serious errors detected by your programming logic.
-<li><b>Warning</b>. These are warning situations detected by your programming logic.
-<li><b>Information</b>. These are informational messages you want to capture to help with problem determination.
-<li><b>Debug</b>. These are trace statements typically only enabled in development drivers.
-</ul>
-
-<p>To define your own logging file, in your plugin class:</p>
-<ol>
-<li>Define a static variable to hold the Logger instance, as in:<br>
-<code>protected static Logger log = null;</code>
-<li>Instantiate the Logger object, in your plugin class constructor, as in:<br>
-				<code>if (log == null) log = LoggerFactory.getLogger(this);</code>
-<li>For convenience, offer fastpaths to the logXXX methods in your Logger instance:
-<pre>
-    public static void <b>logInfo</b>(String message)
-    {
-    	log.logInfo(message);
-    }
-    public static void <b>logWarning</b>(String message)
-    {
-    	log.logWarning(message);
-    }
-    public static void <b>logError</b>(String message)
-    {
-    	log.logError(message, null);
-    }
-    public static void <b>logError</b>(String message, Throwable exception)
-    {
-    	log.logError(message, exception);
-    }
-    public static void <b>logDebugMessage</b>(String prefix, String message)
-    {		
-     log.logDebugMessage(prefix, message);
-    }		
-</pre>
-<li>In the <samp>shutdown</samp> method of your plugin class, close the log file:
-<code>LoggerFactory.freeLogger(this); </code>
-</ol>
-<p>Typically your code will write a healthy number of messages to the log file, to help you determine
-what went wrong in an error situation in production. However, since this can result in a large number of
-messages in the log file, it is recommended that you offer the user's a preference page in which they
-can specify the types of messages to record in the log file, which should default to error messages only.
-In the event of a problem, they can then turn on a more verbose logging option and re-produce the problem,
-sending the log file to you for additional information. For example, for the Remote System Explorer, this
-preference page is supplied:</p>
-<P><IMG border="0" src="logPreferences.gif"></P>
-
-<h2>Using The Common RSE Log File</h2>
-<p>To log your messages to the common RSE log file in <samp>.metadata\plugins\org.eclipse.rse.ui</samp>,
-either base your plugin class on the <samp>org.eclipse.rse.ui.SystemBasePlugin</samp> class and use
-the inherited logging methods, or instead of instantiating your own <samp>Logging</samp> object, re-use the
-RSE-supplied logging object by calling <samp>getDefault().getLog()</samp> in the <samp>org.eclipse.rse.ui.RSEUIPlugin</samp>
-class.
-</p>
-
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/massagers/uiMassagersAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/massagers/uiMassagersAPI.html
deleted file mode 100755
index 38216f1..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/massagers/uiMassagersAPI.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Massagers API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Massagers API</h1>
-<p>In addition to <a href="../validators/uiValidatorsAPI.html">validating</a> what a user types, we often need
-to transform it prior to saving. For example, we may need to fold it to uppercase or lowercase. The RSE abstracts
-and encapsulates this concept into massagers which can be re-used. A few are pre-supplied by RSE.
-</p>
-
-<h2>RSE Massager Interfaces</h2>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/ISystemMassager.html">ISystemMassager</A></samp> interface is in package
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/package-summary.html">org.eclipse.rse.ui</A></samp>.
-It is a very simple interface with one method:
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/ISystemMassager.html#massage(java.lang.String)">public String massage(String text)</A></samp>.
-Given input text, return the massaged text. While simple, by encapsulating this operation into an interface,
-you will be able to write re-usable dialogs that take a massager as input. Further, tricky massaging can be
-built as a re-usable object.
-</p>
-
-<h2>RSE-Supplied Massagers</h2>
-<p>The RSE supplies the following massagers in package <samp><A href="../../../reference/api/org/eclipse/rse/ui/package-summary.html">org.eclipse.rse.ui</A></samp>:
-</p>
-<BR>
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Massager Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/MassagerFoldCase.html">MassagerFoldCase</A></samp></TD>
-			<TD>Simply folds the text to uppercase or lowercase</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/MassagerFoldCaseOutsideQuotes.html">MassagerFoldCaseOutsideQuotes</A></samp></TD>
-			<TD>Folds the text to uppercase or lowercase, except parts of the text that are surrounded by quotes or any given delimiter characters</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/MassagerFoldCaseUnlessQuoted.html">MassagerFoldCaseUnlessQuoted</A></samp></TD>
-			<TD>Folds the text to uppercase or lowercase, unless the whole text is surrounded by quotes or any given delimiter character</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgDialog.gif b/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgDialog.gif
deleted file mode 100755
index 7098dd0..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgDialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_dialog.gif b/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_dialog.gif
deleted file mode 100755
index 846ba78..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_dialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_properties.gif b/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_properties.gif
deleted file mode 100755
index f293841..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_properties.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_wizard.gif b/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_wizard.gif
deleted file mode 100755
index 9b9d583..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgLine_wizard.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgSample_msgDlg.gif b/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgSample_msgDlg.gif
deleted file mode 100755
index 36829fe..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgSample_msgDlg.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgSample_msgline.gif b/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgSample_msgline.gif
deleted file mode 100755
index 970377d..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/messages/msgSample_msgline.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/messages/sampleMessageFile.html b/core/org.eclipse.ptp.doc.isv/guide/api/messages/sampleMessageFile.html
deleted file mode 100755
index 5888bfc..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/messages/sampleMessageFile.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>Sample Message File</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Sample Message File</h1>
-<p>This is an example of a simple message file, say in <samp>sampleMessages.xml</samp>, which has defined messages for only a single component.
-<pre>
-
-&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;!DOCTYPE MessageFile SYSTEM "../org.eclipse.rse.ui/messageFile.dtd"&gt;
-&lt;!-- <I>This is an exammple of a message file used by SystemMessage and SystemMessageDialog</I> --&gt;
-&lt;MessageFile Version="1.0"&gt;
-     &lt;Component Name="Samples Plugin" Abbr="<B>SPP</B>"&gt;
-          &lt;Subcomponent Name="Dialogs" Abbr="<B>D</B>"&gt;
-                &lt;!-- Component 'D' for dialog sample messages --&gt;
-                &lt;MessageList&gt;
-<A name="SPPD1000"></A>                    &lt;Message ID="<B>1000</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;You must enter a name&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;You have left the customer name empty. Specify a name.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1001"></A>                    &lt;Message ID="<B>1001</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;You must enter a birth year&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;You have left the birth year empty. Specify a year.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1002"></A>                    &lt;Message ID="<B>1002</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;%1 is not a valid year&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The birth year specified is not within the valid range of %2 to %3.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1003"></A>                    &lt;Message ID="<B>1003</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;Year %1 is out of range&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The value you specified for the birth year is not a valid number.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1004"></A>                    &lt;Message ID="<B>1004</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;You must enter a birth month&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;You have left the birth month empty. Specify a month.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1005"></A>                    &lt;Message ID="<B>1005</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;%1 is not a valid month&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The value you specified for the birth month is not a valid number.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1006"></A>                    &lt;Message ID="<B>1006</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;Month %1 is out of range&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The birth month specified is not within the valid range of %2 to %3.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1007"></A>                    &lt;Message ID="<B>1007</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;You must enter a birth day&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;You have left the birth day empty. Specify a day.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1008"></A>                    &lt;Message ID="<B>1008</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;%1 is not a valid day&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The value you specified for the birth day is not a valid number.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1009"></A>                    &lt;Message ID="<B>1009</B>" Indicator="E"&gt;
-                          &lt;LevelOne&gt;Day %1 is out of range&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The birth day specified is not within the valid range of %2 to %3.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1010"></A>                    &lt;Message ID="<B>1010</B>" Indicator="I"&gt;
-                          &lt;LevelOne&gt;Customer %1 created successfully. Re-run to see update mode.&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The customer was created. Re-running the same sample action will show the dialog in update mode.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-<A name="SPPD1011"></A>                    &lt;Message ID="<B>1011</B>" Indicator="I"&gt;
-                          &lt;LevelOne&gt;Customer %1 updated successfully.&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;Congratulations!&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-                &lt;/MessageList&gt;
-          &lt;/Subcomponent&gt;
-     &lt;/Component&gt;
-&lt;/MessageFile&gt;
-</pre>
-
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessageAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessageAPI.html
deleted file mode 100755
index 893fb64..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessageAPI.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Message API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Message API</h1>
-<p>To work with messages, which are defined in an xml <a href="uiMessageFile.html">message file</a>,
-you use:
-</p>
-<ul>
-<li>Static methods in the
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html"org.eclipse.rse.ui.SystemBasePlugin</A></samp>
-class to load the message file and extract messages from it.
-<li>Classes in the
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/package-summary.html">org.eclipse.rse.ui.messages</A></samp>
-package to do variable substitution, and display the messages to the user.
-</ul>
-
-<h2>Methods for Parsing the Message File</h2>
-<p>Once you have defined your message file, you must update your plugin class to load it at startup time.
-To do this, simply call the static method
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadMessageFile(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadMessageFile</a></samp>
-in the RSE-supplied <samp><a href="../plugin/uiPluginAPI.html">SystemBasePlugin</a></samp> class.
-<BR>
-<BR>
-After the message file is loaded into memory, you can extract messages from it by calling the static method
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getMessage(org.eclipse.rse.ui.messages.SystemMessageFile, java.lang.String)">getMessage</a></samp>
-from the same <samp><a href="../plugin/uiPluginAPI.html">SystemBasePlugin</a></samp> class.
-</p>
-
-<h2>Classes for Displaying Messages</h2>
-<p>The following classes are all defined in the <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/package-summary.html">org.eclipse.rse.ui.messages</a></samp> package. </p>
-
-<h3><A name="SystemMessageFile"></A>The <samp>SystemMessageFile</samp> Class</h3>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadMessageFile(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadMessageFile</a></samp> method in <samp>SystemBasePlugin</samp>, returns an instance of
-<samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessageFile.html">SystemMessageFile</a></samp>,
-representing the parsed message file. It is methods in this which return individual messages.
-<h3><A name="SystemMessage"></A>The <samp>SystemMessage</samp> Class</h3>
-The <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getMessage(org.eclipse.rse.ui.messages.SystemMessageFile, java.lang.String)">getMessage</a></samp> method in <samp>SystemBasePlugin</samp> returns an instance of
-<samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessage.html">SystemMessage</a></samp>,
-representing an individual message from the message file.
-</p>
-<p>To do message <i>variable substitution</i>, call the appropriate overload of the <samp>makeSubstitution</samp> method in
-the <A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessage.html">message</A> object, passing as many parameters as there are unique substitution variables in the message.
-</p>
-<p>To get the first level message text, call <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessage.html#getLevelOneText()">getLevelOneText</a></samp> on the message object. To get
-the second level help, call <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessage.html#getLevelTwoText()">getLevelTwoText</a></samp>.
-</p>
-
-<h3><A name="SystemMessageDialog"></A>The <samp>SystemMessageDialog</samp> Class</h3>
-<p>To display a message in a dialog, instantiate <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/SystemMessageDialog.html">SystemMessageDialog</a></samp>, passing
-in a parent shell and the message object, and then call the appropriate <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/SystemMessageDialog.html#open()">open</a></samp> method in the dialog object. Here is what the message
-dialog looks like, for a message of type Error (the type dictates the error icon):
-</p>
-<P><IMG border="0" src="msgDialog.gif" width="457" height="190"></P>
-
-<h3><A name="ISystemMessageLine"></A>The <samp>ISystemMessageLine</samp> Interface</h3>
-<p>If you are extending the RSE class <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html">SystemPromptDialog</a></samp> for dialogs,
-or <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html">AbstractSystemWizardPage</a></samp> for wizard pages
-or <samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.html">SystemBasePropertyPage</a></samp> for property pages, you can display the message to the
-user by calling the <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/ISystemMessageLine.html#setErrorMessage(org.eclipse.rse.ui.messages.SystemMessage)">setErrorMessage</a></samp> method all these classes support. These classes all implement
-the interface <b><samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/ISystemMessageLine.html">ISystemMessageLine</a></samp></b>, which also includes the method <samp>clearErrorMessage</samp>. For non-error
-messages, use <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/ISystemMessageLine.html#setMessage(org.eclipse.rse.ui.messages.SystemMessage)">setMessage</a></samp>
-and <samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/ISystemMessageLine.html#clearMessage()">clearMessage</a></samp>.</p>
-<p>
-Here is what a system message issued in a <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemPromptDialog.html">SystemPromptDialog</a></samp> dialog looks like:</p>
-<P><IMG border="0" src="msgLine_dialog.gif" width="264" height="125"></P>
-<p>The user can select the question mark icon on the right to see the full message dialog, and hence access the second level help for the message.
-<p>Here is what a system message issued in an <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html">AbstractSystemWizardPage</a></samp> looks like:</p>
-<P><IMG border="0" src="msgLine_wizard.gif" width="439" height="98"></P>
-<p>If the user clicks the mouse on the message or icon, they will see the full message dialog for the message.</p>
-
-<p>Here is what a system message issued in a <samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.html">SystemBasePropertyPage</a></samp> looks like:</p>
-<P><IMG border="0" src="msgLine_properties.gif" width="491" height="75"></P>
-<p>Again, if the user clicks the mouse on the message or icon, they will see the full message dialog for the message.</p>
-
-<h2>Classes for Displaying Message Exceptions</h2>
-<p>The following class is defined in the <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/package-summary.html">org.eclipse.rse.services.clientserver.messages</a></samp> package.
-
-<h3>The <samp>SystemMessageDialog</samp> Class</h3>
-<p>Many of the RSE APIs throw <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessageException.html">org.eclipse.rse.services.clientserver.messages.SystemMessageException</a></samp>, which
-encapsulates a system message object. To get the encapsulated message, call <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessageException.html#getSystemMessage()">getSystemMessage()</a></samp>.
-To display the message in an RSE message dialog box, simply call <samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessageException.html#displayMessage()">displayMessage()</a></samp> on the exception object.
-To get the first-level text, call <samp>getMessage()</samp>, or <samp>getSystemMessage().getLevelOneText()</samp>
-</p>
-
-<h1>Message Example</h1>
-<h2>Declaring the Messages</h2>
-<p>Declare the messages via the <samp>Message</samp> tag in a <a href="uiMessageFile.html">message file</a>, such as <samp>sampleMessages.xml</samp>
-<pre>&lt;?xml version=&quot;1.0&quot; encoding='UTF-8'?&gt;
-&lt;!DOCTYPE MessageFile SYSTEM &quot;../org.eclipse.rse.ui/messageFile.dtd&quot;&gt;
-&lt;!-- This is an exammple of a message file used by SystemMessage and SystemMessageDialog --&gt;
-&lt;MessageFile Version=&quot;1.0&quot;&gt;
-     &lt;Component Name=&quot;Samples Plugin&quot; Abbr=&quot;<B>SPP</B>&quot;&gt;
-          &lt;Subcomponent Name=&quot;Dialogs&quot; Abbr=&quot;<B>D</B>&quot;&gt;
-                &lt;!-- Component 'D' for dialog sample messages --&gt;
-                &lt;MessageList&gt;
-                    &lt;Message ID=&quot;<B>1003</B>&quot; Indicator=&quot;E&quot;&gt;
-                          &lt;LevelOne&gt;%1 is not a valid year&lt;/LevelOne&gt;		
-                          &lt;LevelTwo&gt;The birth year specified is not within the valid range of %2 to %3.&lt;/LevelTwo&gt;
-                    &lt;/Message&gt;
-                    &lt;!-- <I>repeat Message elements as needed</I> --&gt;
-                &lt;/MessageList&gt;
-          &lt;/Subcomponent&gt;
-     &lt;/Component&gt;
-&lt;/MessageFile&gt;
-</pre>
-
-<h2>Processing the Message File</h2>
-In your plugin class, declare a message file static variable, load the message file in the constructor, and
-supply a static method for retrieving a message from the file.
-<pre>import org.eclipse.rse.ui.messages.*; // <I>for message file classes</I>
-import org.eclipse.rse.ui.*; // <I>for SystemBasePlugin</I>
-<B>...</B>
-private static SystemMessageFile messageFile = null;
-<B>...</B>
-messageFile = SystemBasePlugin.loadMessageFile(descriptor, &quot;sampleMessages.xml&quot;); // <I>in constructor</I>
-<B>...</B>
-
-/**
- * <I>Retrieve a message from this plugin's message file</I>
- * <I>@param msgId - the ID of the message to retrieve. This is the concatenation of the</I>
- *   <I>message's component abbreviation, subcomponent abbreviation, and message ID as declared</I>
- *   <I>in the message xml file.</I>
- */
-<A name="getPluginMessage"></A>public static SystemMessage <B>getPluginMessage</B>(String msgId)
-{
-    return SystemBasePlugin.getMessage(messageFile, msgId);
-}</pre>
-
-<h2>Retrieving the Message</h2>
-<pre>SystemMessage errorMessage = SamplesPlugin.getPluginMessage("SPPD1003");
-errorMessage.makeSubstitution(input, &quot;1900&quot;, &quot;2003&quot;);</pre>
-
-<h2>Displaying the Message</h2>
-<h3>On a Message Line</h3>
-<pre>setErrorMessage(errorMessage);</pre>
-
-<P><IMG border="0" src="msgSample_msgline.gif" width="227" height="208"></P>
-<h3>In a Message Dialog</h3>
-<pre>SystemMessageDialog msgDlg = new SystemMessageDialog(shell, errorMessage);</br>msgDlg.open(); // <I>to open with details not showing</I>
-//msgDlg.openWithDetails(); // <I>to open with details already showing</I> </pre>
-
-<P><IMG border="0" src="msgSample_msgDlg.gif" width="457" height="190"></P>
-<P><BR>
-</P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessageFile.html b/core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessageFile.html
deleted file mode 100755
index af83cab..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessageFile.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">

-<title>RSE Message File</title>

-</head>

-

-<body bgcolor="#ffffff">

-<h1>RSE Message File</h1>

-<p>To exploit the message framework in RSE, you start by create an message file, named

-say <samp>mymessages.xml</samp>, which looks something like this:

-<pre>

-&lt;?xml version="1.0" encoding='UTF-8'?&gt;

-&lt;!-- This is a sample message file --&gt;

-&lt;MessageFile Version="1.0"&gt;

-     &lt;Component Name="ACME Tools" Abbr="ACME"&gt;

-          &lt;Subcomponent Name="General" Abbr="G"&gt;

-                &lt;MessageList&gt;

-                    &lt;Message ID="1001" Indicator="E"&gt;

-                          &lt;LevelOne&gt;You made a mistake&lt;/LevelOne&gt;

-                          &lt;LevelTwo&gt;Fix your mistake, then re-attempt the operation.&lt;/LevelTwo&gt;

-                    &lt;/Message&gt;

-                &lt;/MessageList&gt;

-          &lt;/Subcomponent&gt;

-     &lt;/Component&gt;

-&lt;/MessageFile&gt;

-</pre>

-

-<h2>RSE Message File Elements</h2>

-<p>Typically, this file is created in plugin project's root folder.</p>

-<p>The important elements in this file are:

-</p><TABLE border="1">

-	<TBODY>

-		<TR>

-			<TH>Element</TH>

-			<TH>Description</TH>

-		</TR>

-		<TR>

-			<TD>MessageFile</TD>

-			<TD>The overall element for the file. There is only one of these tags.</TD>

-		</TR>

-		<TR>

-			<TD>Component</TD>

-			<TD>Identifies a course-grained component within your plugin. You can specify multiple component tags. It is up to you to decide<BR>how many components to divide your plugin into. The abbreviation (Abbr) of the component constitutes the first part of the message ID for messages defined in this component, aiding in servicing when an error message is reported.

-			</TD>

-		</TR>

-		<TR>

-			<TD>Subcomponent</TD>

-			<TD>Identifies a fine-grained subcomponent within a component. The abbreviation (Abbr) of the subcomponent is appended to the component's abbreviation when the message ID is created for messages in this subcomponent. It is up to you to decide how many subcomponents to divide your component into, and what to name them.</TD>

-		</TR>

-		<TR>

-			<TD>MessageList</TD>

-			<TD>Simply encapsulates the list of Message elements for this subcomponent.</TD>

-		</TR>

-		<TR>

-			<TD>Message</TD>

-			<TD>Defines a message. <BR>

-			The <b>ID</b> attribute can be anything you like, but following a naming or numbering convention is a good idea. The ID is appended to the component and subcomponent abbreviations to form the message ID the user will see. 

-			<BR>The <b>Indicator</b> attribute identifies the severity of the message: <b>I</b> for Information, <b>E</b> for Error, <b>W</b> for Warning, <b>U</b> for Unexpected, and <b>Q</b> for Question. This affects the icon that will be used for this message, and the buttons allowed on the message dialog.

-			</TD>

-		</TR>

-		<TR>

-			<TD>LevelOne</TD>

-			<TD>The first-level message the user will initially see. Use %n for substitution variables, where n is a positive integer incrementing up from 1.</TD>

-		</TR>

-		<TR>

-			<TD>LevelTwo</TD>

-			<TD>The second-level help for the message, the user will only see if they ask to see it. Use %n for substitution variables. Any variable used here and in the LevelOne text will be consistently substituted with the same value.</TD>

-		</TR>

-	</TBODY>

-</TABLE>

-

-<h2>RSE Message File Sample</h2>

-<p>This is a bigger <A href="sampleMessageFile.html">sample</A>.</p>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessagesCore.html b/core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessagesCore.html
deleted file mode 100755
index 406299d..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/messages/uiMessagesCore.html
+++ /dev/null
@@ -1,1018 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML> 
-<HEAD> 
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<TITLE> Message File systemmessages.xml </TITLE>
-<style type="text/css">
-h2 { background-color: #CCCCFF }
-</style>
-</HEAD> 
-<BODY>
-<H1>Remote System Explorer Messages</H1>
-<br>
-<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" WIDTH="100%">
-<TR BGCOLOR="#CCCCFF">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Sub-Component Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%">
-<A href=#General>General</A></TD>
-<TD><b>Message prefix</b>=RSEG</TD></TR>
-<TR BGCOLOR="white">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%">
-<A href=#Other>Other</A></TD>
-<TD><b>Message prefix</b>=RSEO</TD></TR>
-<TR BGCOLOR="white">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%">
-<A href=#Files>Files</A></TD>
-<TD><b>Message prefix</b>=RSEF</TD></TR>
-<TR BGCOLOR="white">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%">
-<A href=#Communications>Communications</A></TD>
-<TD><b>Message prefix</b>=RSEC</TD></TR>
-</TABLE>
-<A NAME="General"><!-- --></A><H2>General Messages</H2>
-<H3>RSEG1001</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Under construction<br>
-<b>LevelTwo: </b>This function is not yet available.<br>
-<H3>RSEG1002</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>This will reload the Remote System Explorer. Are you sure?<br>
-<b>LevelTwo: </b>This action should only be used after receiving files from a team repository. It reloads the RSE from the workspace, incorporating the new files.<br>
-<H3>RSEG1003</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>An unexpected exception has occurred<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEG1006</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter name<br>
-<b>LevelTwo: </b>You must enter a name in the field where the cursor is positioned.<br>
-<H3>RSEG1007</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name in use<br>
-<b>LevelTwo: </b>This name is already used by another resource. Enter a unique name.<br>
-<H3>RSEG1008</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name not valid<br>
-<b>LevelTwo: </b>The name entered does not have valid syntax<br>
-<H3>RSEG1009</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>You must rename %1<br>
-<b>LevelTwo: </b>You have left the new name the same as the old name. Enter a new name that is different from the old name.<br>
-<H3>RSEG1010</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name %1 is specified more than once<br>
-<b>LevelTwo: </b>Two or more resources have been renamed to the same new name. Each resource must have a unique name.<br>
-<H3>RSEG1011</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name %1 not valid<br>
-<b>LevelTwo: </b>The name %1 does not have valid syntax<br>
-<H3>RSEG1012</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter new name<br>
-<b>LevelTwo: </b>You have the new name entry field empty. You must enter a unique new name.<br>
-<H3>RSEG1013</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Expand failed or canceled. Try again.<br>
-<b>LevelTwo: </b>When expanding a node in the tree, and retrieving the resources, either an error occurred or you cancelled the operation. The expand is cancelled.<br>
-<H3>RSEG1014</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter profile name<br>
-<b>LevelTwo: </b>You must enter a name for the profile. Profiles contain all connections, filters and user defined actions. They are shared by the team, but each team member sees only those profiles which are active. Each profile can be private to you, or used by the whole team if all team members make the profile active. The name should reflect this. That is, if the profile is to be private to you, pick a name that is least likely to collide with a name chosen by other team members.<br>
-<H3>RSEG1015</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Profile of that name already exists<br>
-<b>LevelTwo: </b>There is already a profile of that name. Choose a unique name for the profile.<br>
-<H3>RSEG1016</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Not a valid profile name<br>
-<b>LevelTwo: </b>Profiles ultimate are folders in the file system, so profile names must be valid folder names for the workbench. Further, they must not contain pound signs (#) or exceed 100 characters in length. Profile names are not case sensitive, but are case tolerant.<br>
-<H3>RSEG1017</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter number<br>
-<b>LevelTwo: </b>The value %1 you entered is not numeric. Enter only numeric input.<br>
-<H3>RSEG1018</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name not valid as folder name<br>
-<b>LevelTwo: </b>The name must be a valid folder name within the workbench and the underlying file system.<br>
-<H3>RSEG1019</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Name not valid as file name<br>
-<b>LevelTwo: </b>The name must be a valid file name within the workbench and the underlying file system.<br>
-<H3>RSEG1020</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter system type<br>
-<b>LevelTwo: </b>You must select a system type. The system type is the type of the operating system of the remote sytem.<br>
-<H3>RSEG1021</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter connection name<br>
-<b>LevelTwo: </b>You must enter a connection name. This name is arbitrary, but must be unique to the selected profile.<br>
-<H3>RSEG1022</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Connection name is not unique for its profile<br>
-<b>LevelTwo: </b>Connection names must be unique to the profile that contains the connection. Specify a name not already in use.<br>
-<H3>RSEG1023</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Not a valid connection name<br>
-<b>LevelTwo: </b>The connection name is not syntactically valid. The name must be a valid folder name within the workbench and the underlying file system.<br>
-<H3>RSEG1024</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter host name or ip address<br>
-<b>LevelTwo: </b>You must specify a host name or TCP/IP address for the remote system.<br>
-<H3>RSEG1025</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter user ID<br>
-<b>LevelTwo: </b>You must specify a user ID to be used to connect to the system.<br>
-<H3>RSEG1026</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Not a valid user ID<br>
-<b>LevelTwo: </b>The user ID entered is not syntactically valid. The only restriction for a user ID is that it not use the characters '=' or ';'.<br>
-<H3>RSEG1027</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter port number<br>
-<b>LevelTwo: </b>You must specify a port number that is used to connect with the server-side communication layer.<br>
-<H3>RSEG1028</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Not a valid port number<br>
-<b>LevelTwo: </b>The value you entered is not a valid port number. It must be a positive integer.<br>
-<H3>RSEG1029</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter value<br>
-<b>LevelTwo: </b>You must enter a value in the field where the cursor is.<br>
-<H3>RSEG1030</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Entry is not unique<br>
-<b>LevelTwo: </b>The value you entered is already in use. Specify a value that is not already in use.<br>
-<H3>RSEG1031</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Syntax is not valid<br>
-<b>LevelTwo: </b>The syntax of the value at the cursor position is not valid.<br>
-<H3>RSEG1032</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter path<br>
-<b>LevelTwo: </b>You must specify a file system path.<br>
-<H3>RSEG1033</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Path is not unique<br>
-<b>LevelTwo: </b>The path you specified is already in use.<br>
-<H3>RSEG1034</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Path syntax is not valid<br>
-<b>LevelTwo: </b>The syntax of the path you specified is not valid. Enter a file system path that is valid for the remote operating system.<br>
-<H3>RSEG1035</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter password<br>
-<b>LevelTwo: </b>You must specify your password.<br>
-<H3>RSEG1036</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Password has expired<br>
-<b>LevelTwo: </b>Your password has expired, and must be reset before continuing.<br>
-<H3>RSEG1037</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter filter pool name<br>
-<b>LevelTwo: </b>You must specify a name for your filter pool. Filter pool names are arbitrary, but typically reflect the contents of the filters, such as "Release 1" or "Accounts Payable".<br>
-<H3>RSEG1038</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter pool name already exists in this profile<br>
-<b>LevelTwo: </b>A filter pool with this name already exists in the profile.<br>
-<H3>RSEG1039</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter pool name not valid<br>
-<b>LevelTwo: </b>The filter pool name you specified is not a valid name. The name must be a valid folder name in the workbench, and must not contain the pound sign '#'. It must also not exceed 50 characters in length.<br>
-<H3>RSEG1040</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Profile name %1 is reserved<br>
-<b>LevelTwo: </b>The given profile name is reserved by IBM. Specify another name for the profile.<br>
-<H3>RSEG1042</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter filter name<br>
-<b>LevelTwo: </b>You must specify a name for your filter. You can specify any name you like. Choose a name that tells others the contents of this filter. For example, "Source Files for Release 1".<br>
-<H3>RSEG1043</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter name already exists in this filter pool<br>
-<b>LevelTwo: </b>The filter name you specified is in use. You must specify a name unique for the parent filter pool.<br>
-<H3>RSEG1044</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter name not valid<br>
-<b>LevelTwo: </b>The filter name you specified is not a valid name. The name must be a valid file name in the workbench, and must not contain the pound sign '#'. It must also not exceed 100 characters in length.<br>
-<H3>RSEG1045</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter filtering information<br>
-<b>LevelTwo: </b>You must specify filtering information<br>
-<H3>RSEG1046</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter string already exists<br>
-<b>LevelTwo: </b>You specified a filter string which already exists in this filter. Having duplicate filter strings will result in duplicate resources in the expanded filter. Specify unique filter strings, preferably which result in unique resources. For example, don't specify both ABC* and A*.<br>
-<H3>RSEG1047</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter string not valid<br>
-<b>LevelTwo: </b>The filter string you specified is not syntactically correct.<br>
-<H3>RSEG1048</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Duplicate filter string '%1'.<br>
-<b>LevelTwo: </b>You have defined the same filter string twice or more. This will result in multiple copies of the same resource, when this filter is expanded. Delete the redundant filter strings.<br>
-<H3>RSEG1049</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter string '%1' already exists in filter %2<br>
-<b>LevelTwo: </b>This filter string cannot be copied or moved to the target filter. The same filter string already exists there<br>
-<H3>RSEG1050</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Save to disk failed with an unexpected exception<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEG1051</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Restore of data failed with unexpected exception<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEG1052</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Delete selected resources?<br>
-<b>LevelTwo: </b>This is a permanent deletion of the selected resources and cannot be undone<br>
-<H3>RSEG1053</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Delete profile '%1'?<br>
-<b>LevelTwo: </b>Do you want to delete this profile, including all of its connections, filters and user actions? Select Yes to delete, or No to cancel the delete request<br>
-<H3>RSEG1054</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Connecting to %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1055</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Connecting to %1 at port %2<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1056</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Connect to %1 failed with an unexpected exception<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1057</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Connect failed. Host %1 not found or not responding<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1058</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Connect to %1 was cancelled<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1059</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Disconnecting from %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1060</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Disconnecting from %1 at port %2<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1061</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Disconnect from %1 failed with exception<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1062</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Disconnect from %1 was cancelled<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1063</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Unexpected error deleting %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1064</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Unexpected error renaming %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1065</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unexpected error moving %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1066</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Operation failed with exception '%1'<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1067</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Operation cancelled.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1068</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Warning. Profile '%1' should be made active. Active connection '%2' contains a reference to it.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1069</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Warning. Profile '%1' should be active. Active connection '%2' contains a reference to it.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1070</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Resolving %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1071</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Running %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1072</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying '%1' to '%2'<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1073</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying connection %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1074</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying connections<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1075</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filter pools<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1076</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filter pool %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1077</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filters<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1078</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filter %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1079</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filter strings<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1080</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying filter string %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1081</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying subsystems<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1082</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Filter pool(s) successfully copied to '%1'. You must create a new filter pool reference to see it (them).<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1083</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving '%1' to '%2'<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1084</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving connection %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1085</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving connections<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1086</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving filter pools<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1087</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving filter pool %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1088</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving filters<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1089</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving filter %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1090</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving filter strings<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1091</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Moving filter string %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1092</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Filter pool(s) successfully moved to '%1'. You must create a new filter pool reference to see it (them).<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1093</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Setting %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1094</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Setting properties<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1095</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Querying %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1096</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Querying properties<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1097</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Running %1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1098</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Expand failed. Try again<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1099</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Expand cancelled. Try again<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1100</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Empty list<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1101</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>List cancelled<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1102</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Filter created successfully. Expand this again to create another<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1103</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Connection %1 not found<br>
-<b>LevelTwo: </b>No connection named %1 currently exists<br>
-<H3>RSEG1104</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Profile %1 not found<br>
-<b>LevelTwo: </b>No profile named %1 currently exists<br>
-<H3>RSEG1105</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Folder %1 not found on host %2<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1106</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File %1 not found on host %2<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1107</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File or folder %1 not found on host %2<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1108</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Connection created successfully. Expand this again to create another<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1109</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Connection busy<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1110</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Command interrupted<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1111</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to run command<br>
-<b>LevelTwo: </b>Possible causes: connection has been deleted, connection has been renamed, or connection has been disconnected<br>
-<H3>RSEG1112</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Command cancelled<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1115</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1116</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1117</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Copying %1...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1118</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Moving %1...<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1130</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Permanently delete selected remote resource(s)?<br>
-<b>LevelTwo: </b>This is a permanent deletion of the selected remote resources from disk. This action cannot be undone<br>
-<!-- [191013] commenting out user actions
-<H3>RSEG1140</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>Error occurred while loading the user-defined action information from file: %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1141</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>The xml file '%1' appears to be corrupted. It has been replaced<br>
-<b>LevelTwo: </b>Expected root tag to be named '%2'. The corrupted file has been renamed to '%3' and a new file created for you<br>
--->
-<H3>RSEG1150</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to perform action as the underlying file system folder is in use<br>
-<b>LevelTwo: </b>The file system folder %1 is in use by another task and cannot be removed or modified<br>
-<H3>RSEG1151</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to perform action as the underlying file system file is in use<br>
-<b>LevelTwo: </b>The file system file %1 is in use by another task and cannot be removed or modified<br>
-<H3>RSEG1160</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Filter pool %1 created. Create a reference to it in the selected subsystem?<br>
-<b>LevelTwo: </b>New filter pools are not accessible until a reference is added to them in a subsystem. Select Yes to add a reference to the new filter pool in selected subsystem %2<br>
-<H3>RSEG1161</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter update failed: %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1162</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter rename failed: %1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEG1170</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter numeric value<br>
-<b>LevelTwo: </b>You must enter a numeric value<br>
-<H3>RSEG1171</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Value %1 not numeric<br>
-<b>LevelTwo: </b>The value specified is not a valid number<br>
-<H3>RSEG1172</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Value %1 not in range<br>
-<b>LevelTwo: </b>The value specified is not within the valid range of %2 to %3<br>
-<!-- [191013] commenting out user actions
-<H3>RSEG1180</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter action name<br>
-<b>LevelTwo: </b>You must enter a name for this action<br>
-<H3>RSEG1181</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Action name is not unique<br>
-<b>LevelTwo: </b>There is already an action with the given name in the selected profile. Specify a name that is not already in use<br>
-<H3>RSEG1182</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Action name is not valid<br>
-<b>LevelTwo: </b>The given name is not a valid action name<br>
-<H3>RSEG1183</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter comment<br>
-<b>LevelTwo: </b>You must enter a comment for this action<br>
-<H3>RSEG1184</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Action comment is not valid<br>
-<b>LevelTwo: </b>The given comment has syntactical errors<br>
-<H3>RSEG1185</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter command<br>
-<b>LevelTwo: </b>You must enter a command for this action<br>
-<H3>RSEG1186</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Action command is not valid<br>
-<b>LevelTwo: </b>The given command has syntactical errors<br>
-<H3>RSEG1187</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter type name<br>
-<b>LevelTwo: </b>You must enter a name for this collection of resource types<br>
-<H3>RSEG1188</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Type name %1 in use<br>
-<b>LevelTwo: </b>There is already a named type with the given name. Specify a name that is not already in use<br>
-<H3>RSEG1189</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Type name %1 is not valid<br>
-<b>LevelTwo: </b>The given name is not valid for a named type. It must not contain blanks<br>
-<H3>RSEG1190</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Specify one or more resource types<br>
-<b>LevelTwo: </b>You must specify one or more simple or generic resource types to constitute this named type<br>
-<H3>RSEG1191</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Types not valid<br>
-<b>LevelTwo: </b>Syntactical errors were found in the list of resource types<br>
--->
-<H3>RSEG1192</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter source type<br>
-<b>LevelTwo: </b>You must enter a source type<br>
-<H3>RSEG1193</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Source type "%1" not valid<br>
-<b>LevelTwo: </b>The source type you entered is not valid.<br>
-<H3>RSEG1194</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Source type "%1" already exists<br>
-<b>LevelTwo: </b>The source type you entered has already been specified. Specify a unique source type.<br>
-<!-- [191013] commenting out user actions
-<H3>RSEG1195</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter a label for this compile command<br>
-<b>LevelTwo: </b>You must enter a label for this compile command, that will be shown in menus and lists<br>
-<H3>RSEG1196</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Compile command label "%1" is in use<br>
-<b>LevelTwo: </b>There is already a compile command with the given label. Specify a label that is not already in use<br>
-<H3>RSEG1197</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Compile command label "%1" is not valid<br>
-<b>LevelTwo: </b>The given label is not a valid compile label<br>
-<H3>RSEG1198</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter command string for this compile command<br>
-<b>LevelTwo: </b>You must enter a command string for this compile command. This is what is run when this compile command is selected.<br>
-<H3>RSEG1199</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Compile command string "%1" is not valid<br>
-<b>LevelTwo: </b>The given string is not a valid command.<br>
--->
-<H3>RSEG1201</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Changes pending. Save changes?<br>
-<b>LevelTwo: </b>You have changes pending. Select Yes to save those changes. Select No to discard those changes<br>
-<H3>RSEG1202</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Changes pending. Continue?<br>
-<b>LevelTwo: </b>You have changes pending. Select Yes to discard those changes. Select No to cancel the operation so you can first save your changes<br>
-<H3>RSEG1220</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Host name '%1' not found or valid<br>
-<b>LevelTwo: </b>A remote system of host name '%1' was found. If you are working disconnected, de-select the checkbox to verify the host name<br>
-<H3>RSEG1221</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Verifying host name...<br>
-<b>LevelTwo: </b><br>
-<!-- [191013] commenting out user actions
-<H3>RSEG1230</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Delete selected user actions?<br>
-<b>LevelTwo: </b>This is a permanent deletion of the selected actions and cannot be undone.Select Yes to delete and No to cancel the delete action<br>
-<H3>RSEG1231</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Delete selected types?<br>
-<b>LevelTwo: </b>This is a permanent deletion of the selected types and cannot be undone.Select Yes to delete and No to cancel the delete action<br>
--->
-<H3>RSEG1240</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>There is an error on another page<br>
-<b>LevelTwo: </b>Another page of the wizard has an error that must be corrected before the wizard can be finished<br>
-<H3>RSEG1250</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The pattern may not be blank<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1251</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Invalid regular expression<br>
-<b>LevelTwo: </b>The value %1 you entered is not a valid regular expression<br>
-<H3>RSEG1255</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1 - Running<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1256</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1 - Finished<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1260</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The invocation may not be blank<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1270</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Invalid drag and drop operation<br>
-<b>LevelTwo: </b>The source %1 cannot be transferred into the target %2<br>
-<H3>RSEG1300</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The FTP service is unavailable on the remote system.<br>
-<b>LevelTwo: </b>The RSE server needs to be installed manually.<br>
-<H3>RSEG1301</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The Telnet service is unavailable on the remote system.<br>
-<b>LevelTwo: </b>The RSE server needs to be started manually or a system administrator needs to install the RSE daemon.<br>
-<H3>RSEG1302</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to start the RSE server.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1303</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Unable to install the RSE server.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEG1400</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>This action will take a few minutes. Proceed?<br>
-<b>LevelTwo: </b>This action uncompresses a large number of HTML files from a zip file. It will take awhile, and require sufficient disk space. Press Yes to continue, No to cancel.<br>
-<H3>RSEG1401</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Classic help already enabled.<br>
-<b>LevelTwo: </b>The HTML files for the CODE and VisualAge RPG help have already been uncompressed.<br>
-<br>
-<hr>
-<A NAME="Other"><!-- --></A><H2>Other Messages</H2>
-<H3>RSEO1000</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEO1001</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEO1002</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEO1003</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEO1004</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b>%2<br>
-<H3>RSEO1005</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEO1006</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>%1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEO1007</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>%1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEO1008</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>%1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEO1009</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>%1: %2<br>
-<b>LevelTwo: </b>%3<br>
-<H3>RSEO1010</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEO1011</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEO1012</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEO1013</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b><br>
-<H3>RSEO1014</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>%1<br>
-<b>LevelTwo: </b><br>
-<br>
-<hr>
-<A NAME="Files"><!-- --></A><H2>Files Messages</H2>
-<H3>RSEF1001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Operation failed. Security violation<br>
-<b>LevelTwo: </b>Message reported from file system: %1<br>
-<H3>RSEF1002</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Operation failed. File system input or output error<br>
-<b>LevelTwo: </b>Message reported from file system: %1<br>
-<H3>RSEF1003</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Folder is not empty. Cannot delete<br>
-<b>LevelTwo: </b>The operation failed. One possible reason is that the folder is not empty<br>
-<H3>RSEF1004</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Folder '%1' not found<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1005</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Folder '%1' not found. Would you like to create it?<br>
-<b>LevelTwo: </b>The folder you specified does not exist. Select Yes to create it, No to cancel the operation<br>
-<H3>RSEF1006</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File '%' not found<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1011</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter file name pattern<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1007</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter string '%1' already exists in this filter<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1008</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Filter string name pattern not valid<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1009</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>You must include files or folders or both<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1010</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>No file types specified<br>
-<b>LevelTwo: </b>Either specify one or more file types, or select to subset by file name<br>
-<H3>RSEF1200</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Create a new File<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1201</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Create a new Folder<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1202</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Enter folder name<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1203</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Names cannot begin or end with whitespace.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1204</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>%1 is an invalid character in a name.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1205</H3>
-<b>Severity: </b>Information<br>
-<b>LevelOne: </b>Enter file name<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF1300</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Deletion of the object %1 failed<br>
-<b>LevelTwo: </b>Either the object does not exist or you do not have enough authority to delete the object. If this is a folder, the folder may not be empty<br>
-<H3>RSEF1301</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Renaming of the object %1 failed<br>
-<b>LevelTwo: </b>Rename operation failed because, the object to rename does not exist, or the object with new object name already exists, or the user does not have enough authority to rename  the object<br>
-<H3>RSEF1302</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>No authority or file name not valid<br>
-<b>LevelTwo: </b>The file could not be created because of one of the following reasons:
-                        - the user does not have enough authority to create the file
-                        - the file name is not valid<br>
-<H3>RSEF1303</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File already exists<br>
-<b>LevelTwo: </b>The new file %1 already exists<br>
-<H3>RSEF1304</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Creation of the folder failed<br>
-<b>LevelTwo: </b>The folder %1 could not be created because of one of the following reasons:
-                        - the user does not have enough authority to create the folder
-                        - the folder name is not valid<br>
-<H3>RSEF1305</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The operation did not complete successfully. See additional messages in the Remote Shell view<br>
-<b>LevelTwo: </b>The operation requested failed. Look in the Remote Shell view to see additional messages indicating the cause of the failure<br>
-<H3>RSEF1306</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Copy of the file or folder %1 failed<br>
-<b>LevelTwo: </b>The file system reported the copy operation failed. You may not have authority to the target folder, or it may be in use<br>
-<H3>RSEF1307</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Move of the file or folder %1 failed<br>
-<b>LevelTwo: </b>The file system reported the move operation failed. You may not have authority to the source folder or file, or you may not have authority to the target folder, or it may be in use<br>
-<H3>RSEF1308</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Target folder cannot equal source folder<br>
-<b>LevelTwo: </b>Attempting to move a file or folder to the same folder as it exists in is equivalent to a rename operation. Use the rename action for this<br>
-<H3>RSEF1309</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Folder already exists<br>
-<b>LevelTwo: </b>The new folder %1 already exists<br>
-<H3>RSEF1310</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>New resource will not be visible due to subsetting. Create it anyway?<br>
-<b>LevelTwo: </b>The name of the resource you are creating does not match the current filter criteria. If you select Yes to create the resource, it will not be visible within the current filter.<br>
-<H3>RSEF1311</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>Resource will not be visible due to subsetting. Rename it anyway?<br>
-<b>LevelTwo: </b>The new name of the resource does not match the current filter criteria. If you select Yes to rename the resource, it will not be visible within the current filter.<br>
-<H3>RSEF5001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File %1 on %2 can not be opened. You do not have read access to the file.<br>
-<b>LevelTwo: </b>Change file permissions to ensure you have read access to the file.<br>
-<H3>RSEF5002</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>You do not have write access to file %1 on %2. Do you want to open the file in browse mode?<br>
-<b>LevelTwo: </b>You do not have write permission to the file %1 on %2. You can open the file in browse (read-only) mode. If you want to edit the file, change file permissions to allow write access to the file.<br>
-<H3>RSEF5003</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File %1 can not be saved on %2. You do not have read access to the file.<br>
-<b>LevelTwo: </b>Change file permissions to ensure you have read access to the file.<br>
-<H3>RSEF5004</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File %1 can not be saved on %2. You do not have write access to the file.<br>
-<b>LevelTwo: </b>Change file permissions to ensure you have write access to the file.<br>
-<H3>RSEF5005</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>File %1 on %2 was modified since you opened this file or saved the file on the server. Do you want to replace the current contents of the file on the server?<br>
-<b>LevelTwo: </b>The file %1 was changed on the server after it was retrieved from %2 or since the last time the file was saved on the server. Choose Yes to replace the contents of the file. Choose No to leave the file on the server with its current contents.<br>
-<H3>RSEF5006</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File %1 was not completely saved on %2. The file was saved in the local file system.<br>
-<b>LevelTwo: </b>An error occurred while saving the file on the server. A possible cause is the connection to the server was terminated. The file may only have been saved partially on the server. However, it was saved locally to help you recover. You will be asked to save the local copy to the server the next time you connect.<br>
-<H3>RSEF5007</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>File %1 on %2 may not have been saved completely during an earlier edit session. The file was saved on the local file system. Do you want to replace the file with the local copy now?<br>
-<b>LevelTwo: </b>An error occurred during an earlier attempt to save the file. But a local copy of the file was saved for recovery. Choose Yes to save the local copy on the server. Choose No if recovery is not required.<br>
-<H3>RSEF5008</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>File %1 does not exist on %2. Do you want to create the file?<br>
-<b>LevelTwo: </b>Choose Yes to create the file on the server and save the contents to the file. Choose No if you do not want the file to be created.<br>
-<H3>RSEF5009</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>You are currently editing file %1 on %2. Do you want to open the file in browse mode?<br>
-<b>LevelTwo: </b>You are allowed to edit a file in one editor only. You can, however, open the file in another editor for browsing. Browsing lets you view the file but does not allow you to edit its contents.<br>
-<H3>RSEF5010</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Profile named %1 does not exist.<br>
-<b>LevelTwo: </b>Profile may have been renamed or deleted.<br>
-<H3>RSEF5011</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Connection named %1 does not exist.<br>
-<b>LevelTwo: </b>Connection may have been renamed or deleted.<br>
-<H3>RSEF5012</H3>
-<b>Severity: </b>Question<br>
-<b>LevelOne: </b>File %1 already exists. Do you want to overwrite it?<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF6001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File type extension can not be empty.<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF6002</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>File type extension must not contain '*' or '.'<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF7001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Enter CCSID<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF7002</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>CCSID must be a number between 0 and 65535<br>
-<b>LevelTwo: </b><br>
-<H3>RSEF8001</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>An unknown error occurred.<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8002</H3>
-<b>Severity: </b>Unexpected<br>
-<b>LevelOne: </b>An unexpected error occurred.<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8003</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Value is not valid<br>
-<b>LevelTwo: </b>%1<br>
-<H3>RSEF8004</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Input %1 is not valid<br>
-<b>LevelTwo: </b>%1<br>
-<br>
-<hr>
-<A NAME="Communications"><!-- --></A><H2>Communications Messages</H2>
-<H3>RSEC1001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Connection to %1 could not be established.<br>
-<b>LevelTwo: </b>A socket connection to %1 could not be established.  If you are connecting via the communications daemon make sure the daemon is running on the remote system.  If you are connecting directly to the communications server make sure the server is started on the remote system.<br>
-<H3>RSEC1002</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Invalid password or user ID<br>
-<b>LevelTwo: </b>Authentication with %1 failed because the password or user ID is not correct.<br>
-<H3>RSEC1003</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The user ID %1 is not valid<br>
-<b>LevelTwo: </b>The user ID %1 on host %2 is not valid.  Change the user ID and try again.<br>
-<H3>RSEC1004</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>The saved password is not correct.<br>
-<b>LevelTwo: </b>The saved password for user ID %1 on host %2 is not correct.  Please enter the password and try again.<br>
-<H3>RSEC2001</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Environment variable %1 is already defined<br>
-<b>LevelTwo: </b>An environment variable %1 has already been defined.  Change the new environment variable's name and press the Add button.<br>
-<H3>RSEC2002</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Environment variable must have a name.<br>
-<b>LevelTwo: </b>An attempt was made to define an environment variable with a blank name.  Type a value for the environment variable name.<br>
-<H3>RSEC2003</H3>
-<b>Severity: </b>Warning<br>
-<b>LevelOne: </b>Environment variable must have a name.<br>
-<b>LevelTwo: </b>An attempt was made to clear the name of an environment variable.  To remove an environment variable, select the variable in the list add press the Remove button.<br>
-<H3>RSEC2004</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Environment variable name contains an invalid character.<br>
-<b>LevelTwo: </b>The environment variable name cannot contain a space or the '=' character.<br>
-<H3>RSEC2101</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Saved password for %1 on %2 already exists.<br>
-<b>LevelTwo: </b>The password for user ID %1 on host %2 is already saved.  Enter a different user ID or host name or change the existing saved password.<br>
-<H3>RSEC2102</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>New and verify passwords do not match.<br>
-<b>LevelTwo: </b>The new and verify passwords must match (case sensitive) in order to save the new password.  Retype the new and verify passwords and try again.<br>
-<H3>RSEC2103</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>Entry field cannot be blank.<br>
-<b>LevelTwo: </b>The hostname, user ID, system type and password entry fields cannot be blank.  Type a value and press the Enter key to save the changes.<br>
-<H3>RSEC2104</H3>
-<b>Severity: </b>Error<br>
-<b>LevelOne: </b>There are no tools installed which support saving password information.<br>
-<b>LevelTwo: </b>The password information preference page is a centralized place for Workbench tools to save password information.  Each tool registers and provides its own encryption algorithm.  There are no tools installed that have registered with the password information preference page.<br>
-<br>
-</BODY>
-</HTML>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/modelAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/modelAPI.html
deleted file mode 100755
index a6f2407..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/modelAPI.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>RSE Model API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Model API</h1>
-<p>The front door to accessing the elements of the RSE model is the <A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html">ISystemRegistry</A>, which is a
-singleton object accessible via <A href="../../reference/api/org/eclipse/rse/core/model/SystemStartHere.html#getSystemRegistry()">SystemStartHere.getSystemRegistry()</A>.
-</p>
-<p>The system registry will get you access to profiles, connections and subsystem factories.
-From a <A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.html">subsystem configuration</A> you can access subsystems, filter pools,
-user actions and compile commands.
-From <A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">ISubSystem</A> you can access remote resources, as well
-as filter pools referenced by the subsystem.
-</p>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/plugin/uiPluginAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/plugin/uiPluginAPI.html
deleted file mode 100755
index 2d27c6c..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/plugin/uiPluginAPI.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Base Plugin Class</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Base Plugin Class</h1>
-<p>You may find it of value to base your own plugin class on the RSE-supplied base plugin class.
-If so, there are some methods you are encouraged to create or override in your class. The benefits
-of using this as your base class is the inherited methods you can access.
-</p>
-<h2>Methods required in your plugin subclass</h2>
-<p>To use the RSE base plugin class
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html">org.eclipse.rse.ui.SystemBasePlugin</A></samp>,
-you subclass it for your own plugin class, and supply some key static methods of your own:
-</p>
-<ul>
-<li><samp>getDefault()</samp>. Return a singleton instance of your plugin.
-<li><samp>getResourceBundle()</samp>. Return the resource bundle for your plugin. This is stored in
-a static field, initialized in your constructor by calling the <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadResourceBundle(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadResourceBundle(...)</A></samp> inherited method.
-<li><samp>getString(String key)</samp>. Return a translated string by calling the inherited method
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getString(java.util.ResourceBundle, java.lang.String)">getString(ResourceBundle rb, String key)</A></samp>, passing in the static resource bundle field.
-<li><samp>getPluginMessageFile()</samp>. Return your RSE message file instance, initialized in your
-constructor by calling <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadMessageFile(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadMessageFile(...)</A></samp>.
-<li><samp>getPluginMessage(String msgID)</samp>. Return the
-<samp><A href="../../../reference/api/org/eclipse/rse/services/clientserver/messages/SystemMessage.html">SystemMessage</A></samp> for the given ID, by
-calling the inherited method
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getMessage(org.eclipse.rse.services.clientserver.messages.SystemMessageFile, java.lang.String)">getMessage(getPluginMessageFile(), msgId)</a></samp>. You will call this method often to get message objects.
-</ul>
-<p>You may also override some RSE-supplied instance methods:
-<ul>
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#initializeImageRegistry()">initializeImageRegistry()</A></samp>. Call
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#putImageInRegistry(java.lang.String, java.lang.String)">putImageInRegistry(String id, String imageFileName)</A></samp>
-to load each of your images.
-</ul>
-</p>
-<p>Of course, there are the usual eclipse-supplied instance methods to override too:
-<ul>
-<li><samp>initializeDefaultPreferences()</samp>. Good place to call the <samp>initDefaults()</samp> method of your preference pages. Be sure to call <samp>super.initializeDefaultPreferences()</samp>.
-<li><samp>startup()</samp>. Good place to register adapters and so forth. Be sure to call <samp>super.startup()</samp> at the beginning.
-<li><samp>shutdown()</samp>. Good place to close any open communication layers. Be sure to call <samp>super.shutdown()</samp> at the end.
-</ul>
-</p>
-
-<h2>Methods inherited from the RSE base class</h2>
-<p>The methods you get access to by using the RSE-supplied base plugin class include:</p>
-<ul>
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getPluginId()">getPluginId()</A></samp>. Return this plugin's ID.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getActiveWorkbenchShell()">getActiveWorkbenchShell()</A></samp>. Return the shell of the active workbench window.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getActiveWorkbenchWindow()">getActiveWorkbenchWindow()</A></samp>. Return the active workbench window.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getWorkspaceRoot()">getWorkspaceRoot()</A></samp>. Return the root of the workspace.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getWorkspace()">getWorkspace()</A></samp>. Return the workspace root.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getInstallLocation()">getInstallLocation()</A></samp>. Return the install directory for this plugin.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getIconPath()">getIconPath()</A></samp>. Return the typical path for icons, relative to the plugin's folder: "icons/"
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#putImageInRegistry(java.lang.String, java.lang.String)">putImageInRegistry(String id, String fileName)</A></samp>. Load an image in the image registry, given the ID to retrieve it with, and its filename and path relative to this plugin's folder
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getImage(java.lang.String)">getImage(String id)</A></samp>. Return an Image given the ID with which it was registered in putImageInRegistry.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getImageDescriptor(java.lang.String)">getImageDescriptor(String id)</A></samp>. Return an ImageDescriptor given the ID with which it was registered in putImageInRegistry.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadResourceBundle(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadResourceBundle(IPluginDescriptor descriptor, String fileName)</A></samp>. Load a resource bundle, given its file name, relative to the given plugin's installation folder.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadResourceBundle(java.lang.String)">loadResourceBundle(String fileName)</A></samp>. Load a resource bundle, given its file name, relative to this plugin's installation folder.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getString(java.util.ResourceBundle, java.lang.String)">getString(ResourceBundle rb, String id)</A></samp>. Return a translated string from a resource bundle, given its key ID.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getString(java.util.ResourceBundle, java.lang.String, java.lang.String)">getString(ResourceBundle rb, String id, String default)</A></samp>. Return a translated string from a resource bundle, given its key ID. If key not found in the resource bundle, returns the given default string.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#loadMessageFile(org.eclipse.core.runtime.IPluginDescriptor, java.lang.String)">loadMessageFile(IPluginDescriptor descriptor,String fileName)</A></samp>. Parse an RSE-style message file into memory, given the plugin and message file name.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getMessage(org.eclipse.rse.services.clientserver.messages.SystemMessageFile, java.lang.String)">getMessage(SystemMessageFile msgFile, String msgId)</A></samp>. Retrieve a SystemMessage object, given the message file that contains it, and its message ID including component and subcomponent abbreviations.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#scanForDuplicateMessages(org.eclipse.rse.services.clientserver.messages.SystemMessageFile)">scanForDuplicateMessages(SystemMessageFile msgFile)</A></samp>. Scan given message file for duplicate IDs. Typically only called during the development cycle.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#printMessages(org.eclipse.rse.services.clientserver.messages.SystemMessageFile, java.lang.String)">printMessages(SystemMessageFile msgFile, String fullyQualifiedTargetFile)</A></samp>. Generate an HTML file documenting the messages in the given message file, given the fully qualified name of the target HTML file.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#showProgrammerErrorMessage(java.lang.String)">showProgrammerErrorMessage(String msg)</A></samp>. Show a message to the user, when the message file support is not available.
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#logInfo(java.lang.String)">logInfo(String message)</A></samp>. Log an informational message to the RSE's core log file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#logWarning(java.lang.String)">logWarning(String message)</A></samp>. Log a warning message to the RSE's core log file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#logError(java.lang.String)">logError(String message)</A></samp>. Log an error message to the RSE's core log file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#logError(java.lang.String, java.lang.Throwable)">logError(String message, Throwable exception)</A></samp>. Log an error message resulting from an exception to the RSE's core log file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#logDebugMessage(java.lang.String, java.lang.String)">logDebugMessage(String prefix, String message)</A></samp>. Log a debug (trace) message to the RSE's core log file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-<li><samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemBasePlugin.html#getLogger()">getLogger()</A></samp>.Return the Logger instance for the RSE default logging file (<samp>.....\.metadata\.plugins\org.eclipse.rse.core\.log</samp>).
-</ul>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_checkBox.gif b/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_checkBox.gif
deleted file mode 100755
index 19d23df..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_checkBox.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_comboBox.gif b/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_comboBox.gif
deleted file mode 100755
index 853d008..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_comboBox.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_keyValue.gif b/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_keyValue.gif
deleted file mode 100755
index 26caa80..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_keyValue.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_string.gif b/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_string.gif
deleted file mode 100755
index f43c068..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/fldEditor_string.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/rsePreferences.gif b/core/org.eclipse.ptp.doc.isv/guide/api/preferences/rsePreferences.gif
deleted file mode 100755
index cc58177..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/rsePreferences.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/uiPreferencesAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/preferences/uiPreferencesAPI.html
deleted file mode 100755
index 9df5818..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/preferences/uiPreferencesAPI.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Preferences API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Preferences API</h1>
-
-<h2>RSE Preference Pages Category</h2>
-<p>All Remote System Explorer preference pages are rooted within the
-preferences category <samp>org.eclipse.rse.ui.preferences.RemoteSystemsPreferencePage</samp>,
-as shown here:</p>
-<P><IMG border="0" src="rsePreferences.gif"></P>
-
-<h2>RSE Preference Pages Classes</h2>
-<p>There is no RSE-supplied base class for preference pages, but we recommend
-you extend <samp>FieldEditorPreferencePage</samp> in package <samp>org.eclipse.jface.preference</samp>.
-This JFace class allows you to create a preferences page as a sequence of "field
-editors" which know how to initialize, load and store their values from their preferences store.
-</p>
-<p>We also suggest the following when designing your preference pages:
-<ol>
-<li>A interface for your preferences constants. It should store two constants per preference: the preference store key, and its default value.
-<li>Static getter and setter methods in your preference page classes, one per preference, to query or update the preference value in the preferences store.
-<li>An <samp>initDefaults(IPreferenceStore store)</samp> method per preferences class, that initializes the preference store value of each preference on that page.
-<li>In your plugin class, an override of the <samp>initializeDefaultPreferences(IPreferenceStore store)</samp> method, so it calls your
-<samp>initDefaults(store)</samp> method for each preference page class.
-</ol>
-<p>Should you need to query, or update, any RSE preferences you can do so via
-the getters and setters in <samp>org.eclipse.rse.core.SystemPreferencesManager</samp>.
-</p>
-<p>The RSE supplies a few field editors, complementing what JFace supplies
-in <samp>org.eclipse.jface.preference</samp>. The RSE-supplied field editors, and the
-RSE-supplied preferences pages, are all found in package <samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/package-summary.html">org.eclipse.rse.ui.propertypages</A></samp>:
-</p>
-<ul>
-<li><b><samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemBooleanFieldEditor.html">SystemBooleanFieldEditor</A></samp></b>. Extends <samp>BooleanFieldEditor</samp> to add support for tooltip text.
-<p><IMG border="0" src="fldEditor_checkBox.gif"></p>
-<li><b><samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemComboBoxFieldEditor.html">SystemComboBoxFieldEditor</A></samp></b>. Shows a combo box allowing the user to choose from a finite list of discrete possibilities.
-<p><IMG border="0" src="fldEditor_comboBox.gif"></p>
-<li><b><samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemKeyValueFieldEditor.html">SystemKeyValueFieldEditor</A></samp></b>. Shows a list of hard-coded keys, each of which supports a user-specifiable value.
-<p><IMG border="0" src="fldEditor_keyValue.gif"></p>
-<li><b><samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemStringFieldEditor.html">SystemStringFieldEditor</A></samp></b>. For simple string preferences. Unlike the JFace string editor, this supports tooltip text and RSE validators and massagers on the typed text.
-<p><IMG border="0" src="fldEditor_string.gif"></p>
-</ul>
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/properties/uiPropertiesAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/properties/uiPropertiesAPI.html
deleted file mode 100755
index b5dae9e..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/properties/uiPropertiesAPI.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Properties API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Properties API</h1>
-<p>You can supply your own property pages to any node in the Remote Systems tree or table views.
-As you author your property page classes, you may find the RSE-supplied base class for property pages
-of value.
-
-<h2>RSE-Supplied Base Class for Property Pages</h2>
-<p>The RSE supplies a base class for property pages,
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/propertypages/SystemBasePropertyPage.html">org.eclipse.rse.ui.propertypages.SystemBasePropertyPage</A></samp>,
-that extends the base eclipse property page <samp>org.eclipse.ui.dialogs.PropertyPage</samp>. The advantages
-of using this RSE-supplied class are:
-</p>
-<ul>
-<li>Supports <samp><a href="../messages/uiMessageAPI.html">SystemMessage</A></samp> error messages, allowing the user to click on a message to see its details.
-<li>Supports automatic assignment of mnemonics for input-capable fields.
-<li>Supports automatic management of the "isValid" property based on current error message status in the message line. This
-property is important to set correct, so eclipse knows when to prevent the user from switching focus to other property pages.
-</ul>
-
-
-<h2>Property Pages for RSE Non-Remote Resources</h2>
-<p>You can simply use the eclipse-supplied extension point <samp>org.eclipse.ui.propertyPages</samp> to
-contribute property pages to any of the non-remote artifacts from the RSE model. To use this extension
-point, you need to know the class or, preferably, interface that the objects implement, which we describe here:
-</p>
-
-<TABLE border="1" width="100%">
-	<TBODY>
-		<TR>
-			<TH>RSE Resource</TH>
-			<TH>Implements Interface</TH>
-		</TR>
-		<TR>
-			<TD>Profile</TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/core/model/ISystemProfile.html">org.eclipse.rse.core.model.ISystemProfile</A></samp></TD>
-		</TR>
-		<TR>
-			<TD>Host</TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/core/model/IHost.html">org.eclipse.rse.core.model.IHost</A></samp></TD>
-		</TR>
-		<TR>
-			<TD>Subsystem</TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">org.eclipse.rse.core.subsystems.ISubSystem</A></samp></TD>
-		</TR>
-		<TR>
-			<TD>Filter pool reference</TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">org.eclipse.rse.core.filters.ISystemFilterPoolReference</A></samp></TD>
-		</TR>
-		<TR>
-			<TD>Filter reference</TD>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/core/filters/ISystemFilterReference.html">org.eclipse.rse.core.filters.ISystemFilterReference</A></samp></TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<h2>Property Pages for RSE Remote Resources</h2>
-<p>See <a href="../../../guide/plugin/propertypage.html">Plugging In Property Pages</a>
-for information on how to contribute property pages for remote resources.
-Because remote resources have no underlying eclipse resource, and typically all are instances of the same class,
-Eclipse Filtering capabilities are used to allow very explicit scoping of the property page to very specific types of remote resources.
-</p>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/resourceAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/resourceAPI.html
deleted file mode 100755
index d5043eb..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/resourceAPI.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>RSE Remote Resource API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Remote Resource API</h1>
-<p>RSE supplies subsystems for accessing the file system and for executing commands, for
-all system types ("universally").
-</p>
-<p>
-To programmatically access the files in a remote system
-identified by a particular system connection, use the
-<A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html">system registry</A> to get to the
-<A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#getSubSystemsBySubSystemConfigurationCategory(String, org.eclipse.rse.core.model.IHost)">file subsystem</A>
-for that connection, by passing in the file category as a String. This <A href="../../reference/api/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFileSubSystem.html">file subsystem</A> offers methods for accessing the remote files.
-</p>
-<p>
-Similarly, to programmatically run commands in a remote system
-identified by a particular system connection, use the
-<A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html">system registry</A> to get to the
-<A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#getSubSystemsBySubSystemConfigurationCategory(String, org.eclipse.rse.core.model.IHost)">command subsystem</A>
-for that connection, by passing in the command category as a String. This <A href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.html">command subsystem</A> offers methods for running remote commands,
-either in a new command shell or an existing command shell. You can also set environment variables
-using this subsytem object.
-</p>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/uiAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/uiAPI.html
deleted file mode 100755
index f73c7fb..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/uiAPI.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>RSE User Interface API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE User Interface API</h1>
-<p>The RSE provides a number of classes that can help with programming productivity when authoring
-user interface artifacts, such as actions, dialogs, wizards, property pages and preferences pages.
-Further, a common requirement in all of these artifacts is the need to display translated messages
-to the user. The RSE supplies a framework for defining and displaying rich messages that have second
-level help, severity and ID attributes.
-</p>
-<p>
-In the following sections we introduce the support offered by the RSE for these UI constructs.
-<h2>Plugin Class</h2>
-<p>The RSE supplies a base plugin class <samp><a href="plugin/uiPluginAPI.html">SystemBasePlugin</a></samp> that offers
-some advantages over the base eclipse <samp>AbstractUIPlugin</samp> class:
-<ol>
-<li>Simplified methods for registering images, and support for retrieving them either as an image
-or an image descriptor.
-<li>Support for <a href="logger/uiLoggerAPI.html">logging</a> error, warning and information messages, using the RSE logging framework.
-<li>Support for loading a resource bundle, and easily retrieving translated strings from it.
-<li>Support for loading an RSE <a href="messages/uiMessageFile.html">message file</a>, and easily retrieving translated messages from it.
-<li>Helper methods for getting the active workbench window and shell.
-</ol>
-</p>
-<p>To use the base plugin class effectively, you must subclass it and supply some critical
-methods of your own.
-</p>
-
-<h2>Logging</h2>
-<p>The Remote System Explorer comes with special support for <a href="logger/uiLoggerAPI.html">logging information</a> to a log file,
-for the purpose of problem determination for servicing your plugin. The log file support allows
-you to either log your messages to the common RSE log file in the <samp>.metadata\plugins\org.eclipse.rse.core</samp>
-folder, or to define your own log file in your plugin metadata folder, if desired.
-</p>
-
-<h2>Messages</h2>
-<p>The Java property file for messages is not very rich, as it offers only the ability to define a
-single message string. Throughout the RSE perspective you will notice that the messages are richer
-than this. They contain second level help, severity, and ID and more. Further, there is a unique
-error message dialog for displaying messages, with their second level help, and specialized support
-in the RSE dialog, wizard and property page classes for displaying messages on a message line. These
-messages can be selected by the user, to bring up the specialized message dialog displaying the
-additional properties of the message. Further, there is support for logging severe errors to a log
-file, enabling better service support.
-</p>
-<p>
-Your own plugins can enjoy this rich message support too, even independently of using the rest of
-the RSE for remote resource access. This support involves defining an xml
-<a href="messages/uiMessageFile.html">message file</a>, which defines
-the messages, and using a set of
-<a href="messages/uiMessageAPI.html">supplied classes</a> to work with the messages.
-</p>
-<p>Before defining your own messages, you may wish to peruse the list of <a href="messages/uiMessagesCore.html">RSE-supplied messages</a> that are
-already defined. The key benefit to using an existing message is translation, as these are already
-translated into many languages.
-</p>
-
-<h2>Preference Pages</h2>
-<p>When defining your own <a href="preferences/uiPreferencesAPI.html">preferences pages</a>,
-you may want to place your preference pages within the Remote Systems preference page category.
-As you author your preference page classes, you may find some of the RSE-supplied classes for
-preference pages to be useful.
-</p>
-
-<h2>Property Pages</h2>
-<p>Property pages can appear in the Properties dialog of any object in eclipse. This dialog is available by selecting
-"Properties" from the pop-up menu for the object. The RSE supports defining your own
-<a href="properties/uiPropertiesAPI.html">property pages</a> for the resources in its model, although there is a
-distinction between local and remote resources.
-</p>
-
-<h2>Validators</h2>
-<p>Validating user-entered text is a common and tedious task in any GUI programming. Using validators to encapsulate
-the error checking for a particular type of data is a highly recommended practice. The
-<a href="validators/uiValidatorsAPI.html">RSE validator</a> support is very
-helpful for this, offering both a common interface for all manner of validators and a large list of pre-supplied
-validators.
-</p>
-
-<h2>Massagers</h2>
-<p>While validating user-entered text is common, so is affecting user-entered text prior to saving it. For example, folding it
-to upper or lower case. The <a href="massagers/uiMassagersAPI.html">RSE massager</a> support encapsulates this concept, and
-supplies a few re-usable massagers for you.
-</p>
-
-<h2>Widgets</h2>
-<p>Populating preference pages, property pages, dialogs and wizards requires use of SWT widget programming. The RSE
-<a href="widgets/uiWidgetsAPI.html">widget support</a> can help, with helper methods and classes, and re-usable widgets you may
-find useful.
-</p>
-
-<h2>Dialogs</h2>
-<p>The RSE supplies rich support for <a href="dialogs/uiDialogsAPI.html">dialogs</a>, including a powerful base class
-and, re-usable pre-built dialogs.
-</p>
-
-<h2>Wizards</h2>
-<p>Wizards are a common building block of an eclipse GUI. Typically, a wizard is used to prompt for information to create
-something new, while a dialog is used to prompt for information for other purposes.
-The RSE <a href="wizards/uiWizardsAPI.html">wizard support</a> includes base classes that can simplify the task of creating wizards.
-</p>
-
-<h2>Actions</h2>
-<p>Populating popup and pulldown menu items requires the creation of actions. These actions typically popup dialogs or wizards,
-and need to be able to pass selections and inputs from the action to the dialog or wizard, and get outputs back. The RSE
-<a href="actions/uiActionsAPI.html">action support</a> can significantly help with this programming task, especially when used
-together with the RSE dialog and wizard support.
-</p>
-
-<p>Often we want to refresh the contents of the Remote Systems view or Table view from within our actions, to visualize
-changes to the selected resources. To do this, use the
-<samp><A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#fireRemoteResourceChangeEvent(int, java.lang.Object, java.lang.Object, org.eclipse.rse.core.subsystems.ISubSystem, java.lang.String)">method</a></samp>.
-To get the system registry, use the
-<samp><A href="../../reference/api/org/eclipse/rse/core/model/SystemStartHere.html#getSystemRegistry()">method</a></samp>.
-</p>
-
-<p>At times, you may want to post events in a dispatch thread rather than using the
-original client's thread; or you may need access to the System Clipboard.
-Such operations are only possible when the UI 
-is loaded, and therefore you need to use
-<samp><A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#fireRemoteResourceChangeEvent(int, java.lang.Object, java.lang.Object, org.eclipse.rse.core.subsystems.ISubSystem, java.lang.String, java.lang.Object)">ISystemRegistry.fireEvent()</a></samp>
-method in that case. To get the system registry UI interface, use the
-<samp><A href="../../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html#getTheSystemRegistryUI()">RSEUIPlugin.getTheSystemRegistryUI()</a></samp>
-method.
-</p>
-
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/validators/uiValidatorsAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/validators/uiValidatorsAPI.html
deleted file mode 100755
index 6894a0a..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/validators/uiValidatorsAPI.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Validators API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Validators API</h1>
-<p>Throughout an eclipse UI there are times when we need to validate what the user has typed in. Validators
-offer a way to encapsulate the error checking for a particular domain, so it can be re-used wherever the user
-is prompted for this. This includes dialogs, property pages, preference pages, wizard pages and viewer
-cells. Eclipse's JFace offers two interfaces for this, one for viewer cells and one for the rest. In RSE,
-there is a single interface combining the requirements of both, so you can author a single validator that is
-re-usable anywhere. Further, the RSE validator interface and sub-interfaces force additional information to be
-supplied to enhance re-use, such as the maximum length, which can be used to set the text limit for a text field.
-</p>
-
-<h2>RSE Validator Interfaces</h2>
-<p>All RSE validator interfaces and classes are in package <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/package-summary.html">org.eclipse.rse.ui.validators</A></samp>.
-
-<h3>ISystemValidator Interface</h3>
-<p>The primary validator interface is <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html">ISystemValidator</A></samp>, which is extends <samp>org.eclipse.jface.dialogs.IInputValidator</samp>
-and <samp>org.eclipse.jface.viewers.ICellEditorValidator</samp>. Both parent interfaces define an <samp>isValid</samp> method,
-but the former takes a String while the latter takes an Object. They both return a String which is the error message if an
-error was detected, or null if no error detected. The <samp>ISystemValidator</samp> interface adds the following additional methods:
-</p>
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Method</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp>public int <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#getMaximumNameLength()">getMaximumNameLength()</A></samp></TD>
-			<TD>Returns the maximum length allowed for this text. Can be used to set text limit of text widgets.</TD>
-		</TR>
-		<TR>
-			<TD><samp>public SystemMessage <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#getSystemMessage()">getSystemMessage()</A></samp></TD>
-			<TD>If <samp>isValid</samp> returns false, this returns a <samp>SystemMessage</samp> object that offers richer message support than just a string.
-			Return null if you don't support <samp><A href="../messages/uiMessageAPI.html">SystemMessages</A></samp>.
-			Callers don't need to use this if they use <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#validate(java.lang.String)">validate(String)</A></samp> instead of <samp>isValid(String)</samp>.</TD>
-		</TR>
-		<TR>
-			<TD><samp>public SystemMessage <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#validate(java.lang.String)">validate(String text)</A></samp></TD>
-			<TD>An alternative to <samp>isValid</samp> if your validator does support <samp>SystemMessage</samp> objects versus simple strings for error messages.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-
-<h3>ISystemValidatorUniqueString Interface</h3>
-<p>Often our validation requires checking that the given text is unique, in some given list of existing things, like names say. To facilitate
-this, there is an interface <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.html">ISystemValidatorUniqueString</A></samp>, which extends <samp>ISystemValidator</samp> and adds some additional
-methods required for uniqueness validation:
-</p>
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Method</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp>public void <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.html#setCaseSensitive(boolean)">setCaseSensitive(boolean caseSensitive)</A></samp></TD>
-			<TD>Specifies whether the test for an existing string should consider case or not.</TD>
-		</TR>
-		<TR>
-			<TD><samp>public void <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.html#setExistingNamesList(java.lang.String[])">setExistingNamesList(String[] existingList)</A></samp></TD>
-			<TD>Sets the existing list to test against, as an array.</TD>
-		</TR>
-		<TR>
-			<TD><samp>public void <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.html#setExistingNamesList(java.util.Vector)">setExistingNamesList(Vector existingList)</A></samp></TD>
-			<TD>Sets the existing list to test against, as a vector of Strings.</TD>
-		</TR>
-		<TR>
-			<TD><samp>public String[] <A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidatorUniqueString.html#getExistingNamesList()">getExistingNamesList()</A></samp></TD>
-			<TD>Returns the existing list that is used to test against.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<p>If you desire to create a unique string validator, you probably will start by subclassing <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUniqueString.html">ValidatorUniqueString</A></samp>.
-</p>
-
-<h3>IValidatorRemoteSelection Interface</h3>
-<p>The third validator interface is <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/IValidatorRemoteSelection.html">IValidatorRemoteSelection</A></samp>, which is specifically intended to be used
-in the remote resource selection dialogs supplied by the RSE. It allows you to decide when to enable the OK button, based on what
-is selected. It contains only the following method:</p>
-<samp>public SystemMessage <A href="../../../reference/api/org/eclipse/rse/ui/validators/IValidatorRemoteSelection.html#isValid(org.eclipse.rse.core.model.IHost, java.lang.Object[], org.eclipse.rse.ui.view.ISystemRemoteElementAdapter[])">isValid(SystemConnection selectedConnection, Object[] selectedObjects, ISystemRemoteElementAdapter[] remoteAdaptersForSelectedObject)</A>;</samp>
-<p>You typically won't implement this interface directly, but rather sublcass <samp>ValidatorRemoteSelection</samp>.</p>
-
-<h3>Validator Samples</h3>
-<ul>
-<li><A href="validatorSample1.html">Sample 1</A></li>
-<li><A href="validatorSample2.html">Sample 2</A></li>
-<li><A href="validatorSample3.html">Sample 3</A></li>
-<li><A href="validatorSample4.html">Sample 4</A></li>
-</ul>
-
-<h2>RSE-Supplied Validators</h2>
-<p>You may be able to avoid creating a new validator if you find that RSE has already supplied one you need. Or, you may find it
-appropriate to simply subclass one of these RSE-supplied validators. All of them are designed to be either used as-is, or configured
-via setter calls, or subclassed, whichever is most convenient.</p>
-<p>All of these validators support rich <samp><A href="../messages/uiMessageAPI.html">SystemMessage</A></samp> objects, versus just simple strings for the error message. When used with the
-RSE dialog, property page or wizard page classes, you should call
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#validate(java.lang.String)">validate(String)</A></samp> and call
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/messages/ISystemMessageLine.html#setErrorMessage(org.eclipse.rse.ui.messages.SystemMessage)">setErrorMessage</A></samp> with the result. When used
-in other places you should use <samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ISystemValidator.html#isValid(java.lang.String)">isValid(String)</A></samp> as it returns just the first-level text of the system message.</p>
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Validator Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorCompileCommandLabel.html">ValidatorCompileCommandLabel</A></samp></TD>
-			<TD>Validates the label for a compile command in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorConnectionName.html">ValidatorConnectionName</A></samp></TD>
-			<TD>Validates the name of a connection in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorFileName.html">ValidatorFileName</A></samp></TD>
-			<TD>Validates the name of a file in eclipse.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorFilterName.html">ValidatorFilterName</A></samp></TD>
-			<TD>Validates the name of a filter in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorFilterPoolName.html">ValidatorFilterPoolName</A></samp></TD>
-			<TD>Validates the name of a filter pool in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorFilterString.html">ValidatorFilterString</A></samp></TD>
-			<TD>Validates the contents of a filter string in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorFolderName.html">ValidatorFolderName</A></samp></TD>
-			<TD>Validates the name of a folder in eclipse.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorIntegerInput.html">ValidatorIntegerInput</A></samp></TD>
-			<TD>Validates the given string is a valid integer.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorIntegerRangeInput.html">ValidatorIntegerRangeInput</A></samp></TD>
-			<TD>Validates the given string is a valid integer within a given range.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorLongInput.html">ValidatorLongInput</A></samp></TD>
-			<TD>Validates the given string is a valid long integer.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorLongRangeInput.html">ValidatorLongRangeInput</A></samp></TD>
-			<TD>Validates the given string is a valid long integer within a given range.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorPathName.html">ValidatorPathName</A></samp></TD>
-			<TD>Validates the given string is a valid folder path in eclipse.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorPortInput.html">ValidatorPortInput</A></samp></TD>
-			<TD>Validates the given string is a valid TCP/IP port number.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorProfileName.html">ValidatorProfileName</A></samp></TD>
-			<TD>Validates the name of a system profile in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorRemoteSelection.html">ValidatorRemoteSelection</A></samp></TD>
-			<TD>This is a very special case abstract base class, for validators that decide the enablement of the OK button
-			 in the RSE-supplied remote resource selection dialogs.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorSourceType.html">ValidatorSourceType</A></samp></TD>
-			<TD>A validator for source types, such as a file type or "*.java". It is intended to be subclassed.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorSpecialChar.html">ValidatorSpecialChar</A></samp></TD>
-			<TD>A base class for validators that need to ensure the given string doesn't contain certain characters.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorSystemName.html">ValidatorSystemName</A></samp></TD>
-			<TD>A name validator, to be used when the name being prompted for must follow Java identifier rules.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUniqueString.html">ValidatorUniqueString</A></samp></TD>
-			<TD>A base class, or configurable class, to be used for any validation that requires the string to be unique within a given list.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserActionCommand.html">ValidatorUserActionCommand</A></samp></TD>
-			<TD>Validates the command of a user defined action in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserActionComment.html">ValidatorUserActionComment</A></samp></TD>
-			<TD>Validates the comment of a user defined action in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserActionName.html">ValidatorUserActionName</A></samp></TD>
-			<TD>Validates the name of a user defined action in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserId.html">ValidatorUserId</A></samp></TD>
-			<TD>Validates a user ID. Does only basic checking, intended to be subclassed.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserTypeName.html">ValidatorUserTypeName</A></samp></TD>
-			<TD>Validates the name of a named type in the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/validators/ValidatorUserTypeTypes.html">ValidatorUserTypeTypes</A></samp></TD>
-			<TD>Validates the type list of a named type in the RSE.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-
-
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample1.html b/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample1.html
deleted file mode 100755
index b323525..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample1.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Validator Sample One</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Validator Sample One</h1>
-<p>This is an example of a validator written from scratch, that just validates a customer name field is not empty.
-Note that while that is all is does today, the power of encapsulation is that we can easily add additional error
-checking in the future, and all dialogs or wizards that use the validator will pick up that change.
-<pre>
-
-package org.eclipse.rse.samples.ui.frameworks.dialogs;
-import org.eclipse.rse.samples.*;
-import org.eclipse.rse.ui.messages.SystemMessage;
-import org.eclipse.rse.ui.validators.ISystemValidator;
-
-/**
- * <I>A validator for a customer name. We simply ensure it is not empty, but this could easily be expanded.</I>
- */
-public class <B>SampleNameValidator</B> implements ISystemValidator
-{
-	private SystemMessage currentMsg;
-	private SystemMessage emptyMsg;
-
-	/**
-	 * <I>Constructor for SampleNameValidator.</I>
-	 */
-	public <B>SampleNameValidator</B>()
-	{
-		super();
-		emptyMsg = SamplesPlugin.<A
-	href="../messages/uiMessageAPI.html#getPluginMessage">getPluginMessage</A>(<A
-	href="../messages/sampleMessageFile.html#SPPD1000">&quot;SPPD1000&quot;</A>);
-	}
-
-	/**
-	 * <I>Required ISystemValidator interface method.</I>
-	 * <I>Return the maximum length for customer names. We return 100.</I>
-	 */
-	public int <B>getMaximumNameLength</B>()
-	{
-		return 100;
-	}
-
-	/**
-	 * <I>Required ISystemValidator interface method.</I>
-	 * <I>@see org.eclipse.rse.ui.validators.ISystemValidator#getSystemMessage()</I>
-	 */
-	public SystemMessage <B>getSystemMessage</B>()
-	{
-		return currentMsg;
-	}
-
-	/**
-	 * <I>Required ISystemValidator interface method.</I>
-	 * <I>@see org.eclipse.rse.ui.validators.ISystemValidator#validate(String)</I>
-	 */
-	public SystemMessage <B>validate</B>(String text)
-	{
-		isValid(text);
-		return currentMsg;
-	}
-	/**
-	 * <I>@see org.eclipse.jface.dialogs.IInputValidator#isValid(String)</I>
-	 */
-	public String <B>isValid</B>(String newText)
-	{
-		if ((newText==null) || (newText.length()==0))
-		  currentMsg = emptyMsg;
-		// todo: more error checking
-		
-		if (currentMsg != null)
-		  return currentMsg.getLevelOneText();
-		else
-		  return null;
-	}
-	/**
-	 * <I>@see org.eclipse.jface.viewers.ICellEditorValidator#isValid(Object)</I>
-	 */
-	public String <B>isValid</B>(Object value)
-	{
-		if (value instanceof String)
-		  return isValid((String)value);
-		return null;
-	}
-}
-</pre>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample2.html b/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample2.html
deleted file mode 100755
index 5b2d63f..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample2.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Validator Sample Two</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Validator Sample Two</h1>
-<p>This is an example of a validator written by extending an existing RSE-supplied validator, and
-simply supplying unique messages.
-<pre>
-
-package org.eclipse.rse.samples.ui.frameworks.dialogs;
-import org.eclipse.rse.ui.validators.ValidatorIntegerRangeInput;
-import org.eclipse.rse.samples.*;
-
-/**
- * <I>An example of a customized validator, that prompts for a birth year.</I>
- */
-public class <B>SampleBirthYearValidator</B> extends ValidatorIntegerRangeInput
-{
-	/**
-	 * <I>Constructor. Specifies the valid range, and unique error messages.</I>
-	 */
-	public SampleBirthYearValidator()
-	{
-		super(1900, 2003);
-		super.setErrorMessages(SamplesPlugin.<A
-	href="../messages/uiMessageAPI.html#getPluginMessage">getPluginMessage</A>(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1001">SPPD1001</A>&quot;),  // <I>empty</I>
-		                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1002">SPPD1002</A>&quot;),  // <I>non-numeric</I>
-                                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1003">SPPD1003</A>&quot;)); // <I>out of range</I>
-	}
-
-}</pre>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample3.html b/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample3.html
deleted file mode 100755
index 551b143..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample3.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Validator Sample Three</title></head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Validator Sample Three</h1>
-<p>This is an example of a validator written by extending an existing RSE-supplied validator, and
-simply supplying unique messages.
-<pre>
-package org.eclipse.rse.samples.ui.frameworks.dialogs;
-import org.eclipse.rse.ui.validators.ValidatorIntegerRangeInput;
-import org.eclipse.rse.samples.*;
-
-/**
- * <I>An example of a customized validator, that prompts for a birth month.</I>
- */
-public class <B>SampleBirthMonthValidator</B> extends ValidatorIntegerRangeInput
-{
-	/**
-	 * <I>Constructor. Specifies the valid range, and unique error messages.</I>
-	 */
-	public SampleBirthMonthValidator()
-	{
-		super(1, 12);
-		super.setErrorMessages(SamplesPlugin.<A
-	href="../messages/uiMessageAPI.html#getPluginMessage">getPluginMessage</A>(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1004">SPPD1004</A>&quot;), // <I>empty</I>
-		                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1005">SPPD1005</A>&quot;), // <I>non-numeric</I>
-                                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1006">SPPD1006</A>&quot;)); // <I>out of range</I>
-	}
-
-}</pre>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample4.html b/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample4.html
deleted file mode 100755
index 23fdb97..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/validators/validatorSample4.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Validator Sample Four</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Validator Sample Four</h1>
-<p>This is an example of a validator written by extending an existing RSE-supplied validator, and
-simply supplying unique messages.
-<pre>
-package org.eclipse.rse.samples.ui.frameworks.dialogs;
-import org.eclipse.rse.core.ui.validators.ValidatorIntegerRangeInput;
-import org.eclipse.rse.samples.*;
-
-/**
- * <I>An example of a customized validator, that prompts for a birth day.</I>
- */
-public class <B>SampleBirthDayValidator</B> extends ValidatorIntegerRangeInput
-{
-	/**
-	 * <I>Constructor. Specifies the valid range, and unique error messages</I>.
-	 */
-	public SampleBirthDayValidator()
-	{
-		super(1, 31);
-		super.setErrorMessages(SamplesPlugin.<A
-	href="../messages/uiMessageAPI.html#getPluginMessage">getPluginMessage</A>(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1007">SPPD1007</A>&quot;), // <I>empty</I>
-		                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1008">SPPD1008</A>&quot;), // <I>non-numeric</I>
-                                       SamplesPlugin.getPluginMessage(&quot;<A
-	href="../messages/sampleMessageFile.html#SPPD1009">SPPD1009</A>&quot;)); // <I>out of range</I>
-	}
-
-}</pre>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/widgets/uiWidgetsAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/widgets/uiWidgetsAPI.html
deleted file mode 100755
index 39f1366..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/widgets/uiWidgetsAPI.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Widgets API</title>
-</head>
-
-<body bgcolor="#ffffff">
-
-<h1>RSE Widgets API</h1>
-<p>Whether coding dialogs, property pages, preference pages or wizard pages we need to write the code to display
-and process the widgets in the client area. The RSE offers some help in this area in two ways:
-</p>
-<ol>
-<li>A <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemWidgetHelpers.html">SystemWidgetHelpers</A></samp>
-class full of static methods to make it easier to create SWT widgets.
-<li>A few re-usable widgets that extend SWT.
-</ol>
-
-<h2>SystemWidgetHelpers Class</h2>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/SystemWidgetHelpers.html">SystemWidgetHelpers</A></samp>
-class in <samp><A href="../../../reference/api/org/eclipse/rse/ui/package-summary.html">org.eclipse.rse.ui</A></samp>
-is chock full of static methods to simplify the work in populating a GridLayout composite with widgets. The GridLayout composite is the most
-flexible and useful of the layouts, yet the most work to code to. These methods will help with that. The methods include:
-</p>
-<ul>
-<li>Methods for creating a GridLayout composite. You typically call this at the start of your code that populates the client area.
-<li>Methods for creating all the common SWT controls, with the GridData values specified for you.
-<li>Methods for creating readonly flavours of input controls, such as a Text field or Combo box.
-<li>Methods for creating labeled entry fields that have a prompting label in front of an input widget.
-<li>Methods for automatically assigning unique mnemonics to all input widgets on a given composite or page.
-<li>Methods for setting composite, widget, action and menu item contextual help.
-<li>Methods for creating RSE-supplied widgets.
-<li>Methods for creating populated combo boxes for connections, remote folders, system types and host names.
-</ul>
-
-<h2>RSE-Supplied Widgets</h2>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/widgets/package-summary.html">org.eclipse.rse.ui.widgets</A></samp>
-package contains some specialized widgets you may find a use for:
-</p>
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Widget Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/widgets/SystemHistoryCombo.html">SystemHistoryCombo</A></samp></TD>
-			<TD>A entry field that remembers its previous values and shows them in a dropdown so the user can easily re-select a previously typed value. The history is maintained for you, and is indexed by a key. This allows the combos to share history across numerous dialogs, property pages or wizard pages. The history can be bounded and pre-filled, and the user can clear the history at any time. This handy widget is used extensively within the RSE.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/widgets/InheritableEntryField.html">InheritableEntryField</A></samp></TD>
-			<TD>An entry field with an left-right arrow beside it. When toggled left, the entry field is not editable and displays a supplied value. When toggled right, the entry field is editable. Useful in cases where the user can choose between an inherited or default value, or enter their own value.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/widgets/SystemPortPrompt.html">SystemPortPrompt</A></samp></TD>
-			<TD>Uses the InheritableEntryField to prompt for a TCP/IP port, where toggling to the left means port 0, or let the &quot;first available port&quot;.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../../reference/api/org/eclipse/rse/ui/widgets/SystemHostCombo.html">SystemHostCombo</A></samp></TD>
-			<TD>This is a combo box that displays the currently defined RSE system connections. The list can be subset by system type or types. Further, you can optionally display a New button beside the combo that allows the user to create a new connection.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<p>There are also many useful widgets related to the selection of remote files or folders, in package
-<samp><A href="../../../reference/api/org/eclipse/rse/files/ui/widgets/package-summary.html">org.eclipse.rse.files.ui.widgets</A></samp>
-
-<P><BR></P>
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/api/wizards/uiWizardsAPI.html b/core/org.eclipse.ptp.doc.isv/guide/api/wizards/uiWizardsAPI.html
deleted file mode 100755
index 89adf77..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/api/wizards/uiWizardsAPI.html
+++ /dev/null
@@ -1,74 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../../book.css" TYPE="text/css">
-<title>RSE Wizards API</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>RSE Wizards API</h1>
-<p>Typically in eclipse GUI design we use a wizard to create new things, and a dialog
-to prompt for secondary information, or update existing things. The Remote System Explorer
-can offer help in creating wizards, just as it does in creating dialogs.
-</p>
-
-<h2>RSE-Supplied Base Classes for Wizards</h2>
-<p>The RSE offers the following classes, in package
-<samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/package-summary.html">org.eclipse.rse.ui.wizards</A></samp> to simplify the creation of wizards.</p>
-
-<h3>The <samp>AbstractSystemWizardPage</samp> class</h3>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html">AbstractSystemWizardPage</A></samp> abstract base class extends the
-JFace <samp>WizardPage</samp> class to offer the following benefits to subclasses:</p>
-<ol>
- <li>Designed to work in conjunction with <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html">AbstractSystemWizard</A></samp>,
-     propogating settings from the wizard to the individual wizard pages.
- <li>Supports using the overall wizard page title as set
-     by <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#setWizardPageTitle(java.lang.String)">setWizardPageTitle(String)</A></samp>
-     in <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html">AbstractSystemWizard</A></samp>,
-     if no title specified in the constructor.
- <li>Supports a <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html#setHelp(java.lang.String)">setHelp(String)</A></samp> method to set the wizard page's overall contextual help
- <li>Implements <samp><A
-		href="../messages/uiMessageAPI.html#ISystemMessageLine">ISystemMessageLine</A></samp> so supports setting error messages as
-      either strings or, preferably, <samp><A
-		href="../messages/uiMessageAPI.html#SystemMessage">SystemMessage</A></samp> objects.
- <li>Supports automatic assignment of unique mnemonics for all input-capable controls on the page, to aid in accessibility.
- <li>Supports setting a default-focus control, which gets initial focus when the page is shown.
- <li>Supports helper methods to aid in population of the client area:
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html#addSeparatorLine(org.eclipse.swt.widgets.Composite, int)">addSeparatorLine(Composite,int)</A></samp>,
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html#addFillerLine(org.eclipse.swt.widgets.Composite, int)">addFillerLine(Composite,int)</A></samp> and
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html#addGrowableFillerLine(org.eclipse.swt.widgets.Composite, int)">addGrowableFillerLine(Composite,int)</A></samp>.
-</ol>
-
-
-<h3><A name="AbstractSystemWizard"></A>The <samp>AbstractSystemWizard</samp> class</h3>
-<p>The <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html">AbstractSystemWizard</A></samp> abstract base class extends the JFace <samp>Wizard</samp>
-class to offer the following benefits to subclasses:</p>
-<ol>
- <li>Designed to work in conjunction with the <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseWizardAction.html">SystemBaseWizardAction</A></samp>,
-     and <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemWizardDialog.html">SystemWizardDialog</A></samp> classes, propogating settings
-     from these to the wizard, and further propogating those to the individual wizard pages.
- <li>The overall wizard title and image can be set via the constructor or setter methods.
- <li>Supports setting an input object, and getting an output object. This is exploited by the
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/actions/SystemBaseWizardAction.html">SystemBaseWizardAction</A></samp> class, when this wizard is launched from a subclass of that action class.
- <li>Supports setting a wizard page title via <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#setWizardPageTitle(java.lang.String)">setWizardPageTitle(String)</A></samp>, that all
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html">AbstractSystemWizardPage</A></samp> pages will use by default for
-     their title, if the non-title constructor is used for that page.
- <li>If being hosted by a <samp><A href="../../../reference/api/org/eclipse/rse/ui/dialogs/SystemWizardDialog.html">SystemWizardDialog</A></samp>, supports dynamically
-     updating the wizard size via <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#updateSize()">updateSize()</A></samp>,
-     if dynamic content is added to a wizard page, causing the page to grow beyond its initial size.
- <li>Supports a <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#setHelp(java.lang.String)">setHelp(String)</A></samp> method to set the overall wizard's contextual help. This is propogated to each
-     <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizardPage.html">AbstractSystemWizardPage</A></samp> as it is added.
- <li>Supports setting the viewer that launched this wizard, as wizards often need to know this so they can update the UI upon Finish.
- <li>Supports a <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#wasCancelled()">wasCancelled()</A></samp> method so callers can easily test if the wizard was cancelled by the user.
- <li>Supports a <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#setMinimumPageSize(int, int)">setMinimumPageSize(int,int)</A></samp> method to set the minimum width and height of the wizard.
- <li>Supports a <samp><A href="../../../reference/api/org/eclipse/rse/ui/wizards/AbstractSystemWizard.html#setPageError(org.eclipse.jface.wizard.IWizardPage)">setPageError(IWizardPage)</A></samp> method that can be called in performFinish when an error is detected on a
-     non-current page. This issues a message telling the user there is an error on another page.
-</ol>
-
-<P><BR></P>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/arch/Artifacts.html b/core/org.eclipse.ptp.doc.isv/guide/arch/Artifacts.html
deleted file mode 100755
index aba5465..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/arch/Artifacts.html
+++ /dev/null
@@ -1,218 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-<title>RSE Artifacts</title>
-</head>
-
-<body>
-<h1>Remote System Explorer Artifacts</h1>
-<p>With the RSE, you can create and manipulate the following artifacts, which we introduce here:</p>
-<ul>
-<li><A href="#Hosts">Hosts</A></li>
-<li><A href="#profiles">Profiles</A></li>
-<li><A href="#subsystems">Subsystems, created from subsystem configurations</A></li>
-<li><A href="#connectorservices">Connector Services, managed by connector service managers</A></li>
-<li><A href="#filters">Filters and filter strings</A></li>
-<li><A href="#filterpools">Filter pools</A></li>
-<li><A href="#Preferences">Preferences</A></li>
-<li><A href="#Registry">System Registry</A></li>
-</ul>
-<p>All the classes and interfaces mentioned here are defined in the <samp>org.eclipse.rse.core</samp> plugin.
-
-<h2><A name="Hosts">Hosts</A></h2>
-<p>
-The RSE's <A href="view_RS.gif">Remote Systems view</A> shows all existing <b>Hosts</b> to remote systems.
-Hosts are objects that are persisted, containing the information needed to access a particular remote host.
-The view contains a prompt to create new Hosts, and pop-up menu actions to rename, copy, delete, and reorder existing Hosts.
-</p>
-<p>Hosts contain attributes, or data, that is saved between sessions of the workbench. These attributes are
-the host name, the remote system's host name and system type, an optional description, and a user Id that is
-used by default by each subordinate subsystem, at host time.
-Underneath, all Hosts are stored via RSE persistence in an Eclipse project named <CODE>RemoteSystemsConnections</CODE></A>, which
-the user can enable for team support, allowing Hosts to be shared by a team.
-</p>
-
-<h2><A name="profiles">Profiles</A></h2>
-<p>
-To facilitate team-shared and user-unique Hosts,
-Hosts are owned by <b>profiles</b>. These are simply <A href="file_profiles.gif">folders in the RemoteSystemsConnections
-project</A>, as it turns out, within which all other data including Hosts are scoped. Internally profiles are realized as
-SystemProfile objects, managed by the SystemProfileManager.
-For each profile there is also a SystemHostPool object
-created to manage the Hosts within that profile. There are menu actions for the
-user to create and manage profiles. The collective of all Hosts of all <b><I>active</I> profiles</b> are shown in the 
-Remote Systems view,
-and the user can easily decide which profiles are active using the <A href="preference_activeProfiles.gif">local pulldown menu</A> of the Remote Systems view.
-The list of profiles currently active is stored locally on each user's workstation, and not shared by teams.
-By default, there exists a profile named <code>Team</code>, and a profile with a name unique to this user. When the first
-host is created the user is asked to supply this unique name, which defaults to the hostname of their
-workstation. Whenever a new host is created, the user is prompted for an active profile to contain the new
-host. Both default profiles are active initially, so all Hosts from each are shown. There is a preferences
-setting to show the host names qualified by their profile name. After synchronizing the RemoteSystemsConnections
-project with a team repository, using the RSE <A href="plugin/view_Team.gif">team view</A>, all profiles of all members of
-the team will exist in the user's workspace, and hence
-all the Hosts created by all the team members. However, only the two default profiles are active, so the Hosts
-in the other profiles are not seen unless the user explicitly makes another profile active. This design allows
-for:
-</p>
-<ol>
-<li>Team-shared Hosts (created in the Team profile or any profile all team members make active)
-<li>User-private Hosts (created in their own profile or any profile not active by default)
-<li>User-roaming, whereby a user uses a different workstation than usual, 
-and then synchronizes with the team repository and sets their profile to be active.
-</ol>
-<p>
-As an aside, user IDs and passwords are not shared with the team repository, but rather stored only locally per
-workstation.
-Each subsystem can have a unique user ID, which if not set is inherited from its host, 
-which in turn if not set is inherited from the
-user ID preferences setting for the appropriate system type.
-</p>
-
-<h2><A name="subsystems">Subsystems and subsystem configurations</A></h2>
-<p>
-When you expand a host, any tools registered with the Remote System Explorer are shown under the host.
-These tools are referred to as <b>subsystems</b>. The tool provider registers a <b>subsystem configuration</b>
-class via an RSE <A href="plugin/subsystem.html">extension point</A>, and whenever a new host is created, the configuration
-is asked to create a new subsystem object for that host. This subsystem is responsible for communicating with the remote host, and
-exposing artifacts and actions for working with remote resources. The subsystem configuration can elect not to
-supply a subsystem for a given host if it does not support the system type of that host
-</p>
-<p>
-RSE supplies two subsystem configurations that supply common subsystems for all Hosts:
-<ol>
-<li>Files. The subsystems created by this factory access the folders and files of the remote system,
-and allow users to explore and manipulate those folders and files. Editing support for remote source files is also included. For programmers, the subsystems also supply common APIs and user interface actions, wizards,
-dialogs, and widgets for easy access to the remote file system for a given host. These APIs are
-typically used when coding actions that appear in the pop-up menu for selected remote objects, but might
-also be of value when writing any view, editor, or action that needs access to a remote file system.
-<li>Commands. The subsystems created by this factory access the command shell of the remote system and
-allow users to predefine commands, and subsequently run them remotely. The commands subsystems are hidden
-subsystems, not shown when you expand the host. However, they are used by any code needing to run
-remote commands. There is also a Remote Shell view supplied that logs all commands and allows users to
-enter a command to be run remotely. The commands all execute within the same shell, and users
-can launch additional shells for the same host.
-</ol>
-<h2><A name="systems">Systems and System Managers</A></h2>
-<p>While not seen by the user, subsystem objects are required to return a <b>connectorservice</b> object via the
-<A href="../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html#getConnectorService()">getConnectorService()</A> method.
-A connectorService object is an object implementing the <A href="../reference/api/org/eclipse/rse/core/subsystems/IConnectorService.html">IConnectorService</A> interface.
-A connectorService object manages the live host to the remote system, and supports
-lifecycle methods for that host such as
-<A href="../reference/api/org/eclipse/rse/core/subsystems/IConnectorService.html#connect(org.eclipse.core.runtime.IProgressMonitor)">connect</A>,
-<A href="../reference/api/org/eclipse/rse/core/subsystems/IConnectorService.html#disconnect()">disconnect</A>, and
-<A href="../reference/api/org/eclipse/rse/core/subsystems/IConnectorService.html#isConnected()">isConnected</A>.
-The communication layer for that host is entirely the programmer's responsibility, and might use sockets, JDBC, HTTP or
-SOAP. It is up the provider of the subsystem factory to author their own communication layer; the framework
-only dictates the handful of methods in IConnectorService, that the RSE UI depends upon. The framework supplies a base
-system class that is easily extended.
-</p>
-<p>It may be the case that multiple subsystems, each from a different subsystem configuration, share the same live
-host for a given host object. To enable this, the framework supplies a base
-<b>connector service manager</b> <A href="../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">class</A>
-that can be used to manage a single shared connector service object across multiple subsystems. It uses a hashtable to store and
-return the connector service objects, keyed by a subsystem interface that all subsystems sharing the same connector service object
-are to implement. The subclass of the base connector service manager class supplies that interface. Further, the subclass
-must also implement the method for instantiating new instances of the connector service class, when no instance is found
-in the hashtable.
-</p>
-<p>
-It is possible to author a subsystem configuration whose subsystems simply use the same connector service object as that used by
-the RSE-supplied subsystems. You might do this if the subsystem configuration uses only the RSE-supplied APIs for
-accessing remote objects, in which case there is no need for a unique communication layer. By sharing the
-same connector service object, it prevents the user from being prompted to signon multiple times. To do this, simply access
-any RSE-supplied subsystem for a given host, and ask for its
-<A href="../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html#getConnectorServiceManager()">connector service manager</A>
-in your own subsystem's <A href="../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorService.html#getConnectorServiceManager()">getConnectorServiceManager</A> method.
-</p>
-
-<h2><A name="filters">Filters</A></h2>
-<p>
-When a subsystem is expanded, users usually see <b>filters</b>. Since subsystems typically list remote artifacts,
-it is typical that a mechanism is needed to allow users to define which artifacts they wish to see, with some
-form of filtering criteria. Filters are this mechanism. The filter support is fully supplied by the RSE framework.
-A filter is simply a <A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilter.html">ISystemFilter</A>
-object containing a name and a collection of <b>filter strings</b>. Filter strings are just strings, which
-the subsystem is required to interpret. When a user expands a filter, the owning subsystem is asked to resolve
-the filter strings within the filter. The subsystem typically interprets each filter string as some form of
-filtering pattern, and returns a list of remote artifacts matching one or more of the filter string patterns in
-the filter. For example, file subsystems expect each filter string to represent a folder, and a file name pattern. Then, all files in the folder, matching the name pattern, are returned. The subsystem supplies the user interface the
-you use to create and change filter strings, so it is responsible for defining what the filter strings
-look like and for subsequently resolving those filter strings on a filter expansion. A default user interface for
-the filter string prompt is supplied, but it is a simple entry field.
-</p>
-<p>
-It is possible to author a subsystem that does not support filters, if this is desired.
-</p>
-
-<h2><A name="filterpools">Filter Pools</A></h2>
-<p>
-Subsystems do not actually "own" filters. Since each host has unique subsystems, if each subsystem owned its
-own filters then filters could not be shared across Hosts, which is sometimes desirable. Instead, filters are
-actually contained within <b>filter pools</b>. Filter pools are simply
-<A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPool.html">ISystemFilterPool</A>
-objects which have a name and a collection of filters.
-Filter pools are owned by subsystem configurations, per profile. That is, each subsystem configuration will contain filter pools
-scoped by profile. Each such configuration plus profile grouping is known internally as a
-<A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolManager.html">filter pool manager</A>.
-Subsystems contain <A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">references</A>
-to filter pools. By default, each subsystem configuration automatically creates one filter pool
-for each profile, named the "xxx Filter Pool", where "xxx" is the name of the profile. Subsystems contain references to
-filter pools, so that as the filters in the pool are created, changed, deleted or re-ordered, those changes are automatically
-reflected in every subsystem (and hence host) that references that filter pool. By default, subsystems are given a
-reference to the default filter pool in their host's profile (for their parent subsystem configuration, so file filters
-are not used in command subsystems, for example).
-</p>
-<p>
-By default, users do not see filter pools. Instead, filters are created in the default filter pool referenced by this subsystem.
-As a result, users will see the same list of filters for every host. However, users can use a preference setting to see
-filter pools. In this case, when a subsystem is expanded, the users see the filter pools referenced by this subsystem.
-Only then when a filter pool is expanded will the user see the filters within that filter pool. In this mode, users also
-see new actions to create filter pools and to add and remove references to filter pools within a subsystem. Whenever filters
-are changed by the user, this change is reflected in all subsystems that reference the parent filter pool. This design
-of filter pools owned by profiles, and subsystems that reference filter pools, facilitates filter sharing:
-<ol>
-<li>Users can share filters across Hosts, by adding references to their parent filter pool in various subsystems.<li>Users can have filters unique to a host, by placing them in a filter pool not referenced by other subsystems.
-<li>Users can have both shared and host-unique filters in a single host, by having both shared and private references
-to filter pools.<li>Teams can share filters by asking each user to add a reference to the same filter pool in their Hosts. For example,
-this is the default case for the default filter pool.
-<li>Users can create filters that are not shared by the team, by creating their own filter pools and not asking others to
-reference it.
-</ol>
-</p>
-<h2><A name="preferences">Preferences</A></h2>
-<p>
-Many of the default characteristics of the Remote System Explorer view and perspective are configurable by each user
-by way of the <A href="preferences.gif">Remote Systems node</A> of the <b>Preferences</b> window, accessible from the Window pull-down of the main menu.
-Furthermore, many of these preferences are directly accessible from the <A
-	href="view_pulldown.gif">pull-down menu of the title bar for the Remote
-Systems view</A>. These preferences, like all preferences, are unique to each user and not shared by the team, although they can
-be exported and imported.
-</p>
-
-<h2><A name="Registry">System Registry</A></h2>
-<p>The programmatic front door to all the artifacts in the RSE is the
-<b>System Registry</b>, which is an object implementing
-<A href="../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html">ISystemRegistry</A>.
-This is a singleton object that you
-can access by calling the static method
-<A href="../reference/api/org/eclipse/rse/core/model/SystemStartHere.html#getSystemRegistry()">getSystemRegistry()</A> in the
-<A href="../reference/api/org/eclipse/rse/core/model/SystemStartHere.html">SystemStartHere</A>
-class in the <samp>org.eclipse.rse.core</samp> plugin.
-</p>
-
-<p>A UI-enabled extension of the system registry is available through the
-<A href="../reference/api/org/eclipse/rse/ui/model/ISystemRegistryUI.html">ISystemRegistryUI</A> interface.
-This interface is available by calling the static method
-<A href="../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html#getTheSystemRegistryUI()">getTheSystemRegistryUI()</A> in the
-<A href="../reference/api/org/eclipse/rse/ui/RSEUIPlugin.html">RSEUIPlugin</A>
-class in the <samp>org.eclipse.rse.ui</samp> plugin.
-</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/arch/Extensions.html b/core/org.eclipse.ptp.doc.isv/guide/arch/Extensions.html
deleted file mode 100755
index ba3376b..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/arch/Extensions.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-<title>Remote System Explorer Extension Points</title>
-</head>
-
-<body>
-<h1>Remote System Explorer Extension Points</h1>
-
-<p>
-This product is built on the Eclipse platform 
-(<A href="http://www.eclipse.org">www.eclipse.org</A>)
- and so it offers all the
-capabilities of Eclipse. This includes the ability to create new Eclipse plug-ins to contribute
-additional functions to Eclipse. You can write plug-ins using Java, using Eclipse itself (or this product),
-with the Plug-in Development Environment (PDE) perspective. Plug-ins contain a file named <code>plugin.xml</code> that
-registers their functions. All such functions are created by use of <b>extension points</b>.
-These are either supplied by Eclipse or by other plug-ins. The plugin.xml file describes which extension
-points are being exploited by each plug-in, and for each identifies the Java class that supplies the
-additional functions. Each extension point identifies a Java interface (or base class) that
-classes exploiting the extension point must implement (or extend).
-</p>
-<p>
-There are many Eclipse-supplied extension points, as described in
-this product's online help. In addition to the Eclipse extension points, there
-are unique Remote System Explorer extension points that enable you to contribute property pages and
-pop-up menu actions to remote objects within the Remote Systems view, among other things. The base Eclipse extension
-points are not sufficient for these, as they do not allow scoping of those property pages and
-actions such that they only appear for certain remote objects meeting specific filtering criteria.
-</p>
-
-<p>
-Here we will introduce the unique extension points defined by the Remote System Explorer. They are
-further described in the reference section. These extension points are specifically designed to make
-it easy to contribute functions to the pop-up menus of remote objects displayed in the Remote
-Systems view. These extension points are defined in the plugin.xml file of the
-<code>org.eclipse.rse.core</code> plugin, which you will find in the plugins sub-folder of your
-installation directory. This file has comment blocks that offer further information about the
-extension points defined in it.
-
-Here are the extension points that are defined by the RSE:
-</P>
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Extension Point</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><A href="plugin/systemtype.html">org.eclipse.rse.core.<b>systemTypes</b></A></TD>
-			<TD>For defining new system types that show up in the New Connection wizard.</TD>
-		</TR>
-		<TR>
-			<TD><A href="plugin/subsystem.html">org.eclipse.rse.core.<b>subsystemConfigurations</b></A></TD>
-			<TD>For defining new subsystems that appear when a connection is expanded.</TD>
-		</TR>
-		<TR>
-			<TD><A href="../reference/extension-points/org_eclipse_rse_services_archivehandlers.html">org.eclipse.rse.services.<b>archivehandlers</b></A></TD>
-			<TD>For supporting additional archive file types, such as is done today for zip, jar and tar files. This adds support for expanding the archives and supporting all the usual actions on the contents.</TD>
-		</TR>
-		<TR>
-			<TD><A href="plugin/popup.html">org.eclipse.ui.<B>popupMenus</B></A></TD>
-			<TD>For	defining actions, which appear in the pop-up menu of remote objects
-			listed in the Remote Systems view.</TD>
-		</TR>
-		<TR>
-			<TD><A href="plugin/propertypage.html">org.eclipse.ui.<b>propertyPages</b></A></TD>
-			<TD>For defining property pages, which appear in the Properties dialog when
-			users select the Properties action from the pop-up menu of remote
-			objects listed in the Remote Systems view.</TD>
-		</TR>
-		<!-- TODODeferred after RSE 1.0
-		<TR>
-			<TD><A href="../reference/extension-points/org_eclipse_rse_ui_compile.html">org.eclipse.rse.ui.<b>compile</b></A></TD>
-			<TD>For contributing compile commands to the Compile menus and Work With Compile Commands dialog.</TD>
-		</TR>
-		-->
-	</TBODY>
-</TABLE>
-<!-- TODO
-  should we add a reference to the runtime-options here,
-  instead of the old rseConfigDefaults extension point?
-
-  <TD>For solution providers that are building a product that includes RSE, 
-  these runtime options allow you to pre-set some out-of-box preference 
-  values. For example, whether the New Connection tree item is shown in 
-  Remote Systems view.</TD>
--->
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/arch/Model.html b/core/org.eclipse.ptp.doc.isv/guide/arch/Model.html
deleted file mode 100755
index 4fd3de5..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/arch/Model.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<title>RSE Model</title>
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-</head>
-
-<body>
-<h1>Remote System Explorer Model</h1>
-<p>The underlying containment model for the RSE static artifacts is shown here.</p>
-<p><img ref="ModelRSE.gif" src="ModelRSE.png"></p>
-		<p>At runtime, the model takes a slightly different form:</p>
-		<ul>
-<li>
-<A href="../reference/api/org/eclipse/rse/core/model/ISystemProfile.html">Profiles</A> are managed by a 
-<A href="../reference/api/org/eclipse/rse/core/model/ISystemProfileManager.html">profile manager</A>, and contain:
-</li>
-<ul>
-<li><A href="../reference/api/org/eclipse/rse/core/model/ISystemHostPool.html">Host Pools</A>, one per profile, which contain</li>
-<ul>
-<li><A href="../reference/api/org/eclipse/rse/core/model/IHost.html">Hosts</A></li>
-</ul>
-<li><A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPool.html">Filter pools</A>, keyed by Subsystem Configuration, and managed by a <A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolManager.html">filter pool manager</A>
-which contain</li>
-<ul>
-<li><A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilter.html">Filters</A>, which contain</li>
-<ul>
-<li><A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterString.html">Filter strings</A></li>
-</ul>
-</ul>
-<!--
-<li><A href="../reference/api/org/eclipse/rse/ui/uda/ISystemUDActionElement.html">User actions</A>, keyed by Subsystem Configuration, which contain</li>
-<ul>
-<li><i>References</i> to <A href="../reference/api/org/eclipse/rse/ui/uda/ISystemUDTypeElement.html">named types</A></li>
-</ul>
-<li><A href="../reference/api/org/eclipse/rse/ui/compile/SystemCompileCommand.html">Compile commands</A></li>
--->
-</ul>
-<li><A href="../reference/api/org/eclipse/rse/core/subsystems/SubSystemConfiguration.html">Subsystem Configurations</A> contain:</li>
-<ul>
-<li><A href="../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html">Subsystems</A>, keyed by host, which contain</li>
-<ul>
-<li><i><A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">References</A></i>
-to <A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPool.html">filter pools</A>, which are managed by <A href="../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolManager.html">filter pool managers</A></li>
-</ul>
-<!--
-<li><A href="../reference/api/org/eclipse/rse/ui/uda/SystemUDTypeElement.html">Named types</A></li>
--->
-</ul>
-</ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/arch/ModelRSE.png b/core/org.eclipse.ptp.doc.isv/guide/arch/ModelRSE.png
deleted file mode 100755
index d079e6e..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/arch/ModelRSE.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/architecture.html b/core/org.eclipse.ptp.doc.isv/guide/architecture.html
deleted file mode 100755
index 8277336..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/architecture.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Architecture</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-<body>
-<h1>RSE Architecture</h1>
-
-
-<p> The Remote System Explorer is structured into three major layors:</p>
-<ul>
-  <li><A href="#Services">Service Layer</A></li>
-  <li><A href="#Subsystems">Subsystem Layer</A></li>
-  <li><A href="#UI">UI Layer</A></li>
-</ul>
-
-
-<A name="Services"></A><h2>RSE Service Layer</h2>
-<p>
-This is the headless, barebones API layer that is used to interact with different protocols to
-provide remote services that can be integrated into RSE.  By default, RSE defines the following
-types of services:
-
-		<ul>
-  <li>File Service - for listing, modifying, copying, and transfering remote file and folders</li>
-  <li>Shell Service - for launching remote shells and interacting with the associated IO</li>
-  <li>Process Services - for listing remote processes</li>
-</ul>
-		<p>
-New service types can be added as needed, either in core RSE, or extensions to the base.  The service
-interfaces are defined loosely so that different implementations of the same service can be made using
-different protocols.  For example, the IFileService could be implemented locally with java.io, FTP, DataStore or some
-other protocol.  Similarly, the IShellService could be implemented locally via DataStore, telnet, SSH or something
-else.
-</p>
-<A name="Subsystems"></A><h2>RSE Subsystem Layer</h2>
-<p>
-RSE subsystems integrate the services of the service layer with connection information, model artifacts and persistence.
-Each subsystem is associated with a single service type.  For example, the file service subsystem is associated with the
-file service.  Each <a href="rse_int_subsystems.html">subsystem</a> is associated with one or more services from the service layer,
-a <a href="rse_int_connectorservices.html">connector service</a> and, in some cases, a model adapter, which is used to
-convert artifacts from the service layer into a form that is suitable for the subsystem layer.
-</p>
-<p>
-Subsystems are contributed via the subsystem configuration extension point.  A subsystem configuration is registered with
-one or more system type (i.e. Local, Linux, Windows, etc.).  When there is an RSE <a href="rse_int_hosts.html">host</a>
-of a particular system type, the subsystem configurations that are registered with that system type are used to instantiate
-and configure the subsystems for that host.  Each subsystem configuration determines the subsystem to instantiate, the service
-implementation, the connector service and anything else that requires customization for it's service.
-</p>
-<p>
-Multiple subsystem configurations can exist for the same type of subsystem.  This will be the case when there are more than
-one protocols that can be used to implement the same service.  For example, there are both FTP and DataStore implementations of
-the IFileService.  Subsystem configurations are contributed for both the FTP implementation and the DataStore one.  In
-such cases, only one subsystem is instantiated for each host, however that subsystem can have its configuration changed from FTP
-to DataStore and vice versa.
-</p>
-<p>
-Subsystems are RSE objects that are persistable and maintain higher level functionality from the service layer.  Subsystems that
-are used to query information on a host often have <a href="rse_int_filters.html">filters</a>.  Filters provide the user the means to
-specify a criteria for which to query a set of data.  In addition to filters, there are more arbitrary properties that can be
-associated with a subsystem, each of which can be saved and restored across sessions.
-</p>
-
-<A name="UI"></A><h2>RSE UI Layer</h2>
-<p>
-The Remote System Explorer perspective provides views that render the subsystems and associated artifacts.  Users can create
-new connections, which can be expanded to reveal subsystems and the information the subsystems reveal about a system.
-</p>
-
-</body>
-</html>
-
diff --git a/core/org.eclipse.ptp.doc.isv/guide/file_conn.gif b/core/org.eclipse.ptp.doc.isv/guide/file_conn.gif
deleted file mode 100755
index 136f576..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/file_conn.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/file_profiles.gif b/core/org.eclipse.ptp.doc.isv/guide/file_profiles.gif
deleted file mode 100755
index e0ad94f..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/file_profiles.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/guide.html b/core/org.eclipse.ptp.doc.isv/guide/guide.html
deleted file mode 100755
index 43b3814..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/guide.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>PTP Developer's Guide</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-
-<body>
-<h1>PTP Developer's Guide</h1>
-<div class="p">
-This book is aimed at developers wishing to understand more about the internal details
-of how the Parallel Tools Platform works.
-It provides the following information:
-<ul>
-  <li>An overview of the PTP <a href="architecture.html">architecture</a>, including
-  the internal model, system services, and the proxy system.</li>
-  <li>A description of the <a href="api.html">APIs</a> for interacting with model
-  elements, launching jobs, debugging, etc.</li>
-  <li>A description of the <a href="extension.html">extension points</a> provided by
-  PTP to allow developers to add extra functionality.
-  <li>Some <a href="tutorials.html">tutorials</a> showing some examples of using this
-  information.</li>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/images/configexample.jpg b/core/org.eclipse.ptp.doc.isv/guide/images/configexample.jpg
deleted file mode 100755
index 62197bc..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/images/configexample.jpg
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/images/layers.jpg b/core/org.eclipse.ptp.doc.isv/guide/images/layers.jpg
deleted file mode 100755
index 0dd8792..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/images/layers.jpg
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/overview.html b/core/org.eclipse.ptp.doc.isv/guide/overview.html
deleted file mode 100755
index de5f0c3..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/overview.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<title>Remote System Explorer Overview</title>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<link rel="stylesheet" type="text/css" HREF="../book.css">

-</head>

-

-<body bgcolor="#ffffff">

-</body>

-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/ChangeFilterDialog_Default.gif b/core/org.eclipse.ptp.doc.isv/guide/plugin/ChangeFilterDialog_Default.gif
deleted file mode 100755
index 55e98e1..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/ChangeFilterDialog_Default.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/NewConnection.gif b/core/org.eclipse.ptp.doc.isv/guide/plugin/NewConnection.gif
deleted file mode 100755
index 567d476..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/NewConnection.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/NewFilterWizard_Default.gif b/core/org.eclipse.ptp.doc.isv/guide/plugin/NewFilterWizard_Default.gif
deleted file mode 100755
index e391647..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/NewFilterWizard_Default.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/RSView_iSeries.gif b/core/org.eclipse.ptp.doc.isv/guide/plugin/RSView_iSeries.gif
deleted file mode 100755
index c268d21..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/RSView_iSeries.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/other.html b/core/org.eclipse.ptp.doc.isv/guide/plugin/other.html
deleted file mode 100755
index 7ff8df5..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/other.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Other Relevant Extension Points</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Other Relevant Extension Points</h1>
-<p>There are some Eclipse extension points that are relevant as-is to the Remote System Explorer,
-which we list here. We do not describe how to use these extension points here, except to document
-the information needed to enable them to in Remote System Explorer.
-</p>
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Extension Point</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><a name="viewActions"></a>
-			<samp><a href="../../../org.eclipse.platform.doc.isv/guide/workbench_basicext_viewActions.htm">org.eclipse.ui.viewActions</a></samp></TD>
-			<TD>For adding actions to the pulldown menu in any view's local toolbar, or to the toolbar itself.
-			To use this you need to know the ID of the RSE views, for the <samp>targetID</samp> attribute: There are:
-			<ul>
-			<li><samp>org.eclipse.rse.ui.view.systemView</samp> for the primary
-			  <A href="view_RS.gif">Remote Systems</A> view.
-			<li><samp>org.eclipse.rse.ui.view.teamView</samp> for the
-			  <A href="view_Team.gif">Team</A> view in the RSE perspective.
-			<li><samp>org.eclipse.rse.ui.view.systemTableView</samp> for the
-			  <A href="view_Table.gif">Remote System Details</A> view in the RSE perspective.
-			</ul>
-			</TD>
-		</TR>
-		<TR>
-			<TD><a name="property"></a>
-			<samp>
-			   <!-- a href="../../../org.eclipse.platform.doc.isv/guide/preferences_prop_contribute.htm" -->
-			   <a href="propertypage.html">
-			   org.eclipse.ui.propertyPages</a></samp></TD>
-			<TD>For adding property pages for objects within the
-			Remote System Explorer. To use this you need to know the class type
-			of these objects for the <samp>objectClass</samp> attribute of the <samp>&lt;page&gt;</samp> element:
-			<ul>
-            <li>Connections: <samp><A href="../../reference/api/org/eclipse/rse/core/model/IHost.html">org.eclipse.rse.core.model.IHost</A></samp></li>
-            <li>SubSystems: <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">org.eclipse.rse.core.subsystems.ISubSystem</A></samp></li>
-            <li>Filter Pools: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">org.eclipse.rse.core.filters.ISystemFilterPoolReference</A></samp></li>
-            <li>Filters: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterReference.html">org.eclipse.rse.core.filters.ISystemFilterReference</A></samp></li>
-       		<li>Remote Elements: your model objects, which are adaptable to <samp>ISystemViewElementAdapter</samp>.
-          		For the RSE-provided reusable file, process and shell subsystems, these are
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFile.html">IRemoteFile</a></samp>, 
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/processes/core/subsystem/IRemoteProcess.html">IRemoteProcess</a></samp> and
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCommandShell.html">IRemoteCommandShell</a></samp>, respectively.
-          		In the Remote Command View, you'll also find
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteError.html">IRemoteError</a></samp> and 
-    	      <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteOutput.html">IRemoteOutput</a></samp>. 
-			</li>
-			</ul>
-            Because all RSE elements adapt to 
-            <samp><A href="../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp>,
-            which in turn implements 
-            <samp><A href="../../../org.eclipse.platform.doc.isv/reference/api/org/eclipse/ui/IActionFilter.html">org.eclipse.ui.IActionFilter</A></samp>,
-            it is possible to scope your property pages to only appear for certain system types or subsystems, using
-            the extension point's <samp>&lt;filter&gt;</samp> element. For example:<br>
-            <pre><code>
-               &lt;extension point=&quot;org.eclipse.ui.propertyPages&quot;&gt;
-                   &lt;page name=&quot;Team Info&quot;
-                         class=&quot;samples.ui.propertypages.TeamFilterPropertyPage&quot;
-                         id=&quot;samples.ui.pp.filter.team&quot;
-                         objectClass=&quot;org.eclipse.rse.core.filters.ISystemFilterReference&quot; &gt;
-                    <b>&lt;filter name=&quot;subsystemConfigurationId&quot; value=&quot;samples.subsystems.factory&quot;/&gt;</b>
-                   &lt;/page&gt;
-               &lt;/extension&gt;
-            </code></pre>
-            See <a href="#scoping">Scoping</a> for all the filter <samp>names</samp> supported by RSE objects.
-            </TD>
-		</TR>
-		<TR>
-			<TD><a name="popup"></a>
-			<samp>
-			  <!-- a href="../../../org.eclipse.platform.doc.isv/guide/workbench_basicext_popupMenus.htm" -->
-			  <a href="popup.html">
-			  org.eclipse.ui.popupMenus</a></samp>
-			</TD>
-			<TD>For adding pop-up menu actions for objects within the Remote System Explorer.
-			To use this you need to know the class type of these objects for the <samp>objectClass</samp> attribute
-			of the &lt;objectContribution&gt; element:
-			<ul>
-            <li>Connections: <samp><A href="../../reference/api/org/eclipse/rse/core/model/IHost.html">org.eclipse.rse.core.model.IHost</A></samp></li>
-            <li>SubSystems: <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">org.eclipse.rse.core.subsystems.ISubSystem</A></samp></li>
-            <li>Filter Pools: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">org.eclipse.rse.core.filters.ISystemFilterPoolReference</A></samp></li>
-            <li>Filters: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterReference.html">org.eclipse.rse.core.filters.ISystemFilterReference</A></samp></li>
-       		<li>Remote Elements: your model objects, which are adaptable to <samp>ISystemViewElementAdapter</samp>.
-          		For the RSE-provided reusable file, process and shell subsystems, these are
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFile.html">IRemoteFile</a></samp>, 
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/processes/core/subsystem/IRemoteProcess.html">IRemoteProcess</a></samp> and
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCommandShell.html">IRemoteCommandShell</a></samp>, respectively.
-          		In the Remote Command View, you'll also find
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteError.html">IRemoteError</a></samp> and 
-    	      <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteOutput.html">IRemoteOutput</a></samp>. 
-			</li>
-			</ul>
-            Because all RSE elements adapt to 
-            <samp><A href="../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp>,
-            which in turn extends 
-            <samp><A href="../../../org.eclipse.platform.doc.isv/reference/api/org/eclipse/ui/IActionFilter.html">org.eclipse.ui.IActionFilter</A></samp>,
-            it is possible to scope your actions to only appear for certain system types or subsystems, using
-            the extension point's <samp>&lt;filter&gt;</samp> element. For example:<br>
-            <pre><code>
-               &lt;extension point=&quot;org.eclipse.ui.popupMenus&quot;&gt;
-                   &lt;objectContribution
-                         id =&quot;samples.ui.actions.TeamFilterActions&quot;
-                         objectClass=&quot;org.eclipse.rse.core.filters.ISystemFilterReference&quot;&gt;
-                         <b>&lt;filter name=&quot;subsystemConfigurationId&quot; value=&quot;samples.subsystems.factory&quot;/&gt;</b>
-                         &lt;action id=&quot;samples.ui.actions.TeamFilterAction1&quot;
-                                 label=&quot;Sample Team Filter Action&quot;
-                                 class=&quot;samples.ui.actions.ShowJarContents&quot;&gt;
-                         &lt;/action&gt;
-                   &lt;/objectContribution&gt;
-               &lt;/extension&gt;
-             </code></pre>
-            See <a href="#scoping">Scoping</a> for all the filter <samp>names</samp> supported by RSE objects.
-            </TD>
-		</TR>
-	</TBODY>
-</TABLE>
-
-<a name="scoping"></a><h2>Scoping</h2>
-<p>For the <samp>org.eclipse.ui.propertyPages</samp> and <samp>org.eclipse.ui.popupMenus</samp> extension points, it is
-possible to scope your property pages and actions to only filters in a particular subsystem, or connections of a
-particular system type, say. These extension points support the <samp>&lt;filter&gt;</samp> element, which
-allows you to specify a property name, and a property value, such that the page or action will only show if
-that property's value is the one given:<br>
-<pre><code>
-  &lt;filter name="<i>name</i>" value="<i>value</i>"/&gt;
-</code></pre>
-It is up to the selected object's adapter to perform this test, in its
-<code>testAttribute(Object target,String <i>name</i>,String <i>value</i>)</code> method. This method is implemented for the adapters for every object shown in the
-Remote Systems view, and what follows is a list of the tests it will do on the given <samp><i>value</i></samp>,
-for the given <samp><i>name</i></samp>:</p>
-<ul>
-<li><b><samp>"name"</samp></b>. Will test the <i>value</i> for an exact match on an object's name,
-or beginning-of-name match if ends with an asterisk.
-<li><b><samp>"type"</samp></b>. Will test the <i>value</i> for an exact match on an object's type.
-<li><b><samp>"offline"</samp></b>.Will test the <i>value</i> against "true" if the user is working
-in "offline" mode or "false" if not. Currently only supported for iSeries connections.
-<li><b><samp>"connected"</samp></b>. Will test the <i>value</i> against "true" if the connection
-containing the selected object is active or "false" if not.
-<li><b><samp>"hasChildren"</samp></b>. Will test the <i>value</i> against "true" if this object's
-adapter reports that it has children or "false" if it doesn't have children.
-<li><b><samp>"systemType"</samp></b>. Will test the <i>value</i> for an exact match on the system type of
-this object's parent SystemConnection object.
-You can specify multiple values if you comma-separate them.
-<li><b><samp>"subsystemConfigurationId"</samp></b>. Will test the <i>value</i> for an exact match on the
-<samp>ID</samp> of the subsystem factory that created this object's subsystem. Returns false for SystemConnection objects.
-You can specify multiple values if you comma-separate them.
-<li><b><samp>"subsystemConfigurationCategory"</samp></b>. Will test the <i>value</i> for an exact match
-on the <samp>category</samp> of the subsystem factory that created this object's subsystem.
-You can specify multiple values if you comma-separate them.
-</ul>
-
-<p>For system filter objects of type <samp>org.eclipse.rse.core.filters.ISystemFilterReference</samp>,
-the following names are also supported:
-<ul>
-<li><b><samp>"filterType"</samp></b>. Will test the <i>value</i> for an exact match on the selected filter's
-untranslated type, as set internally. The only RSE-supplied subsystem to support multiple filter types is
-the iSeries Objects subsystem for iSeries connections. It contains these types:
-  <ul>
-       <li><samp>"Library"</samp>.
-       <li><samp>"LibraryList"</samp>.
-       <li><samp>"Object"</samp>.
-       <li><samp>"Member"</samp>.
-  </ul>
-</ul>
-
-<p>For the <samp>org.eclipse.ui.popupMenus</samp> extension point, you can also use the above names
-in the &lt;visibility&gt; and &lt;enablement&gt; elements, for extreme flexibility in when
-the action is shown, and when it is enabled or disabled. These map to the <samp>objectState</samp>
-attribute. For example:
-<pre><code>
-   &lt;enablement&gt;
-       &lt;objectState name="hasChildren" value="true"/&gt;
-   &lt;/enablement&gt;
-</code></pre>
-
-
-<p>Be aware the <samp>&lt;visibility&gt;</samp> element is available at the
-<samp>&lt;objectContribution&gt;</samp> level, while the <samp>&lt;enablement&gt;</samp>
-element is available at the <samp>&lt;Action&gt;</samp> level.
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/popup.html b/core/org.eclipse.ptp.doc.isv/guide/plugin/popup.html
deleted file mode 100755
index 687e862..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/popup.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Plugging In Popup Menu Actions</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Plugging In Popup Menu Actions</h1>
-<p>The <samp><a href="../../../org.eclipse.platform.doc.isv/reference/extension-points/org_eclipse_ui_popupMenus.html">org.eclipse.ui.popupMenus</a></samp> extension point 
-from the base Eclipse Platform is used to contribute popup menus.
-</p>
-<p>The primary element in the markup for this extension point is the <b><samp>&lt;objectContribution&gt;</samp></b> element,
-which scopes the remote objects to which the child elements apply:
-</p>
-<ul>
-<li><b>id</b>.A unique ID for this extension point. Not used, but required by Eclipse.</li>
-<li><a name="objectClass"></a>
-	<b>objectClass</b>. The element on which the popup menu action should appear.
-	To use this you need to know the class type of these objects for the <samp>objectClass</samp> attribute
-	of the &lt;objectContribution&gt; element:
-	<ul>
-       <li>Connections: <samp><A href="../../reference/api/org/eclipse/rse/core/model/IHost.html">org.eclipse.rse.core.model.IHost</A></samp></li>
-       <li>SubSystems: <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html">org.eclipse.rse.core.subsystems.ISubSystem</A></samp></li>
-       <li>Filter Pools: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterPoolReference.html">org.eclipse.rse.core.filters.ISystemFilterPoolReference</A></samp></li>
-       <li>Filters: <samp><A href="../../reference/api/org/eclipse/rse/core/filters/ISystemFilterReference.html">org.eclipse.rse.core.filters.ISystemFilterReference</A></samp></li>
-       <li>Remote Elements: your model objects, which are adaptable to <samp>ISystemViewElementAdapter</samp>.
-          For the RSE-provided reusable file, process and shell subsystems, these are
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/files/core/subsystems/IRemoteFile.html">IRemoteFile</a></samp>, 
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/processes/core/subsystem/IRemoteProcess.html">IRemoteProcess</a></samp> and
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCommandShell.html">IRemoteCommandShell</a></samp>, respectively.
-          In the Remote Command View, you'll also find
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteError.html">IRemoteError</a></samp> and 
-              <samp><a href="../../reference/api/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteOutput.html">IRemoteOutput</a></samp>. 
-       </li>
-	</ul></li>
-<li><a name="filtering"></a>
-	<b><i>filtering attributes</i></b>.To scope which remote objects these actions should show up for.
-    Because all RSE elements adapt to 
-    <samp><A href="../../reference/api/org/eclipse/rse/ui/view/ISystemViewElementAdapter.html">ISystemViewElementAdapter</A></samp>,
-    which in turn extends 
-    <samp><A href="../../../org.eclipse.platform.doc.isv/reference/api/org/eclipse/ui/IActionFilter.html">org.eclipse.ui.IActionFilter</A></samp>,
-    it is possible to scope your actions to only appear for certain system types or subsystems, using
-    the extension point's <samp>&lt;filter&gt;</samp> element. For example:<br>
-    <pre><code>
-       &lt;extension point=&quot;org.eclipse.ui.popupMenus&quot;&gt;
-           &lt;objectContribution
-                 id =&quot;samples.ui.actions.TeamFilterActions&quot;
-                 objectClass=&quot;org.eclipse.rse.core.filters.ISystemFilterReference&quot;&gt;
-                 <b>&lt;filter name=&quot;subsystemConfigurationId&quot; value=&quot;samples.subsystems.factory&quot;/&gt;</b>
-                 &lt;action id=&quot;samples.ui.actions.TeamFilterAction1&quot;
-                         label=&quot;Sample Team Filter Action&quot;
-                          class=&quot;samples.ui.actions.ShowJarContents&quot;&gt;
-                 &lt;/action&gt;
-           &lt;/objectContribution&gt;
-       &lt;/extension&gt;
-    </code></pre>
-    See <a href="other.html#scoping">Scoping</a> for all the filter <samp>names</samp> supported by RSE objects.
-    </li>
-</ul>
-<p>Within each <samp>&lt;objectContribution&gt;</samp> element are zero or more <B><samp>&lt;menu&gt;</samp></B> elements for
-optionally defining cascading submenus, and &lt;<B>action</B>&gt; elements for the actual actions.
-To have the actions show up in a cascading menu, use the <samp>&lt;menu&gt;</samp> element with these
-attributes:
-</p>
-<ul>
-<li><b>id</b>. Unique id for the submenu. Used later to target actions into this cascading submenu.
-<li><b>label</b>. The text the user sees in the pop-up menu.
-<li><b>path</b>. For multi-cascading menus, use this attribute to identify a previously specified menu that
-this menu is to be nested within. The syntax is a bit tricky. It is <samp>id/group</samp>, where <samp>id</samp>
-matches the id attribute from a previous <samp>&lt;menu&gt;</samp> element, and <samp>group</samp> matches the name attribute
-of a <samp>&lt;separator&gt;</samp> sub-element within that previous <samp>&lt;menu&gt;</samp> element. For multi-nesting, repeat the <samp>id</samp>
-part, as in <samp>id1/id2/id3/group</samp>. In this case, there must be a <samp>&lt;menu&gt;</samp> element with and id value of
-<samp>id3</samp> that refers to another <samp>&lt;menu&gt;</samp> element <samp>id2</samp> via is path attribute, which in turn
-refers to <samp>&lt;menu&gt;</samp> element <samp>id1</samp> via its <samp>path</samp> attribute. If the group does not exist,
-it will be created.
-<br>
-For the root cascading menu, you can also use this to specify a group within the remote object's pop-up,
-for where to place this cascading menu. The default is the <samp>additions</samp> group, which is near the
-bottom of the pop-up menu. The RSE-supplied groups for pop-up menus are listed shortly in Table 4. There are
-also a few RSE-supplied cascading menus listed in Table 4, which can be specified for the id prefix in order
-to add a cascading menu to an RSE-supplied cascading menu.
-</ul>
-<P>Within each <samp>&lt;menu&gt;</samp> element are one or more <b><samp>&lt;separator&gt;</samp></b> elements that partition the cascading
-menu into groups. Groups are simply named physical areas of the menu. The order in which they are defined is the order they
-appear in the menu. Actions always go into groups. Groups avoid the need to specify relative information to identify where
-within a pop-up menu to place actions. There is only one attribute for this element:
-</P>
-<ul>
-<li><b>name</b>. The name to give this group. Users do not see this, but it is used in the <samp>action</samp> element to identify where to place
-the action within this submenu. Groups exist in the order they are defined, top to bottom. Between groups is a separator unless
-contiguous groups are empty. There is always a default group named <samp>additions</samp> supplied for you.
-</ul>
-<p>Finally, within <samp>&lt;objectContribution&gt;</samp> elements are one or more <b><samp>&lt;action&gt;</samp></b> elements identifying the
-actual actions, each of which only show up if the scoping criteria is met for that parent <samp>&lt;objectContribution&gt;</samp>
-element. The attributes for <samp>&lt;action&gt;</samp> elements are:
-</p>
-<ul>
-<li><b>id</b>. Unique id for the action.
-<li><b>label</b>. What the user sees in the pop-up menu.
-<li><b>icon</b>. Optional icon to show beside the label. This is the name of a file qualified by a path relative to this plugin's directory.
-<li><b>class</b>. Name of the class extending one of the classes listed in the documentation.
-<li><b>menubarPath</b>. Where to put this action. This is optional and only required when you do not want the action to go into the
-default location within the remote object's pop-up menu. This is a group name, optionally preceded by slash-delimited Ids for actions
-that go inside cascading menus, where each Id matches an id attribute from a previously specified <samp>&lt;menu&gt;</samp> element.
-If no menubarPath is specified, the action goes into the <samp>&lt;additions&gt;</samp> area of the object's popup menu, which is
-near the bottom of the pop-up menu. The RSE-supplied groups for remote object pop-up menus are listed in Table 4, as well as menu Ids
-for RSE-supplied cascading menus, should you wish to add an action to an RSE-supplied cascading menu.
-<li><b>enablesFor</b>. Tells when to enable this action based on how many items are selected. Typically, specify "1" for
-single-selection or "+" for multiple-selection. You can also change the enabled state of your action within your class,
-by calling the <samp>setEnabled(boolean)</samp> method or overriding the <samp>getEnabled(Object[] currentlySelected)</samp> method that is called
-when the selection changes.
-<li><b>state</b>. Specify if this is a toggle (checkable) menu item. Specify "true" or "false" to indicate initial
-toggle status. Call <samp>setChecked(boolean)</samp> in your class to change the toggled state.
-<li><b>helpContextId</b>. Allows F1 help for this action. Optional.
-</ul>
-<p>
-The <samp>path</samp> attribute for the <samp>&lt;menu&gt;</samp> element, and the <samp>menubarPath</samp> attribute for the <samp>&lt;action&gt;</samp>
-element, are the most difficult to master. The rules are reasonably simple though:
-</p>
-<ol>
-<li>To have your action show up in the initial pop-up menu, just specify a group name on the <samp>menubarPath</samp> attribute. That name can be
-one of the RSE-supplied group names defined in Table 4, or your own group name, which will be created and appended to the end of the
-pop-up menu. The default group is <samp>"additions"</samp>.
-<br>Example: <samp>menubarPath="myGroup"</samp>
-<li>To have your action show up in a simple RSE-supplied cascading menu within the pop-up menu, in your <samp>&lt;action&gt;</samp> element,
-specify the RSE-supplied menu ID from Table 4 in the <samp>menubarPath</samp> attribute, then a slash followed by the name of a group. The only
-RSE-supplied group for cascading menus is <samp>"additions"</samp>. If you specify anything else for the group, the group will be created for you
-at the bottom of the menu.
-<br>Example: <samp>menubarPath="menu.new/myGroup"</samp>
-<li>To have your action show up in a simple cascading menu of your own, first define the menu with a <samp>&lt;menu&gt;</samp> element,
-giving it an ID via the id attribute. In your <samp>&lt;action&gt;</samp> element, in the <samp>menubarPath</samp> attribute specify that id followed by a slash
-and then the name of a group. That group name can be one specified on a <samp>&lt;separator&gt;</samp> element within your menu, or a new name, which
-results in a new group at the bottom of the menu. In the latter case, there will be no separators delimiting the group, while in the former case
-there will be.
-<br>Example: <samp>menubarPath="myMenu1/myGroup"</samp>
-<li>To have your action show up in a multi-cascading menu of your own, define each of the menu via <samp>&lt;menu&gt;</samp> elements. For all but the
-first, identify the parent menu using the path attribute, specifying the Ids for each of the parent menus, slash-separated. At
-the end of the path attribute, specify the group within the final parent menu into which this menu will be placed. Again, this
-will either be a group defined with a <samp>&lt;separator&gt;</samp> element in the parent <samp>menu</samp> element, or specify a non-existing group that will be
-created for you. Once your multi-cascading menu is created, you identify it in your <samp>&lt;action&gt;</samp> element via the <samp>menubarPath</samp> attribute,
-specifying all the menu Ids up to the final menu, slash-separated, and then the group within that final menu, as usual.
-<br>Example: <samp>menubarPath="myMenu1/myMenu2/myGroup"</samp>
-</ol>
-
-<h2>Programming Details</h2>
-<p>To use this extension point you will create a class that extends the
-<samp><A href="../../reference/api/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.html">SystemAbstractPopupMenuExtensionAction</A></samp> class in the
-package <samp><A href="../../reference/api/org/eclipse/rse/ui/actions/package-summary.html">org.eclipse.rse.ui.actions</A></samp>. This is your action class,
-and when the user selects your action, the <samp>run()</samp>
-method in your action class will be called. You will rarely extend the <samp>SystemAbstractPopupMenuExtensionAction</samp> base class
-directly, though. Instead there are subclasses of it that offer additional functionality for specific types of remote objects,
-as shown here:
-</p>
-
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Base Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/ui/actions/SystemAbstractPopupMenuExtensionAction.html">SystemAbstractPopupMenuExtensionAction</A></samp> in
-			<samp>org.eclipse.rse.ui</samp> plugin</TD>
-			<TD>Base class offering generic support for any remote object pop-up menu action, for any system type.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/files/ui/actions/SystemAbstractRemoteFilePopupMenuExtensionAction.html">SystemAbstractRemoteFilePopupMenuExtensionAction</A></samp>
-			in <samp>org.eclipse.rse.files.ui</samp> plugin</TD>
-			<TD>Specialized base class offering specific support for any remote file object pop-up menu action, for any system type.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-
-<br><hr>
-<p>See the <a href="../tutorial/popup.html">pop-up menu action tutorial</a> for a step-by-step example.</p>
-<p>See the <a href="../../../org.eclipse.platform.doc.isv/guide/workbench_basicext_popupMenus.htm">Eclipse Platform Programmer's Guide</a>
-   for more background information.</p>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage.html b/core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage.html
deleted file mode 100755
index ed2fbb9..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Plugging In Property Pages</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Plugging In Property Pages</h1>
-<p>The <samp><a href="../../../org.eclipse.platform.doc.isv/reference/extension-points/org_eclipse_ui_propertyPages.html">org.eclipse.ui.propertyPages</a></samp> extension point 
-from the base Eclipse Platform is used to contribute property pages.<BR/>
-What is a property page?
-It is a page that shows up in the Eclipse <A href="propertypage_figure2.gif">Properties dialog</A> that users
-get to by right-clicking on an object within any tree or table view, and selecting
-the <A href="propertypage_figure1.gif">Properties action</A>.</p>
-<p>Extenders supply one or more <samp>&lt;page&gt;</samp> elements within the beginning and ending <samp>&lt;extension&gt;</samp> element for this.
-The attributes of this <samp>&lt;page&gt;</samp> element are:</p>
-<ul>
-<li><b>id</b>. A unique ID for this extension point. Not actually used, but required by Eclipse.</li>
-<li><b>name</b>. A translated node-name to show in the left tree view in the Eclipse-supplied
-Properties dialog that comes up when the user selects "Properties..." from the pop-up menu.</li>
-<li><b>icon</b>. An optional icon to show in the Properties dialog for this property page.</li>
-<li><b>class</b>. The fully qualified name of the class that implements the Eclipse interface
-<samp>org.Eclipse.ui.IWorkbenchPropertyPage</samp>. This is usually done by extending the Eclipse class
-<samp>org.Eclipse.ui.dialog.PropertyPage</samp>. Your class will populate the detail page on the right of the
-Eclipse-supplied Properties dialog when the node-name is selected in the left hand tree view.</li>
-<li><b><i>objectClass</i></b>. Specify the class or interface of the model objects for which 
-this property page should be registered. Available interfaces are are identical to those in the
-<samp><A href="popup.html#objectClass">popupMenus</A></samp> extension point.</li>
-<li><b><i>filtering criteria</i></b>. To scope which objects these property pages should show up for,
-there are a series of filtering attributes. These attributes are identical to those in the <samp><A href="popup.html#filtering">popupMenus</A></samp>
-extension point.
-<!--
-Supported through the
-<samp><a href="../../reference/api/org/eclipse/rse/core/SystemRemoteObjectMatcher.html">SystemRemoteObjectMatcher</a></samp>
-class, providers supply as many as needed to uniquely identify their target objects. Every one of these
-values can be scalar or "simple generic", meaning it can start or end with an asterisk for pattern matching:
-<ul>
-<li><b>subsystemconfigurationid</b>. Restrict to remote objects originating from subsystems created by this subsystem factory.
-<li><b>typecategoryfilter</b>. Restrict to remote objects originating from subsystems created by a subsystem factory that specified this value for their category attribute
-<li><b>namefilter</b>. Restrict to remote objects matching this simple generic name
-<li><b>typefilter</b>. Restrict to remote objects matching this simple type filter. The "type" of any remote object is subsystem-determined.
-<li><b>subtypefilter</b>. Restrict to remote objects matching this simple sub-type filter. The "subtype" of any remote object is subsystem-determined.
-<li><b>subsubtypefilter</b>. Restrict to remote objects matching this simple sub-sub-type filter. The "sub-subtype" of any remote object is subsystem-determined.
-</ul>
--->
-</ul>
-
-<h2>Programming Details</h2>
-<p>To use this extension point your class will typically extend one of the supplied base classes to
-make it easier to create these property pages for remote objects. The only method you must implement in these
-classes is <samp>createContents(Composite)</samp>, which populates the details page on the right side when the node is
-selected on the left side. The supplied classes are listed here:
-</p>
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Base Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/ui/propertypages/SystemAbstractPropertyPageExtensionAction.html">SystemAbstractPropertyPageExtensionAction</A></samp>
-			in <samp>org.eclipse.rse.ui</samp> plugin.</TD>
-			<TD>Base class offering generic support for any remote object property page.</TD>
-		</TR>
-		<TR>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/files/ui/propertypages/SystemAbstractRemoteFilePropertyPageExtensionAction.html">SystemAbstractRemoteFilePropertyPageExtensionAction</A></samp>
-			in <samp>org.eclipse.rse.files.ui</samp> plugin.</TD>
-			<TD>Specialized base class offering specific support for any remote file object property page.</TD>
-		</TR>
-	</TBODY>
-</TABLE>
-<p>
-</p>
-
-<br><hr>
-<p>See the <a href="../tutorial/propertypage.html">property page tutorial</a> for a step-by-step example.</p>
-<p>See the <a href="../../../org.eclipse.platform.doc.isv/guide/preferences_prop_contribute.htm">Eclipse Platform Programmer's Guide</a>
-   for more background information.</p>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage_figure1.gif b/core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage_figure1.gif
deleted file mode 100755
index 14bda64..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage_figure1.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage_figure2.gif b/core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage_figure2.gif
deleted file mode 100755
index 7950bb9..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/propertypage_figure2.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/subsystem.html b/core/org.eclipse.ptp.doc.isv/guide/plugin/subsystem.html
deleted file mode 100755
index 3d7c1ac..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/subsystem.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Plugging In SubSystems</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Plugging In SubSystems</h1>
-<p>The <samp><A href="../../reference/extension-points/org_eclipse_rse_core_subsystemConfigurations.html">org.eclipse.rse.core.subsystemConfigurations</a></samp>
-extension point is defined in the plugin <samp>org.eclipse.rse.ui</samp>.
-This is the most complex extension point to use, but also the most powerful. It enables
-tool providers to register a class that creates subsystem objects, which appear under
-a connection when a connection is expanded in the Remote Systems view.
-For example, <A href="RSView_iSeries.gif">here is an iSeries connection</A> with four subsystems,
-each created by a subsystem configuration registered with this extension point.
-</p>
-<p>The <A href="../../reference/extension-points/org_eclipse_rse_ui_subsystemConfiguration.html">extension markup</A> is quite simple for this extension point,
-as it has only one element, <b><samp>&lt;configuration&gt;</samp></b>, with only a few simple attributes to supply:
-</p>
-<ul>
-<li><b>id</b>. Unique id for the extension, as required for all extensions. However, in this case it is used to create
-folders within the <samp>RemoteSystemsConnections</samp> project, where all Remote System Explorer data is stored.
-There is also a way to <A href="../../reference/api/org/eclipse/rse/core/model/ISystemRegistry.html#getSubSystemConfiguration(java.lang.String)">query</A> a subsystem configuration
-object via its ID.<li><b>vendor</b>. Your company name, shown in properties dialog for subsystems created by this subsystem configuration.
-<li><b>icon</b>. The icon displayed in the Remote Systems view for each subsystem created by this subsystem configuration.
-<li><b>iconlive</b>. The icon used when the subsystem is physically connected to its remote system.
-<li><b>name</b>. The name displayed in the Remote Systems view for each subsystem created by this subsystem configuration.
-<li><b>systemTypeIds</b>. A semi-colon separated list of system type IDs which this subsystem configuration supports. When a user creates a
-connection, this configuration will only be asked to create a subsystem for connections to systems of these types. Wildcards are 
-supported; in order to register against all system types, specify a single "*".
-<li><b>serviceType</b>. An optional semi-colon separated list of names and transports that can be used to match this service with remotelly advertised services through DNS-SD or any other supported service discovery protocol.
-The name would usually be the keyword used by the <A href="http://www.iana.org/assignments/port-numbers">IANA</A>  
-or by <A href="http://www.dns-sd.org/ServiceTypes.html">DNS SRV service types (RFC 2782)</A>.
-<li><b>category</b>. A name used to categorize this subsystem's functionality. Used by the <A href="popup.html">popupMenus</A>
-and <A href="propertypage.html">propertyPages</A> extension points to allow actions and property pages to be scoped to
-resources shown in subsystems of a particular category. Multiple subsystems can have the same category.
-<li><b>class</b>. A class implementing <A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.html">ISubSystemConfiguration</A>
-interface, as described in the following programming details section.
-</ul>
-
-
-<h2>Programming Details</h2>
-<p>It is important to remember what the purpose of a subsystem is, and how it fits in the overall RSE <A
-	href="../Model.html">model</A>, so as to understand the programming details for supporting
-subsystems via this subsystem configuration extension point. Minimally speaking, this extension point requires a class that implements the interface
-<samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.html"><B>ISubSystemFactory</B></A></samp>.
-Ultimately, the intent of a subsystem <I>configuration</I> is to provide individual
-subsystem <I>instances</I> to each connection, and the intent of a subsystem instance is to present remote resources for display or manipulation purposes. Thus, you must also create a class implementing the interface <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html"><B>ISubSystem</B></A></samp>.
-<BR>
-The intent of each subsystem is to show remote resources from the remote system
-identified by the parent connection, for the user. (Subsystems can in fact be hidden, which means their their role is to return remote resources for programmatic purposes only.)   When the first request is made for remote objects, the subsystem is asked to connect to the remote system if it is not already.
-This job is deferred to a <A href="../../reference/api/org/eclipse/rse/core/subsystems/IConnectorService.html">IConnectorService</A> object whose role it is to manage connecting and disconnecting
-to the remote physical system. By use of a <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">connector service manager</a>,
-one system can manage the live connections of multiple subsystems in the same system connection, should they happen to share the same communication pipe.
-If filters are <A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystemConfiguration.html#supportsFilters()">supported</A>
-(the default), the first connection is made, and the remote resources are subsequently shown, when filters within the subsystem
-are expanded, which results in a call to
-<samp><A href="../../reference/api/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.html#internalResolveFilterString(org.eclipse.core.runtime.IProgressMonitor, java.lang.String)">resolveFilterString</A></samp>
-in the subsystem object. <BR>
-Furthermore, you will want to supply your own
-<B><A
-	href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html">new-filter</A></B> and
-<A href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html"><B>change-filter</B></A> actions.
-If filters are not supported, then these remote resources are shown immediately when the subsystem itself is expanded, via a call to
-<samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/ISubSystem.html#getChildren()">getChildren</A></samp>.
-Either way the resulting resources are displayed to the user. To facilitate the displaying of these objects in the RSE views, the objects
-themselves must implement the Eclipse IAdaptable interface (to enable the property sheet viewer) and there must be a specific RSE
-<B><A
-	href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html">view
-adapter</A></B>
-and an RSE <B><A
-	href="../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">remote-information
-adapter</A></B>
-registered for the remote objects, which the RSE views consult to get the labels, images, actions,
-and property sheet values for the remote objects.
-Typically, you will supply actions by leveraging the <A
-	href="../api/uiAPI.html">user interface elements</A> supplied by the RSE, such as base classes for <A
-	href="../api/messages/uiMessageAPI.html">messages</A>, <A
-	href="../api/actions/uiActionsAPI.html">actions</A>, <A
-	href="../api/dialogs/uiDialogsAPI.html">dialogs</A>, <A
-	href="../api/wizards/uiWizardsAPI.html">wizards</A>, <A
-	href="../api/properties/uiPropertiesAPI.html">property pages</A> and <A
-	href="../api/preferences/uiPreferencesAPI.html">preference page editors</A>. You will probably also supply a
-	property page for your subsystem objects, via the Eclipse <samp>propertyPages</samp> extension point, and for your remote resource objects, via the RSE <A
-	href="propertypage.html">propertyPages</A> extension point.</p>
-
-<h3>Base Classes</h3>
-<P>For many of the interfaces you must implement, there are base classes supplied that you can extend to make the development effort easier.</P>
-<p>The
-following summarizes the minimum set of classes you will be creating in order to realize your own subsystem support, including the RSE-supplied base classes to extend:</p>
-
-<TABLE border="1">
-	<TBODY>
-		<TR>
-			<TH>Class(es)</TH>
-			<TH>Base Class</TH>
-			<TH>Description</TH>
-		</TR>
-		<TR>
-			<TD>subsystem configuration</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystemConfiguration.html">SubSystemConfiguration</A></samp></TD>
-			<TD>The factory class responsible for creating instances of subsystem class</TD>
-		</TR>
-		<TR>
-			<TD>subsystem</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html">SubSystem</A></samp></TD>
-			<TD>The subsystem class. There will be one instance created for each connection. In addition to storing
-			your unique attributes, this must return the remote resource objects when a filter is expanded within the
-			subsystem. How that communication with the remote system is done is left up to you.</TD>
-		</TR>
-		<TR>
-			<TD>system</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorService.html">AbstractConnectorService</A></samp></TD>
-			<TD>Represents and manages a live connection to the remote system, doing the connecting and disconnecting.</TD>
-		</TR>
-		<TR>
-			<TD>system manager</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">AbstractConnectorServiceManager</A></samp></TD>
-			<TD>Manages a single system instance that is shared among multiple subsystems in a single connection. Even if you only have a single subsystem configuration it is useful to use this in
-			case you later add additional factories, and their subsystems share the same communication pipe. To enable this, all your subsystem classes need to implement a unique interface of your own creation.</TD>
-		</TR>
-		<TR>
-			<TD>remote resource</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractResource.html">AbstractResource</A></samp></TD>
-			<TD>Can be used as a base class for the objects representing remote resources.</TD>
-		</TR>
-		<TR>
-			<TD>new-filter wizard</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html">SystemNewFilterAction</A></samp> and
-			<samp><A href="../../reference/api/org/eclipse/rse/ui/filters/SystemFilterStringEditPane.html">SystemFilterStringEditPane</A></samp></TD>
-			<TD>Displays a wizard prompting for a new filter. Filters contain filter strings, which are up to each subsystem to design and interpret. The New Filter wizard
-			prompts for a single filter string (more can be added in change mode). Typically you subclass <samp>SystemFilterStringEditPane</samp> to create your own
-			prompt for the filter string information, and then subclass <samp>SystemNewFilterAction</samp> so as to configure the default New Filter wizard to use
-			your edit pane in the first page.</TD>
-		</TR>
-		<TR>
-			<TD>change-filter dialog</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html">SystemChangeFilterAction</A></samp> and
-			<samp><A href="../../reference/api/org/eclipse/rse/ui/filters/SystemFilterStringEditPane.html">SystemFilterStringEditPane</A></samp></TD>
-			<TD>Displays a dialog prompting to change an existing filter. The default dialog allows the user to create and edit filter strings. Typically, you
-			override the <samp>SystemChangeFilterAction</samp> class, and configure the dialog to use the same edit pane used in the New Filter wizard.
-            </TD>
-		</TR>
-		<TR>
-			<TD>remote element adapter</TD>
-			<TD><samp><A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html">AbstractSystemViewAdapter</A></samp> and
-			    <samp><A href="../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">ISystemRemoteElementAdapter</A></samp>
-			</TD>
-			<TD>The view adapter is an amalgamation of all the required information needed to populate the RSE views. You will define one class per unique remote object interface or class, and in it you will override methods to return the remote object's label, image, popup-menu actions, property sheet properties and children (if expandable). You can also decide whether to enable common RSE popup menu actions like rename, delete and refresh. <BR>Your view adapter will usually also implement the remote adapter interface, enabling the many common RSE capabilities to work, such as the copy, paste, drag and drop, and more. </TD>
-		</TR>
-	</TBODY>
-</TABLE>
-
-<h3><A name="steps"></A>Overview of Steps</h3>
-<p>Implementing a subsystem involves the following steps, in the following order:</p>
-<OL>
-  <li>Creating an interface for your subsystem. It can, and often is, an empty interface.</li>
-  <li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorService.html">AbstractConnectorService</A>.
-      The code here will interact as necessary with your subsystem to manage the connection lifecycle to the remote system.</li>
-  <li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">AbstractConnectorServiceManager</A>.
-      The code here will re-use the same IConnectorService object from step 2 for all subsystems that implement the interface from step 1, within the same connection.</li>
-  <li>Designing the classes to represent the remote resources (your <i>model</i>) that you will show from your subsystem.
-      Each must implement the <samp>org.eclipse.core.runtime.IAdaptable</samp> interface from Eclipse.
-      It is also very helpful if they also maintain a reference to the subsystem which created them. The base class
-      <A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractResource.html">AbstractResource</A> is offered to help with this.</li>
-  <li>Designing the syntax of the <i>filter string</i> that will be used as a pattern to tell your subsystem what resources to show. For example, for files this might be of the
-         form "path/generic-name /options". It is the job of your subsystem to interpret these strings and return a list of remote resources matching the
-         criteria capturing in the string. You will eventually design a user interface to prompt the user for one the
-         contents of one of these filter strings. You might find it helps to create a class that holds one of these filter strings passed via a constructor, and
-         can parse it into its constituent pieces via getter methods. It should also support a default constructor and setting of constituent pieces via setter methods,
-         and the generation of the filter string via toString().
-   </li>
-  <li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html">SubSystem</A>
-      that implements the interface you designed in step 1. This will:
-      <ul>
-       <li>return a singleton instance of the system manager from step 3 in its <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html#getSystemManager()">getSystemManager</A> method,
-       <li>manage persistent properties via calls to the inherited <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html#setVendorAttribute(java.lang.String, java.lang.String, java.lang.String)">setVendorAttribute</A>
-       and <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html#getVendorAttribute(java.lang.String, java.lang.String)">getVendorAttribute</A> methods,
-       <li>use your communications layer to return instances of your model objects in its <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html#internalResolveFilterString(org.eclipse.core.runtime.IProgressMonitor, java.lang.String)">internalResolveFilterString</A> method.
-       The input to this is one or more strings such as you designed in step 5. It will return all remote resources matching the criteria captured in the input filter string.
-       You may also find the <A href="../../reference/api/org/eclipse/rse/services/clientserver/NamePatternMatcher.html">org.eclipse.rse.services.clientserver.NamePatternMatcher</a>
-       class to be handy in comparing a generic pattern to a particular input. This class is in the <samp>runtime/clientserver.jar</samp> file,
-       and has no eclipse-dependencies, so it can be used in your client subsystem code, or your server-side code.
-      </ul>
-   </li>
-  <li>Creating a subclass of <A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystemConfiguration.html">DefaultSubSystemFactoryImpl.</A></li>
-  <li>Defining your <A href="../../reference/extension-points/org_eclipse_rse_core_subsystemConfigurations.html">subsystemConfigurations extension</a> in your <samp>plugin.xml</samp> file.</li>
-  <li>For each remote resource class you created in step 4, you need to create an adapter class, which extends
-      <A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html">AbstractSystemViewAdapter</A> and which
-      implements <A href="../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html">ISystemRemoteElementAdapter</A>.
-  </li>
-  <li>Register your adapters with the platform. First you create an
-      adapter class that extends <samp><a href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemRemoteAdapterFactory.html">AbstractSystemRemoteAdapterFactory</a></samp>
-      and implements interface <samp><b>org.eclipse.core.runtime.IAdapterFactory</b></samp>. Next,
-      in the <samp>startup()</samp> method of your plugin class, add code to instantiate the class and register the object with
-      the platform adapter manager, once for each class in your resource model. For example:
-      <br><samp>
-		MyAdapterFactory factory = new MyAdapterFactory(); // extends AbstractSystemRemoteAdapterFactory<br>
-		IAdapterManager manager = Platform.getAdapterManager();<br>
-		manager.registerAdapters(factory, MyModelObject1.class);<br>
-		manager.registerAdapters(factory, MyModelObject2.class);<br>
-      </samp>
-  </li>
-  <li>If your filter string from step 5 is complicated enough, you will probably find the
-  RSE-supplied <a href="NewFilterWizard_Default.gif">filter wizard</a> and
-  <a href="ChangeFilterDialog_Default.gif">change-dialog</a> insufficient. The idea with these is that the
-  New Filter wizard prompts in its first page for a single filter string. The change dialog
-  allows the user to change that single filter string, or add additional filter strings. To
-  change these for your subsystem, you need to:
-    <ol>
-      <li type="i">Create your own
-            <a href="../../reference/api/org/eclipse/rse/ui/filters/SystemFilterStringEditPane.html">filter string edit pane</a>
-            subclass that contains your own GUI prompts as desired.
-      <li type="i">Create your own
-            <a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html">new-filter wizard action</a>
-            subclass, and configure it to use your own edit pane subclass by overriding
-            <samp><a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html#configureNewFilterWizard(org.eclipse.rse.ui.filters.dialogs.SystemNewFilterWizard)">configureNewFilterWizard</a></samp>
-            and in it calling <samp><a href="../../reference/api/org/eclipse/rse/ui/filters/dialogs/SystemNewFilterWizard.html#setFilterStringEditPane(org.eclipse.rse.ui.filters.SystemFilterStringEditPane)">setFilterStringEditPane</a></samp>
-            on the given wizard.
-      <li type="i">Create your own
-            <a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html">change-filter action</a>
-            subclass, and configure it to use your own edit pane subclass by overriding
-            <samp><a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html#configureFilterDialog(org.eclipse.rse.ui.filters.dialogs.SystemChangeFilterDialog)">configureFilterDialog</a></samp>
-            and in it calling <samp><a href="../../reference/api/org/eclipse/rse/ui/filters/dialogs/SystemChangeFilterDialog.html#setFilterStringEditPane(org.eclipse.rse.ui.filters.SystemFilterStringEditPane)">setFilterStringEditPane</a></samp>
-            on the given dialog.
-      <li type="i">Override the <samp><a href="../../reference/api/org/eclipse/rse/ui/subsystems/ISubSystemConfigurationAdapter.html#getNewFilterPoolFilterAction(org.eclipse.rse.core.filters.ISystemFilterPool, org.eclipse.swt.widgets.Shell)">getNewFilterPoolFilterAction(SystemFilterPool, Shell)</a></samp>
-            method in your subsystem factory, to return an instance of your new-filter action.
-            You can actually avoid creating an action subclass if you choose, by calling the configuration methods
-            in the RSE-supplied <a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemNewFilterAction.html">new-filter action class</a>.
-      <li type="i">Override the <samp><a href="../../reference/api/org/eclipse/rse/ui/subsystems/ISubSystemConfigurationAdapter.html#getChangeFilterAction(org.eclipse.rse.core.filters.ISystemFilter, org.eclipse.swt.widgets.Shell)">getChangeFilterAction(SystemFilter, Shell)</a></samp>
-            method in your subsystem factory, to return an instance of your change-filter action.
-            You can actually avoid creating an action subclass if you choose, by calling the configuration methods
-            in the RSE-supplied <a href="../../reference/api/org/eclipse/rse/ui/filters/actions/SystemChangeFilterAction.html">change-filter action class</a>.
-    </ol>
-  </li>
-</OL>
-
-<br><hr>
-<p>See the <a href="../tutorial/subsystem.html">subsystem tutorial</a> for a step-by-step example.</p>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/systemtype.html b/core/org.eclipse.ptp.doc.isv/guide/plugin/systemtype.html
deleted file mode 100755
index bbb4b65..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/systemtype.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Plugging In System Types</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Plugging In System Types</h1>
-<p>The <samp><A href="../../reference/extension-points/org_eclipse_rse_core_systemTypes.html">org.eclipse.rse.core.systemTypes</a></samp> 
-and <samp><A href="../../reference/extension-points/org_eclipse_rse_core_systemTypeProviders.html">org.eclipse.rse.core.systemTypeProviders</a></samp>
-extension points are defined in the
-plugin <samp>org.eclipse.rse.core</samp>. It enables new system types to be
-defined in the Remote System Explorer's <A href="NewConnection.gif">New
-Connection wizard</A>, such that users can define connections to systems of that type. For example,
-you might define a new system type of "Solaris" or "RedHat" or some other specific type
-of operating system. The reason to define a system type is to enable tools to be created,
-via the <A href="subsystem.html">subsystem extension point</A>, that are scoped so as to
-only appear for connections to systems of that type.
-</p>
-<p>
-Defining a new system type is easy. You merely need to supply the name of the system
-type, and two icons - one icon for connections to that systems of that type, and another
-adorned icon that is used when there is a live connection to that particular system.
-</p>
-<p>
-When you create a new connection, the Remote System Explorer framework will consult
-each registered <A href="subsystem.html">subsystem extension point</A> to see if it supports
-that connection's system type, and if so the extension point's subsystem factory class
-will be used to create a new subsystem within the new connection. Thus, when the user
-expands a connection in the Remote Systems view, only subsystems supported for that
-connection's system type are available.
-</p>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/view_Cmds.gif b/core/org.eclipse.ptp.doc.isv/guide/plugin/view_Cmds.gif
deleted file mode 100755
index 3778621..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/view_Cmds.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/view_RS.gif b/core/org.eclipse.ptp.doc.isv/guide/plugin/view_RS.gif
deleted file mode 100755
index 8ee06ea..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/view_RS.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/view_Table.gif b/core/org.eclipse.ptp.doc.isv/guide/plugin/view_Table.gif
deleted file mode 100755
index 0cb0867..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/view_Table.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/plugin/view_Team.gif b/core/org.eclipse.ptp.doc.isv/guide/plugin/view_Team.gif
deleted file mode 100755
index 80bd2c7..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/plugin/view_Team.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/preference_activeProfiles.gif b/core/org.eclipse.ptp.doc.isv/guide/preference_activeProfiles.gif
deleted file mode 100755
index b241fe9..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/preference_activeProfiles.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/preferences.gif b/core/org.eclipse.ptp.doc.isv/guide/preferences.gif
deleted file mode 100755
index e31a110..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/preferences.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse.gif b/core/org.eclipse.ptp.doc.isv/guide/rse.gif
deleted file mode 100755
index cfdc37d..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse_int_connectorservices.html b/core/org.eclipse.ptp.doc.isv/guide/rse_int_connectorservices.html
deleted file mode 100755
index 0e908d1..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse_int_connectorservices.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

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

-<meta http-equiv="Content-Style-Type" content="text/css">

-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">

-<title>RSE Connector Services</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-<body>

-<h1>RSE Connector Services</h1>

-</body>

-</html>

-

diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse_int_files.html b/core/org.eclipse.ptp.doc.isv/guide/rse_int_files.html
deleted file mode 100755
index d9e1654..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse_int_files.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-

-<head>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

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

-<meta http-equiv="Content-Style-Type" content="text/css">

-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">

-<title>RSE UI</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-

-<body>

-<h1>RSE Files</h1>

-</body>

-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse_int_filters.html b/core/org.eclipse.ptp.doc.isv/guide/rse_int_filters.html
deleted file mode 100755
index 4e6cb90..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse_int_filters.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Filters</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-<body>
-<h1>RSE Filters</h1>
-</body>
-</html>
-
diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse_int_hosts.html b/core/org.eclipse.ptp.doc.isv/guide/rse_int_hosts.html
deleted file mode 100755
index 309efcb..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse_int_hosts.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

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

-<meta http-equiv="Content-Style-Type" content="text/css">

-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">

-<title>RSE Hosts</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-<body>

-<h1>RSE Hosts</h1>

-</body>

-</html>

-

diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse_int_overview.html b/core/org.eclipse.ptp.doc.isv/guide/rse_int_overview.html
deleted file mode 100755
index fbe1f34..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse_int_overview.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<title>RSE Overview</title>
-<link rel="stylesheet" type="text/css" href="../book.css">
-</head>
-<body>
-<h1>RSE Overview</h1>
-<p>
-The perspective for managing connections is the <A href="rse.gif"><B>Remote
-System Explorer</B></A> (<b>RSE</b>), and the primary tree-view within it is the 
-<A href="view_RS.gif"><B>Remote Systems</B></A> view. We assume you are already familiar with the RSE perspective,
-or will familiarize yourself with it, and you are now interested in learning how to extend it. We also assume that you 
-already understand the concepts of plug-ins, extension points, and the workbench UI. You do not need 
-to be familiar with workspace resources, as the RSE does not use these to realize the artifacts it 
-shows to the user.
-</p>
-<p>A user can extend the Remote System Explorer by adding their own
-<A href="Artifacts.html#filters">filters</A>.
-<!-- 
-<A href="Artifacts.html#useractions">user actions</A>, and 
-<A href="Artifacts.html#compilecmds">compile commands</A>.
--->
-They may also customize the RSE by setting
-<A href="Artifacts.html#preferences">preferences</A>.</p>
-<p>
-As a programmer, you can extend the Remote System Explorer by using 
-<A href="../reference/extension-points/index.html">RSE-unique extension points</A> to 
-add actions to the pop-up menus for remote objects, create your own 
-system types or subsystems that appear when a connection is expanded,
-or even contribute new persistence schemes for storing RSE data. The full Eclipse application 
-programming interface (API) set is
-at your disposal for these, as well as the API set supplied by the Remote System Explorer. Furthermore,
-you can use 
-<a href="../guide/plugin/other.html">Eclipse Platform extension points</a>
-to add property pages, author menu items, tool bar actions, 
-pop-up menu actions, and more for objects in the Remote System Explorer. 
-</p>
-<p>
-This guide explains all underlying 
-artifacts and model of the Remote System Explorer, the RSE extension points, and highlights the 
-important APIs available for your use.
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse_int_processes.html b/core/org.eclipse.ptp.doc.isv/guide/rse_int_processes.html
deleted file mode 100755
index d73ae1d..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse_int_processes.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-

-<head>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

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

-<meta http-equiv="Content-Style-Type" content="text/css">

-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">

-<title>RSE UI</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-

-<body>

-<h1>RSE Processes</h1>

-</body>

-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse_int_services.html b/core/org.eclipse.ptp.doc.isv/guide/rse_int_services.html
deleted file mode 100755
index 451a105..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse_int_services.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

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

-<meta http-equiv="Content-Style-Type" content="text/css">

-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">

-<title>RSE Services</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-<body>

-<h1>RSE Services</h1>

-</body>

-</html>

-

diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse_int_shells.html b/core/org.eclipse.ptp.doc.isv/guide/rse_int_shells.html
deleted file mode 100755
index 774da36..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse_int_shells.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-

-<head>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

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

-<meta http-equiv="Content-Style-Type" content="text/css">

-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">

-<title>RSE UI</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-

-<body>

-<h1>RSE Shells</h1>

-</body>

-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse_int_subsystems.html b/core/org.eclipse.ptp.doc.isv/guide/rse_int_subsystems.html
deleted file mode 100755
index f4799a5..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse_int_subsystems.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

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

-<meta http-equiv="Content-Style-Type" content="text/css">

-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">

-<title>RSE Subsystems</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-<body>

-<h1>RSE Subsystems</h1>

-</body>

-</html>

-

diff --git a/core/org.eclipse.ptp.doc.isv/guide/rse_int_ui.html b/core/org.eclipse.ptp.doc.isv/guide/rse_int_ui.html
deleted file mode 100755
index 33bba22..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/rse_int_ui.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-

-<head>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

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

-<meta http-equiv="Content-Style-Type" content="text/css">

-<link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">

-<title>RSE UI</title>

-<link rel="stylesheet" type="text/css" href="../book.css">

-</head>

-

-<body>

-<h1>RSE UI</h1>

-</body>

-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperAdapterFactory.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperAdapterFactory.html
deleted file mode 100755
index ea0623e..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperAdapterFactory.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>DeveloperAdapterFactory Class After Editing</title>

-</head>

-

-<body>

-<h1>DeveloperAdapterFactory Class After Editing</h1>

-<pre><samp>

-package samples.model;

-

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

-import org.eclipse.rse.ui.view.AbstractSystemRemoteAdapterFactory;

-import org.eclipse.rse.ui.view.ISystemViewElementAdapter;

-import org.eclipse.ui.views.properties.IPropertySource;

-

-/**

- * This factory maps requests for an adapter object from a given remote object.

- */

-public class DeveloperAdapterFactory 

-	extends AbstractSystemRemoteAdapterFactory

-	implements IAdapterFactory

-{

-	<b>private TeamResourceAdapter teamAdapter = new TeamResourceAdapter();

-	private DeveloperResourceAdapter developerAdapter = new DeveloperResourceAdapter();</b>

-	

-	/**

-	 * Constructor for DeveloperAdapterFactory.

-	 */

-	public DeveloperAdapterFactory()

-	{

-		super();

-	}

-

-	/**

-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(Object, Class)

-	 */

-	public Object getAdapter(Object adaptableObject, Class adapterType)

-	{

-		<b>ISystemViewElementAdapter adapter = null;

-		if (adaptableObject instanceof TeamResource)

-		  adapter = teamAdapter;

-		else if (adaptableObject instanceof DeveloperResource)

-		  adapter = developerAdapter;

-		// <i>these lines are very important! </i>

-		if ((adapter != null) &amp;&amp; (adapterType == IPropertySource.class))

-		  adapter.setPropertySourceInput(adaptableObject);

-		return adapter;</b>

-	}

-}

-</samp></pre>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperConnectorService.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperConnectorService.html
deleted file mode 100755
index 5a2d8c8..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperConnectorService.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperConnectorService Class After Editing</title>
-</head>
-
-<body>
-<h1>DeveloperConnectorService Class After Editing</h1>
-<pre><samp>
-package samples.subsystems;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.subsystems.AbstractConnectorService;
-import org.eclipse.rse.core.model.IHost;
-
-import samples.RSESamplesPlugin;
-
-/**
- * Our system class that manages connecting to, and disconnecting from,
- * our remote server-side code.
- */
-public class DeveloperConnectorService extends AbstractConnectorService {
-
-	<strong>private boolean connected = false;</strong>
-
-	/**
-	 * Constructor for DeveloperConnectorService.
-	 * @param host
-	 */
-	public DeveloperConnectorService(IHost host)
-	{
-		super(
-			RSESamplesPlugin.getResourceString("connectorservice.devr.name"),
-			RSESamplesPlugin.getResourceString("connectorservice.devr.desc"),
-			host,
-			0
-		);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#isConnected()
-	 */
-	public boolean isConnected()
-	{
-		return connected;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#internalConnect(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected void internalConnect(IProgressMonitor monitor) throws Exception
-	{
-		super.internalConnect(monitor);
-		// pretend. Normally, we'd connect to our remote server-side code here
-		connected=true;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorService#internalDisconnect(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void internalDisconnect(IProgressMonitor monitor) throws Exception
-	{
-		super.internalDisconnect(monitor);
-		// pretend. Normally, we'd disconnect from our remote server-side code here
-		connected=false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#supportsRemoteServerLaunching()
-	 */
-	public boolean supportsRemoteServerLaunching()
-	{
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#hasRemoteServerLauncherProperties()
-	 */
-	public boolean hasRemoteServerLauncherProperties()
-	{
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.IConnectorService#supportsServerLaunchProperties()
-	 */
-	public boolean supportsServerLaunchProperties()
-	{
-		return false;
-	}
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperConnectorServiceManager.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperConnectorServiceManager.html
deleted file mode 100755
index 476613d..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperConnectorServiceManager.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperConnectorServiceManager Class After Editing</title>
-</head>
-
-<body>
-<h1>DeveloperConnectorServiceManager Class After Editing</h1>
-<pre><samp>
-/********************************************************************************
- * Copyright (c) 2006 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
- * 
- * Initial Contributors:
- * The following IBM employees contributed to the Remote System Explorer
- * component that contains this file: David McKnight, Kushal Munir, 
- * Michael Berger, David Dykstal, Phil Coulthard, Don Yantzi, Eric Simpson, 
- * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
- * 
- * Contributors:
- * Martin Oberhuber (Wind River) - Adapted original tutorial code to Open RSE.
- ********************************************************************************/
-
-package samples.subsystems;
-
-import org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.model.IHost;
-
-/**
- * This class manages our DeveloperConnectorService objects, so that if we 
- * ever have multiple subsystem configurations, different subsystems can share 
- * the same IConnectorService object if they share the communication layer.
- */
-public class DeveloperConnectorServiceManager extends
-		AbstractConnectorServiceManager {
-
-	<strong>private static DeveloperConnectorServiceManager inst;</strong>
-
-	/**
-	 * Constructor for DeveloperConnectorServiceManager.
-	 */
-	public DeveloperConnectorServiceManager()
-	{
-		super();
-	}
-
-	<strong>/**
-	 * Return singleton instance
-	 */
-	public static DeveloperConnectorServiceManager getInstance()
-	{
-		if (inst == null)
-		  inst = new DeveloperConnectorServiceManager();
-		return inst;
-	}</strong>
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#createConnectorService(org.eclipse.rse.core.model.IHost)
-	 */
-	public IConnectorService createConnectorService(IHost host)
-	{
-		<strong>return new DeveloperConnectorService(host);</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#sharesSystem(org.eclipse.rse.core.subsystems.ISubSystem)
-	 */
-	public boolean sharesSystem(ISubSystem otherSubSystem)
-	{
-		<strong>return (otherSubSystem instanceof IDeveloperSubSystem);</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.AbstractConnectorServiceManager#getSubSystemCommonInterface(org.eclipse.rse.core.subsystems.ISubSystem)
-	 */
-	public Class getSubSystemCommonInterface(ISubSystem subsystem)
-	{
-		<strong>return IDeveloperSubSystem.class;</strong>
-	}
-
-}
-</samp></pre>
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterDialog.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterDialog.gif
deleted file mode 100755
index a281793..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterDialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterStringEditPane.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterStringEditPane.html
deleted file mode 100755
index 38095d1..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterStringEditPane.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>DeveloperFilterStringEditPane Class After Editing</title>

-</head>

-

-<body>

-<h1>DeveloperFilterStringEditPane Class After Editing</h1>

-<pre><samp>

-package samples.subsystems;

-

-<strong>import org.eclipse.rse.services.clientserver.messages.SystemMessage;

-import org.eclipse.rse.ui.SystemWidgetHelpers;</strong>

-import org.eclipse.rse.ui.filters.SystemFilterStringEditPane;

-<strong>import org.eclipse.swt.events.ModifyEvent;

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

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

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

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

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

-import org.eclipse.swt.widgets.Text;</strong>

-

-<strong>import samples.RSESamplesPlugin;</strong>

-

-/**

- * Our specialized filter string edit pane for developer filters.

- */

-public class DeveloperFilterStringEditPane extends SystemFilterStringEditPane {

-

-	// gui widgets

-	<strong>private Text textTeam, textDevr;</strong>

-

-	/**

-	 * Constructor for DeveloperFilterStringEditPane.

-	 * @param shell - parent window

-	 */

-	public DeveloperFilterStringEditPane(Shell shell)

-	{

-		super(shell);

-	}

-

-	/**

-	 * Override of parent method.

-	 * This is where we populate the client area.

-	 * @param parent - the composite that will be the parent of the returned client area composite

-	 * @return Control - a client-area composite populated with widgets.

-	 * 

-	 * @see org.eclipse.rse.ui.SystemWidgetHelpers

-	 */

-	<strong>public Control createContents(Composite parent) 

-	{		

-		// Inner composite

-		int nbrColumns = 1;

-		Composite composite_prompts = SystemWidgetHelpers.createComposite(parent, nbrColumns);	

-		((GridLayout)composite_prompts.getLayout()).marginWidth = 0;

-		

-		// CREATE TEAM-PARENT PROMPT

-		textTeam = SystemWidgetHelpers.createLabeledTextField(

-			composite_prompts,

-			null,

-			RSESamplesPlugin.getResourceString("filter.devr.teamprompt.label"), //$NON-NLS-1$

-			RSESamplesPlugin.getResourceString("filter.devr.teamprompt.tooltip") //$NON-NLS-1$

-		); 

-

-		// CREATE DEVELOPER PROMPT

-		textDevr = SystemWidgetHelpers.createLabeledTextField(

-			composite_prompts,

-			null,

-			RSESamplesPlugin.getResourceString("filter.devr.devrprompt.label"), //$NON-NLS-1$

-			RSESamplesPlugin.getResourceString("filter.devr.devrprompt.tooltip") //$NON-NLS-1$

-		); 

-		

-		resetFields();

-		doInitializeFields();

-		  		  

-		// add keystroke listeners...

-		textTeam.addModifyListener(

-			new ModifyListener() 

-			{

-				public void modifyText(ModifyEvent e) 

-				{

-					validateStringInput();

-				}

-			}

-		);		

-		textDevr.addModifyListener(

-			new ModifyListener() 

-			{

-				public void modifyText(ModifyEvent e) 

-				{

-					validateStringInput();

-				}

-			}

-		);		

-		return composite_prompts;

-	}</strong>

-

-	/**

-	 * Override of parent method.

-	 * Return the control to recieve initial focus. 

-	 */

-	<strong>public Control getInitialFocusControl()

-	{

-		return textTeam;

-	}</strong>	

-

-	/**

-	 * Override of parent method.

-	 * Initialize the input fields based on the inputFilterString, and perhaps refProvider.

-	 * This can be called before createContents, so test for null widgets first!

-	 * Prior to this being called, resetFields is called to set the initial default state prior to input

-	 */		

-	<strong>protected void doInitializeFields()

-	{

-		if (textTeam == null)

-		  return; // do nothing

-		if (inputFilterString != null)

-		{

-			int idx = inputFilterString.indexOf('/');

-			if (idx &lt; 0)

-		      textTeam.setText(inputFilterString);

-		    else

-		    {

-		    	textTeam.setText(inputFilterString.substring(0,idx));

-		    	textDevr.setText(inputFilterString.substring(idx+1));

-		    }

-		}

-	}</strong>	

-

-	/**

-	 * Override of parent method.

-	 * This is called in the change filter dialog when the user selects "new", or selects another string.

-	 */

-	<strong>protected void resetFields()

-	{

-	    textTeam.setText(""); //$NON-NLS-1$		

-	    textDevr.setText("*"); //$NON-NLS-1$

-	}</strong>

-

-	/**

-	 * Override of parent method.

-	 * Called by parent to decide if information is complete enough to enable finish. 

-	 */

-	<strong>protected boolean areFieldsComplete()

-	{

-		if ((textTeam == null) || (textDevr == null))

-		  return false;

-		else

-		  return (textTeam.getText().trim().length()>0) && (textDevr.getText().trim().length()>0);

-	}</strong>

-	

-	/**

-	 * Override of parent method.

-	 * Get the filter string in its current form. 

-	 * Functional opposite of doInitializeFields, which tears apart the input string in update mode,

-	 *  to populate the GUIs. This method creates the filter string from the information in the GUI.

-	 */

-	<strong>public String getFilterString()

-	{

-		if ((textTeam == null) || (textDevr == null))

-		  return inputFilterString; // return what we were given.

-		else

-		{

-			String teamName = textTeam.getText().trim();

-			String devrName = textDevr.getText().trim();

-			return teamName + "/" + devrName; //$NON-NLS-1$

-		}

-	}</strong>	

-

-	/**

-	 * Override of parent method.

-	 * Does complete verification of input fields. If this 

-	 * method returns null, there are no errors and the dialog or wizard can close.

-	 *

-	 * @return error message if there is one, else null if ok

-	 */

-	<strong>public SystemMessage verify() 

-	{

-		errorMessage = null;

-		Control controlInError = null;

-		

-		/*

-		errorMessage = validateTeamInput(); // todo: implement if we want to syntax check input

-		if (errorMessage != null)

-		  controlInError = textTeam;

-		else

-		{

-		   errorMessage = validateDevrInput(); // todo: implement to syntax check input

-		   if (errorMessage != null)

-		     controlInError = textDevr;

-		}

-		*/

-		

-		if (errorMessage != null)

-		{

-			if (controlInError != null)

-		      controlInError.setFocus();

-		}

-		return errorMessage;		

-	}</strong>	

-

-}

-</samp></pre>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterWizard.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterWizard.gif
deleted file mode 100755
index 9a0b9ae..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperFilterWizard.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperResource.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperResource.html
deleted file mode 100755
index 4da58a0..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperResource.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>DeveloperResource Class After Editing</title>

-</head>

-

-<body bgcolor="#ffffff">

-<h1>DeveloperResource Class After Editing</h1>

-<p>

-<pre><samp>

-package samples.model;

-

-import org.eclipse.rse.core.subsystems.AbstractResource;

-import org.eclipse.rse.core.subsystems.ISubSystem;

-

-/**

- * This models a remote resource representing a developer defined on a particular system.

- */

-public class DeveloperResource extends AbstractResource {

-

-	<strong>private String name;</strong>

-	<strong>private String id;</strong>

-	<strong>private String deptNbr;</strong>	

-

-	/**

-	 * Default constructor for DeveloperResource.

-	 */

-	public DeveloperResource()

-	{

-		super();

-	}

-	

-	/**

-	 * Constructor for DeveloperResource when given parent subsystem.

-	 */

-	public DeveloperResource(ISubSystem parentSubSystem)

-	{

-		super(parentSubSystem);

-	}

-

-	/**

-	 * Returns the name.

-	 * @return String

-	 */

-	public String getName()

-	{

-		return name;

-	}

-

-	/**

-	 * Sets the name.

-	 * @param name The name to set

-	 */

-	public void setName(String name)

-	{

-		this.name = name;

-	}

-	

-	/**

-	 * Returns the id.

-	 * @return String

-	 */

-	public String getId()

-	{

-		return id;

-	}

-

-	/**

-	 * Sets the id.

-	 * @param id The id to set

-	 */

-	public void setId(String id)

-	{

-		this.id = id;

-	}

-

-	/**

-	 * Returns the deptNbr.

-	 * @return String

-	 */

-	public String getDeptNbr()

-	{

-		return deptNbr;

-	}

-

-	/**

-	 * Sets the deptNbr.

-	 * @param deptNbr The deptNbr to set

-	 */

-	public void setDeptNbr(String deptNbr)

-	{

-		this.deptNbr = deptNbr;

-	}

-

-}

-</samp></pre>

-</p>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperResourceAdapter.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperResourceAdapter.html
deleted file mode 100755
index f7cdae8..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperResourceAdapter.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>DeveloperResourceAdapter Class After Editing</title>

-</head>

-

-<body>

-<h1>DeveloperResourceAdapter Class After Editing</h1>

-<pre><samp>

-package samples.model;

-

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

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

-import org.eclipse.rse.ui.SystemMenuManager;

-import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;

-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;

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

-<strong>import org.eclipse.ui.views.properties.IPropertyDescriptor;</strong>

-<strong>import org.eclipse.ui.views.properties.PropertyDescriptor;</strong>

-

-<strong>import samples.RSESamplesPlugin;</strong>

-

-/**

- * This is the adapter which enables us to work with our remote developer resources.

- */

-public class DeveloperResourceAdapter extends AbstractSystemViewAdapter

-		implements ISystemRemoteElementAdapter

-{

-

-	/**

-	 * Constructor 

-	 */

-	public DeveloperResourceAdapter() {

-		super();

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#addActions(org.eclipse.rse.ui.SystemMenuManager,

-	 * org.eclipse.jface.viewers.IStructuredSelection, org.eclipse.swt.widgets.Shell, java.lang.String)

-	 */

-	public void addActions(SystemMenuManager menu,

-			IStructuredSelection selection, Shell parent, String menuGroup)

-	{

-	}

-

-	/**

-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(Object)

-	 */

-	public ImageDescriptor getImageDescriptor(Object object)

-	{

-		<strong>return RSESamplesPlugin.getDefault().getImageDescriptor("ICON_ID_DEVELOPER");</strong>

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getText(java.lang.Object)

-	 */

-	public String getText(Object element)

-	{

-		<strong>return ((DeveloperResource)element).getName();</strong>

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getAbsoluteName(java.lang.Object)

-	 */

-	public String getAbsoluteName(Object object)

-	{

-		<strong>DeveloperResource devr = (DeveloperResource)object;</strong>

-		r<strong>eturn "Devr_" + devr.getId();</strong>

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getType(java.lang.Object)

-	 */

-	public String getType(Object element)

-	{

-		<strong>return RSESamplesPlugin.getResourceString("property.devr_resource.type");</strong>

-	}

-

-	/**

-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(Object)

-	 */

-	public Object getParent(Object o)

-	{

-		return null; // not really used, which is good because it is ambiguous

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#hasChildren(java.lang.Object)

-	 */

-	public boolean hasChildren(Object element)

-	{

-		return false;

-	}

-

-	/**

-	 * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(Object)

-	 */

-	public Object[] getChildren(Object o)

-	{

-		return null;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#internalGetPropertyDescriptors()

-	 */

-	protected IPropertyDescriptor[] internalGetPropertyDescriptors()

-	{

-		// the following array should be made static to it isn't created every time		

-		<strong>PropertyDescriptor[] ourPDs = new PropertyDescriptor[2];</strong>

-		<strong>ourPDs[0] = new PropertyDescriptor("devr_id", RSESamplesPlugin.getResourceString("property.devr_id.name"));</strong>

-		<strong>ourPDs[0].setDescription(RSESamplesPlugin.getResourceString("property.devr_id.desc"));</strong>

-		<strong>ourPDs[1] = new PropertyDescriptor("devr_dept", RSESamplesPlugin.getResourceString("property.devr_dept.name"));</strong>

-		<strong>ourPDs[1].setDescription(RSESamplesPlugin.getResourceString("property.devr_dept.desc"));</strong>

-		<strong>return ourPDs;</strong>

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#internalGetPropertyValue(java.lang.Object)

-	 */

-	protected Object internalGetPropertyValue(Object key)

-	{

-		// propertySourceInput holds the currently selected object

-		<strong>DeveloperResource devr = (DeveloperResource)propertySourceInput; 

-		if (key.equals("devr_id")) 

-			return devr.getId();

-		else if (key.equals("devr_dept")) 

-		  return devr.getDeptNbr();

-		return null;</strong>

-	}		

-	// --------------------------------------

-	// ISystemRemoteElementAdapter methods...

-	// --------------------------------------

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getAbsoluteParentName(java.lang.Object)

-	 */

-	public String getAbsoluteParentName(Object element)

-	{

-		<strong>return "root";</strong> // not really applicable as we have no unique hierarchy

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemConfigurationId(java.lang.Object)

-	 */

-	public String getSubSystemConfigurationId(Object element)

-	{

-		<strong>return "samples.subsystems.factory";</strong> // as declared in extension in plugin.xml

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteTypeCategory(java.lang.Object)

-	 */

-	public String getRemoteTypeCategory(Object element)

-	{

-		<strong>return "developers";</strong> // Course grained. Same for all our remote resources.

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteType(java.lang.Object)

-	 */

-	public String getRemoteType(Object element)

-	{

-		<strong>return "developer";</strong> // Fine grained. Unique to this resource type.

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteSubType(java.lang.Object)

-	 */

-	public String getRemoteSubType(Object element)

-	{

-		return null; // Very fine grained. We don't use it.

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#refreshRemoteObject(java.lang.Object, java.lang.Object)

-	 */

-	public boolean refreshRemoteObject(Object oldElement, Object newElement)

-	{

-		<strong>DeveloperResource oldDevr= (DeveloperResource)oldElement;

-		DeveloperResource newDevr = (DeveloperResource)newElement;

-		newDevr.setName(oldDevr.getName());

-		return false;</strong>

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteParent(org.eclipse.swt.widgets.Shell, java.lang.Object)

-	 */

-	public Object getRemoteParent(Shell shell, Object element) throws Exception

-	{

-		return null; // maybe this would be a Department obj, if we fully fleshed out our model

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteParentNamesInUse(org.eclipse.swt.widgets.Shell, java.lang.Object)

-	 */

-	public String[] getRemoteParentNamesInUse(Shell shell, Object element)

-			throws Exception

-	{

-		// developers names do not have to be unique! So we don't need to implement this!

-		return null;

-

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#supportsUserDefinedActions(java.lang.Object)

-	 */

-	public boolean supportsUserDefinedActions(Object object) {

-		<strong>return false;</strong>

-	}

-

-}

-</samp></pre>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystem.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystem.html
deleted file mode 100755
index cd163a8..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystem.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperSubSystem Class After Editing</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>DeveloperSubSystem Class After Editing</h1>
-<pre><samp>
-package samples.subsystems;
-
-<strong>import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.subsystems.IConnectorService;</strong>
-import org.eclipse.rse.core.subsystems.SubSystem;
-<strong>import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.services.clientserver.NamePatternMatcher;
-
-import samples.model.DeveloperResource;
-import samples.model.TeamResource;</strong>
-
-<strong>/**
- * This is our subsystem, which manages the remote connection and resources for
- *  a particular system connection object.
- */</strong>
-public class DeveloperSubSystem extends SubSystem
-{
-	<strong>private TeamResource[] teams; // faked-out master list of teams</strong>
-	<strong>private Vector devVector = new Vector(); // faked-out master list of developers</strong>
-	<strong>private static int employeeId = 123456; // employee Id factory</strong>	
-
-	/**
-	 * @param host
-	 * @param connectorService
-	 */
-	public DeveloperSubSystem(IHost host, IConnectorService connectorService) {
-		super(host, connectorService);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystem#initializeSubSystem(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void initializeSubSystem(IProgressMonitor monitor) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.ISubSystem#uninitializeSubSystem(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void uninitializeSubSystem(IProgressMonitor monitor) {
-	}
-
-	<strong>/**
-	 * For drag and drop, and clipboard support of remote objects.
-	 *   
-	 * Return the remote object within the subsystem that corresponds to
-	 * the specified unique ID.  Because each subsystem maintains it's own
-	 * objects, it's the responsability of the subsystem to determine
-	 * how an ID (or key) for a given object maps to the real object.
-	 * By default this returns null. 
-	 */
-	public Object getObjectWithAbsoluteName(String key)
-	{
-		//  Functional opposite of getAbsoluteName(Object) in our resource adapters
-		if (key.startsWith("Team_")) //$NON-NLS-1$
-		{
-			String teamName = key.substring(5);
-			TeamResource[] allTeams = getAllTeams();
-			for (int idx=0; idx &lt; allTeams.length; idx++)
-			   if (allTeams[idx].getName().equals(teamName))
-			     return allTeams[idx];
-		}
-		else if (key.startsWith("Devr_")) //$NON-NLS-1$
-		{
-			String devrId = key.substring(5);
-			DeveloperResource[] devrs = getAllDevelopers();
-			for (int idx=0; idx &lt; devrs.length; idx++)
-			  if (devrs[idx].getId().equals(devrId))
-			    return devrs[idx];            	
-		}
-		return null; 
-	}</strong>
-
-	<strong>/**
-	 * When a filter is expanded, this is called for each filter string in the filter.
-	 * Using the criteria of the filter string, it must return objects representing remote resources.
-	 * For us, this will be an array of TeamResource objects.
-	 * 
-	 * @param monitor - the progress monitor in effect while this operation performs
-	 * @param filterString - one of the filter strings from the expanded filter.
-	 */
-	protected Object[] internalResolveFilterString(String filterString, IProgressMonitor monitor)
-         throws java.lang.reflect.InvocationTargetException,
-                java.lang.InterruptedException                
-	{
-			// Fake it out for now and return dummy list. 
-			// In reality, this would communicate with remote server-side code/data.
-			TeamResource[] allTeams = getAllTeams();
-			
-			// Now, subset master list, based on filter string...
-			NamePatternMatcher subsetter = new NamePatternMatcher(filterString);
-			Vector v = new Vector();
-			for (int idx = 0; idx &lt; allTeams.length; idx++)
-			{
-				if (subsetter.matches(allTeams[idx].getName()))
-				  v.addElement(allTeams[idx]);
-			}		
-			TeamResource[] teams = new TeamResource[v.size()];
-			for (int idx=0; idx &lt; v.size(); idx++)
-			   teams[idx] = (TeamResource)v.elementAt(idx);
-			return teams;
-	}</strong>
-
-	<strong>/**
-	 * When a remote resource is expanded, this is called to return the children of the resource, if
-	 * the resource's adapter states the resource object is expandable.
-	 * For us, it is a Team resource that was expanded, and an array of Developer resources will be returned.
-	 * 
-	 * @param monitor - the progress monitor in effect while this operation performs
-	 * @param parent - the parent resource object being expanded
-	 * @param filterString - typically defaults to "*". In future additional user-specific quick-filters may be supported.
-	 */
-	<a id="resolveFilterString"/>protected Object[] internalResolveFilterString(Object parent, String filterString, IProgressMonitor monitor)
-         throws java.lang.reflect.InvocationTargetException,
-                java.lang.InterruptedException
-	{
-		// typically we ignore the filter string as it is always "*" 
-		//  until support is added for "quick filters" the user can specify/select
-		//  at the time they expand a remote resource.
-		
-		TeamResource team = (TeamResource)parent;
-		return team.getDevelopers();
-	}</strong>
-
-	<strong>// ------------------	
-	// Our own methods...
-	// ------------------</strong>
-
-	<strong>/**
-	 * Get the list of all teams. Normally this would involve a trip the server, but we 
-	 *  fake it out and return a hard-coded local list. 
-	 */
-	public TeamResource[] getAllTeams()
-	{
-		if (teams == null) 
-		  teams = createTeams("Team ", 4);
-		return teams;		
-	}</strong>
-
-	<strong>/**
-	 * Get the list of all developers. Normally this would involve a trip the server, but we 
-	 *  fake it out and return a hard-coded local list. 
-	 */
-	public DeveloperResource[] getAllDevelopers()
-	{
-		DeveloperResource[] allDevrs = new DeveloperResource[devVector.size()];
-		for (int idx = 0; idx &lt; allDevrs.length; idx++)
-		  allDevrs[idx] = (DeveloperResource)devVector.elementAt(idx);
-		return allDevrs;		
-	}</strong>
-
-	<strong>/*
-	 * Create and return a dummy set of teams
-	 */
-	private TeamResource[] createTeams(String prefix, int howMany)
-	{
-		TeamResource[] teams = new TeamResource[howMany];
-		for (int idx = 0; idx &lt; teams.length; idx++)
-		{
-			teams[idx] = new TeamResource(this);
-			teams[idx].setName(prefix + (idx+1));
-			teams[idx].setDevelopers(createDevelopers(teams[idx].getName()+" developer",idx+1));
-		}
-		return teams;
-	}</strong>
-
-	<strong>/*
-	 * Create and return a dummy set of developers
-	 */
-	private DeveloperResource[] createDevelopers(String prefix, int nbr)
-	{
-		DeveloperResource[] devrs = new DeveloperResource[nbr];
-		for (int idx=0; idx &lt; devrs.length; idx++)
-		{
-			devrs[idx] = new DeveloperResource(this);
-			devrs[idx].setName(prefix + (idx+1));
-			devrs[idx].setId(Integer.toString(employeeId++));
-			devrs[idx].setDeptNbr(Integer.toString((idx+1)*100));
-			devVector.add(devrs[idx]); // update master list
-		}
-		return devrs;
-	}</strong>
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystem2.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystem2.html
deleted file mode 100755
index 0431b49..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystem2.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperSubSystem Class After Editing Supporting Multiple Filter Types</title>
-</head>
-
-<body>
-<h1>DeveloperSubSystem Class After Editing Supporting Multiple Filter Types</h1>
-<pre><samp>
-package samples.subsystems;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.SubSystem;
-import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.services.clientserver.NamePatternMatcher;
-
-import samples.model.DeveloperResource;
-import samples.model.TeamResource;
-
-/**
- * This is our subsystem, which manages the remote connection and resources for
- *  a particular system connection object.
- */
-public class DeveloperSubSystem extends SubSystem
-{
-	private TeamResource[] teams; // faked-out master list of teams
-	private Vector devVector = new Vector(); // faked-out master list of developers
-	private static int employeeId = 123456; // employee Id factory	
-
-	/**
-	 * @param host
-	 * @param connectorService
-	 */
-	public DeveloperSubSystem(IHost host, IConnectorService connectorService) {
-		super(host, connectorService);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystem#initializeSubSystem(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void initializeSubSystem(IProgressMonitor monitor) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.ISubSystem#uninitializeSubSystem(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void uninitializeSubSystem(IProgressMonitor monitor) {
-	}
-
-	/**
-	 * For drag and drop, and clipboard support of remote objects.
-	 *   
-	 * Return the remote object within the subsystem that corresponds to
-	 * the specified unique ID.  Because each subsystem maintains it's own
-	 * objects, it's the responsability of the subsystem to determine
-	 * how an ID (or key) for a given object maps to the real object.
-	 * By default this returns null. 
-	 */
-	public Object getObjectWithAbsoluteName(String key)
-	{
-		//  Functional opposite of getAbsoluteName(Object) in our resource adapters
-		if (key.startsWith("Team_"))
-		{
-			String teamName = key.substring(5);
-			TeamResource[] allTeams = getAllTeams();
-			for (int idx = 0; idx &lt; allTeams.length; idx++)
-			   if (allTeams[idx].getName().equals(teamName))
-			     return allTeams[idx];
-		}
-		else if (key.startsWith("Devr_"))
-		{
-			String devrId = key.substring(5);
-			DeveloperResource[] devrs = getAllDevelopers();
-			for (int idx=0; idx &lt; devrs.length; idx++)
-			  if (devrs[idx].getId().equals(devrId))
-			    return devrs[idx];            	
-		}
-		return null; 
-	}
-
-	/**
-	 * When a filter is expanded, this is called for each filter string in the filter.
-	 * Using the criteria of the filter string, it must return objects representing remote resources.
-	 * For us, this will be an array of TeamResource objects.
-	 * 
-	 * @param monitor - the progress monitor in effect while this operation performs
-	 * @param filterString - one of the filter strings from the expanded filter.
-	 */
-	protected Object[] internalResolveFilterString(String filterString, IProgressMonitor monitor)
-         throws java.lang.reflect.InvocationTargetException,
-                java.lang.InterruptedException                
-	{
-		<strong>int slashIdx = filterString.indexOf('/');
-		if (slashIdx &lt; 0)
-		{</strong>
-			// Fake it out for now and return dummy list. 
-			// In reality, this would communicate with remote server-side code/data.
-			TeamResource[] allTeams = getAllTeams();
-			
-			// Now, subset master list, based on filter string...
-			NamePatternMatcher subsetter = new NamePatternMatcher(filterString);
-			Vector v = new Vector();
-			for (int idx=0; idx &lt1; allTeams.length; idx++)
-			{
-				if (subsetter.matches(allTeams[idx].getName()))
-				  v.addElement(allTeams[idx]);
-			}		
-			TeamResource[] teams = new TeamResource[v.size()];
-			for (int idx=0; idx &lt; v.size(); idx++)
-			   teams[idx] = (TeamResource)v.elementAt(idx);
-			return teams;
-		<strong>}
-		else
-		{
-			String teamName = filterString.substring(0, slashIdx);
-			String devrName = filterString.substring(slashIdx+1);
-			TeamResource[] allTeams = getAllTeams();
-			TeamResource match = null;
-			for (int idx=0; (match==null) && (idx &lt; allTeams.length); idx++)
-			   if (allTeams[idx].getName().equals(teamName))
-			     match = allTeams[idx];
-			if (match != null)
-			{
-				DeveloperResource[] allDevrs = match.getDevelopers();
-				// Now, subset master list, based on filter string...
-				NamePatternMatcher subsetter = new NamePatternMatcher(devrName);
-				Vector v = new Vector();
-				for (int idx=0; idx &lt; allDevrs.length; idx++)
-			    {
-			    	if (subsetter.matches(allDevrs[idx].getName()))
-			    	  v.addElement(allDevrs[idx]);
-			   	}		
-			   	DeveloperResource[] devrs = new DeveloperResource[v.size()];
-			   	for (int idx=0; idx &lt; v.size(); idx++)
-			   	   devrs[idx] = (DeveloperResource)v.elementAt(idx);
-			   	return devrs;	
-			}
-		}
-		return null;</strong>
-	}
-
-	/**
-	 * When a remote resource is expanded, this is called to return the children of the resource, if
-	 * the resource's adapter states the resource object is expandable. <br>
-	 * For us, it is a Team resource that was expanded, and an array of Developer resources will be returned.
-	 * 
-	 * @param monitor - the progress monitor in effect while this operation performs
-	 * @param parent - the parent resource object being expanded
-	 * @param filterString - typically defaults to "*". In future additional user-specific quick-filters may be supported.
-	 */
-	protected Object[] internalResolveFilterString(Object parent, String filterString, IProgressMonitor monitor)
-         throws java.lang.reflect.InvocationTargetException,
-                java.lang.InterruptedException
-	{
-		// typically we ignore the filter string as it is always "*" 
-		//  until support is added for "quick filters" the user can specify/select
-		//  at the time they expand a remote resource.
-		
-		TeamResource team = (TeamResource)parent;
-		return team.getDevelopers();
-	}
-
-	// ------------------	
-	// Our own methods...
-	// ------------------
-
-	/**
-	 * Get the list of all teams. Normally this would involve a trip the server, but we 
-	 *  fake it out and return a hard-coded local list. 
-	 */
-	public TeamResource[] getAllTeams()
-	{
-		if (teams == null) 
-		  teams = createTeams("Team ", 4);
-		return teams;		
-	}
-
-	/**
-	 * Get the list of all developers. Normally this would involve a trip the server, but we 
-	 *  fake it out and return a hard-coded local list. 
-	 */
-	public DeveloperResource[] getAllDevelopers()
-	{
-		DeveloperResource[] allDevrs = new DeveloperResource[devVector.size()];
-		for (int idx=0; idx &lt; allDevrs.length; idx++)
-		  allDevrs[idx] = (DeveloperResource)devVector.elementAt(idx);
-		return allDevrs;		
-	}
-
-	/*
-	 * Create and return a dummy set of teams
-	 */
-	private TeamResource[] createTeams(String prefix, int howMany)
-	{
-		TeamResource[] teams = new TeamResource[howMany];
-		for (int idx=0; idx &lt; teams.length; idx++)
-		{
-			teams[idx] = new TeamResource(this);
-			teams[idx].setName(prefix + (idx+1));
-			teams[idx].setDevelopers(createDevelopers(teams[idx].getName()+" developer",idx+1));
-		}
-		return teams;
-	}
-
-	/*
-	 * Create and return a dummy set of developers
-	 */
-	private DeveloperResource[] createDevelopers(String prefix, int nbr)
-	{
-		DeveloperResource[] devrs = new DeveloperResource[nbr];
-		for (int idx=0; idx &lt; devrs.length; idx++)
-		{
-			devrs[idx] = new DeveloperResource(this);
-			devrs[idx].setName(prefix + (idx+1));
-			devrs[idx].setId(Integer.toString(employeeId++));
-			devrs[idx].setDeptNbr(Integer.toString((idx+1)*100));
-			devVector.add(devrs[idx]); // update master list
-		}
-		return devrs;
-	}
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html
deleted file mode 100755
index de0f498..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperSubSystemConfiguration Class After Editing</title>
-</head>
-
-<body>
-<h1>DeveloperSubSystemConfiguration Class After Editing</h1>
-<pre><samp>
-package samples.subsystems;
-
-<strong>import java.util.Vector;</strong>
-
-<strong>import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;</strong>
-import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
-<strong>import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.model.IHost;</strong>
-
-<strong>import samples.RSESamplesPlugin;</strong>
-
-/**
- * This is our subsystem factory, which creates instances of our subsystems,
- *  and supplies the subsystem and filter actions to their popup menus.
- */
-public class DeveloperSubSystemConfiguration extends SubSystemConfiguration {
-
-	/**
-	 * Constructor for DeveloperSubSystemConfiguration.
-	 */
-	public DeveloperSubSystemConfiguration() {
-		super();
-	}
-
-	/**
-	 * Create an instance of our subsystem.
-	 */
-	<strong>public ISubSystem createSubSystemInternal(IHost conn) {
-	   	return new DeveloperSubSystem(conn, getConnectorService(conn));
-	}</strong>
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.core.model.IHost)
-	 */
-	public IConnectorService getConnectorService(IHost host) {
-		<strong>return DeveloperConnectorServiceManager.getInstance()
-			.getConnectorService(host, IDeveloperSubSystem.class);</strong>
-	}
-
-	/**
-	 * Intercept of parent method that creates an initial default filter pool.
-	 * We intercept so that we can create an initial filter in that pool, which will
-	 *  list all teams.
-	 */
-	<a id="createDefaultFilterPool"/><strong>protected ISystemFilterPool createDefaultFilterPool(ISystemFilterPoolManager mgr)
-	{
-		ISystemFilterPool defaultPool = null;
-		try {
-			defaultPool = mgr.createSystemFilterPool(getDefaultFilterPoolName(mgr.getName(), getId()), true); // true=>is deletable by user
-			Vector strings = new Vector();
-			strings.add("*");
-			mgr.createSystemFilter(defaultPool, "All teams", strings);
-		} catch (Exception exc) {}
-		return defaultPool;
-	}</strong>
-	
-	/**
-	 * Intercept of parent method so we can supply our own value shown in the property
-	 *  sheet for the "type" property when a filter is selected within our subsystem.
-	 *
-	 * Requires this line in rseSamplesResources.properties: property.type.teamfilter=Team filter
-	 */
-	<strong>public String getTranslatedFilterTypeProperty(ISystemFilter selectedFilter)
-	{
-	   	return RSESamplesPlugin.getResourceString("property.type.teamfilter");
-	}</strong>
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsUserId()
-	 */
-	<strong>public boolean supportsUserId() {
-		return false;
-	}</strong>
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.core.model.IHost)
-	 */
-	<strong>public boolean supportsServerLaunchProperties(IHost host) {
-		return false;
-	}</strong>
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html
deleted file mode 100755
index ee93878..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/DeveloperSubSystemConfiguration2.html
+++ /dev/null
@@ -1,112 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>DeveloperSubSystemFactory Class After Editing For Filter Support</title>
-</head>
-
-<body>
-<h1>DeveloperSubSystemFactory Class After Editing For Filter Support</h1>
-<pre><samp>
-package samples.subsystems;
-
-import java.util.Vector;
-
-import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
-import org.eclipse.rse.core.subsystems.SubSystemConfiguration;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.filters.ISystemFilterPool;
-import org.eclipse.rse.core.filters.ISystemFilterPoolManager;
-import org.eclipse.rse.core.filters.ISystemFilter;
-import org.eclipse.rse.core.model.IHost;
-
-import samples.RSESamplesPlugin;
-
-/**
- * This is our subsystem factory, which creates instances of our subsystems,
- *  and supplies the subsystem and filter actions to their popup menus.
- */
-public class DeveloperSubSystemConfiguration extends SubSystemConfiguration {
-
-	/**
-	 * Constructor for DeveloperSubSystemConfiguration.
-	 */
-	public DeveloperSubSystemConfiguration() {
-		super();
-	}
-
-	/**
-	 * Create an instance of our subsystem.
-	 */
-	public ISubSystem createSubSystemInternal(IHost conn) {
-	   	return new DeveloperSubSystem(conn, getConnectorService(conn));
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.ISubSystemConfiguration#getConnectorService(org.eclipse.rse.core.model.IHost)
-	 */
-	public IConnectorService getConnectorService(IHost host) {
-		return DeveloperConnectorServiceManager.getInstance()
-			.getConnectorService(host, IDeveloperSubSystem.class);
-	}
-
-	/**
-	 * Intercept of parent method that creates an initial default filter pool.
-	 * We intercept so that we can create an initial filter in that pool, which will
-	 *  list all teams.
-	 */
-	protected ISystemFilterPool createDefaultFilterPool(ISystemFilterPoolManager mgr)
-	{
-		ISystemFilterPool defaultPool = null;
-		try {
-			defaultPool = mgr.createSystemFilterPool(getDefaultFilterPoolName(mgr.getName(), getId()), true); // true=>is deletable by user
-			Vector strings = new Vector();
-			strings.add("*");
-			I<strong>SystemFilter filter = mgr.createSystemFilter(defaultPool, 
-					RSESamplesPlugin.getResourceString("filter.default.name"),
-					strings);
-			filter.setType("team");</strong>
-		} catch (Exception exc) {}
-		return defaultPool;
-	}
-	
-	/**
-	 * Intercept of parent method so we can supply our own value shown in the property
-	 *  sheet for the "type" property when a filter is selected within our subsystem.
-	 *
-	 * Requires this line in rseSamplesResources.properties: property.type.teamfilter=Team filter
-	 */
-	public String getTranslatedFilterTypeProperty(ISystemFilter selectedFilter)
-	{
-	   	<strong>String type = selectedFilter.getType();
-	   	if (type == null)
-	   	  type = "team";
-	   	if (type.equals("team"))
-	   	  return RSESamplesPlugin.getResourceString("property.type.teamfilter");
-	   	else
-	   	  return RSESamplesPlugin.getResourceString("property.type.devrfilter");</strong>
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsUserId()
-	 */
-	public boolean supportsUserId() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.rse.core.subsystems.SubSystemConfiguration#supportsServerLaunchProperties(org.eclipse.rse.core.model.IHost)
-	 */
-	public boolean supportsServerLaunchProperties(IHost host) {
-		return false;
-	}
-
-}
-</samp></pre>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/FolderInfoPropertyPage1.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/FolderInfoPropertyPage1.html
deleted file mode 100755
index 61fb592..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/FolderInfoPropertyPage1.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>FolderInfoPropertyPage Class After Creation</title>

-</head>

-

-<body bgcolor="#ffffff">

-<h1>FolderInfoPropertyPage Class After Creation</h1>

-<p>

-<pre><samp>

-package samples.ui.propertypages;

-

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

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

-

-import org.eclipse.rse.files.ui.propertypages.SystemAbstractRemoteFilePropertyPageExtensionAction;

-

-public class <b>FolderInfoPropertyPage</b>

-	extends SystemAbstractRemoteFilePropertyPageExtensionAction

-{

-

-	/**

-	 * Constructor for FolderInfoPropertyPage.

-	 */

-	public <b>FolderInfoPropertyPage</b>()

-	{

-		super();

-	}

-

-	/**

-	 * @see org.eclipse.rse.ui.propertypages.SystemBasePropertyPage#createContentArea(Composite)

-	 */

-	protected Control <b>createContentArea</b>(Composite parent)

-	{

-		return null;

-	}

-

-}

-</samp></pre>

-</p>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/FolderInfoPropertyPage2.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/FolderInfoPropertyPage2.html
deleted file mode 100755
index 0ed02dc..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/FolderInfoPropertyPage2.html
+++ /dev/null
@@ -1,269 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>FolderInfoPropertyPage Class After Editing</title>

-</head>

-

-<body bgcolor="#ffffff">

-<h1>FolderInfoPropertyPage Class After Editing</h1>

-<p>

-<pre><samp>

-package samples.ui.propertypages;

-

-import org.eclipse.rse.files.ui.propertypages.SystemAbstractRemoteFilePropertyPageExtensionAction;

-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;

-import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;

-import org.eclipse.rse.ui.SystemWidgetHelpers;

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

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

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

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

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

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

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

-

-import samples.RSESamplesPlugin;

-

-/**

- * A sample property page for a remote object, which in this case is scoped via the

- *  extension point xml to only apply to folder objects.

- */

-public class FolderInfoPropertyPage

-	extends SystemAbstractRemoteFilePropertyPageExtensionAction

-	implements SelectionListener

-{

-	// gui widgets...

-	private Label sizeLabel, filesLabel, foldersLabel;

-	private Button stopButton;

-	// state...

-	private int totalSize = 0;

-	private int totalFolders = 0;

-	private int totalFiles = 0;

-	private boolean stopped = false;

-	private Thread workerThread;

-	private Runnable guiUpdater;

-

-	/**

-	 * Constructor for FolderInfoPropertyPage.

-	 */

-	public FolderInfoPropertyPage()

-	{

-		super();

-	}

-

-	// --------------------------

-	// Parent method overrides...

-	// --------------------------

-	

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.files.ui.propertypages.SystemAbstractRemoteFilePropertyPageExtensionAction#createContentArea(org.eclipse.swt.widgets.Composite)

-	 */

-	protected Control createContentArea(Composite parent)

-	{

-		Composite composite = SystemWidgetHelpers.createComposite(parent, 2);

-		// draw the gui		

-		sizeLabel = SystemWidgetHelpers.createLabeledLabel(composite, 

-				RSESamplesPlugin.getResourceString("pp.size.label"), //$NON-NLS-1$

-				RSESamplesPlugin.getResourceString("pp.size.tooltip"), //$NON-NLS-1$

-				false);

-		filesLabel = SystemWidgetHelpers.createLabeledLabel(composite, 

-				RSESamplesPlugin.getResourceString("pp.files.label"), //$NON-NLS-1$

-				RSESamplesPlugin.getResourceString("pp.files.tooltip"), //$NON-NLS-1$

-				false);

-		foldersLabel = SystemWidgetHelpers.createLabeledLabel(composite, 

-				RSESamplesPlugin.getResourceString("pp.folders.label"), //$NON-NLS-1$

-				RSESamplesPlugin.getResourceString("pp.folders.tooltip"), //$NON-NLS-1$

-				false);

-		stopButton = SystemWidgetHelpers.createPushButton(composite, null, 

-				RSESamplesPlugin.getResourceString("pp.stopButton.label"), //$NON-NLS-1$

-				RSESamplesPlugin.getResourceString("pp.stopButton.tooltip") //$NON-NLS-1$

-				);

-		stopButton.addSelectionListener(this);

-		

-		setValid(false); // Disable OK button until thread is done

-		

-		// show "Processing..." message

-		setMessage(RSESamplesPlugin.getPluginMessage("RSSG1002")); //$NON-NLS-1$

-		

-		// create instance of Runnable to allow asynchronous GUI updates from background thread	   

-		guiUpdater = new RunnableGUIClass();

-		// spawn a thread to calculate the information

-		workerThread = new RunnableClass(getRemoteFile());

-		workerThread.start();

-		

-		return composite;

-	}

-	

-	/**

-	 * Intercept from PreferencePage. Called when user presses Cancel button.

-	 * We stop the background thread.

-	 * @see org.eclipse.jface.preference.PreferencePage#performCancel()

-	 */

-	public boolean performCancel() 

-	{

-		killThread();

-		return true;

-	}			

-	

-	/**

-	 * Intercept from DialogPage. Called when dialog going away.

-	 * If the user presses the X to close this dialog, we 

-	 *  need to stop that background thread.

-	 */

-	public void dispose()

-	{

-		killThread();

-		super.dispose();

-	}

-	

-	/**

-	 * Private method to kill our background thread.

-	 * Control doesn't return until it ends.

-	 */

-	private void killThread()

-	{

-		if (!stopped && workerThread.isAlive())

-		{

-		    stopped = true;

-		    try {

-		      workerThread.join(); // wait for thread to end

-		    } catch (InterruptedException exc) {}

-		}		

-	}

-

-	// -------------------------------------------

-	// Methods from SelectionListener interface...

-	// -------------------------------------------

-	

-	/**

-	 * From SelectionListener

-	 * @see SelectionListener#widgetSelected(SelectionEvent)

-	 */

-	public void widgetSelected(SelectionEvent event) 

-	{

-		if (event.getSource() == stopButton)

-		{

-			stopped = true;

-			stopButton.setEnabled(false);

-		}

-	}

-	/**

-	 * From SelectionListener

-	 * @see SelectionListener#widgetDefaultSelected(SelectionEvent)

-	 */

-	public void widgetDefaultSelected(SelectionEvent event)

-	{

-	}

-

-	// ----------------

-	// Inner classes...

-	// ----------------

-	/**

-	 * Inner class encapsulating the background work to be done, so it may be executed

-	 *  in background thread.

-	 */

-	private class RunnableClass extends Thread

-	{

-		IRemoteFile inputFolder;

-		

-		RunnableClass(IRemoteFile inputFolder)

-		{

-			this.inputFolder = inputFolder;

-		}

-		

-		public void run()

-		{

-			if (stopped)

-			  return;

-			walkFolder(inputFolder);						

-			updateGUI();

-			if (!stopped)

-			{

-				stopped = true;

-				updateGUI();

-			}

-		}

-		

-		/**

-		 * Recursively walk a folder, updating the running tallies. 

-		 * Update the GUI after processing each subfolder.

-		 */

-		private void walkFolder(IRemoteFile currFolder)

-		{

-			try

-			{

-			IRemoteFile[] folders = currFolder.getParentRemoteFileSubSystem().listFoldersAndFiles( currFolder, null);

-			if ((folders != null) && (folders.length>0))

-			{

-				for (int idx=0; !stopped && (idx&lt;folders.length); idx++)

-				{

-					// is this a folder? 

-					if (folders[idx].isDirectory())

-					{

-						++totalFolders;

-						walkFolder(folders[idx]);

-						updateGUI();

-					}

-					// is this a file?

-					else

-					{

-						++totalFiles;

-						totalSize += folders[idx].getLength();

-					}

-				}

-			}

-			}

-			catch (SystemMessageException e)

-			{

-				

-			}

-		} // end of walkFolder method

-

-	} // end of inner class

-	

-	/**

-	 * Inner class encapsulating the GUI work to be done from the

-	 *  background thread.

-	 */

-	private class RunnableGUIClass implements Runnable

-	{

-		public void run()

-		{

-			if (stopButton.isDisposed())

-			  return; 

-			if (!stopped)

-			{

-				sizeLabel.setText(Integer.toString(totalSize));		

-				filesLabel.setText(Integer.toString(totalFiles));

-				foldersLabel.setText(Integer.toString(totalFolders));

-			}

-			else if (stopped)

-			{				

-				setValid(true); // re-enable OK button								

-				stopButton.setEnabled(false); // disable Stop button				

-				clearMessage(); // clear "Processing..." message

-			}			  

-		}

-	}	

-

-	

-	/**

-	 * Update the GUI with the current status

-	 */

-	private void updateGUI()

-	{

-		Display.getDefault().asyncExec(guiUpdater);

-	}

-

-

-}

-</samp></pre>

-</p>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/IDeveloperSubSystem.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/IDeveloperSubSystem.html
deleted file mode 100755
index cf13a5a..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/IDeveloperSubSystem.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>IDeveloperSubSystem Interface After Creation</title>

-</head>

-

-<body bgcolor="#ffffff">

-<h1>IDeveloperSubSystem Interface After Creation</h1>

-<p>

-<pre><samp>

-package samples.subsystems;

-

-/**

- * Interface identifying our unique subsystems

- */

-public interface <b>IDeveloperSubSystem</b> 

-{

-

-}

-

-</samp></pre>

-</p>

-</body>

-</html>

-

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/InitializeImageRegistry.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/InitializeImageRegistry.html
deleted file mode 100755
index 2d618b7..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/InitializeImageRegistry.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>InitializeImageRegistry Method</title>

-</head>

-

-<body>

-<h1>InitializeImageRegistry Method</h1>

-<pre><samp>

-	/**

-	 * <i>Initialize the image registry by declaring all of the required graphics.</i>

-	 */

-	protected void initializeImageRegistry()

-	{

-		String path = getIconPath();

-		<b>putImageInRegistry("ICON_ID_TEAM", path + "team.gif");</b>

-		<b>putImageInRegistry("ICON_ID_DEVELOPER", path + "developer.gif");</b>

-	}

-</samp></pre>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/InitializeImageRegistry2.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/InitializeImageRegistry2.html
deleted file mode 100755
index b62de4e..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/InitializeImageRegistry2.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>InitializeImageRegistry Method</title>

-</head>

-

-<body>

-<h1>InitializeImageRegistry Method</h1>

-<pre><samp>

-	/**

-	 * <i>Initialize the image registry by declaring all of the required graphics.</i>

-	 */

-	protected void initializeImageRegistry()

-	{

-		String path = getIconPath();

-		putImageInRegistry("ICON_ID_TEAM", path + "team.gif");

-		putImageInRegistry("ICON_ID_DEVELOPER", path + "developer.gif");

-		<b>putImageInRegistry("ICON_ID_TEAMFILTER", path + "teamFilter.gif");</b>

-		<b>putImageInRegistry("ICON_ID_DEVELOPERFILTER", path + "developerFilter.gif");</b>

-	}

-</samp></pre>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterActions.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterActions.gif
deleted file mode 100755
index 473b3fa..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterActions.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterIcons.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterIcons.gif
deleted file mode 100755
index 4889771..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterIcons.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterWizard.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterWizard.gif
deleted file mode 100755
index 692fbb2..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/NewFilterWizard.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/RSESamplesPlugin.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/RSESamplesPlugin.html
deleted file mode 100755
index 8a48717..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/RSESamplesPlugin.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>RSESamplesPlugin Class</title>
-</head>
-
-<body>
-<h1>RSESamplesPlugin Class</h1>
-<pre><samp>
-package samples;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageFile;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class RSESamplesPlugin extends SystemBasePlugin  {
-
-	//The shared instance.
-	private static RSESamplesPlugin plugin;
-
-	//Resource bundle.
-	private ResourceBundle resourceBundle = null;
-	private static SystemMessageFile messageFile = null;
-	
-	/**
-	 * The constructor.
-	 */
-	public RSESamplesPlugin() {
-		super();
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		<strong>plugin = this;
-		messageFile = getMessageFile("rseSamplesMessages.xml");</strong>
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		<strong>plugin = null;
-		resourceBundle = null;</strong>
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	<strong>public static RSESamplesPlugin getDefault() {
-		return plugin;
-	}</strong>
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	<strong>public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}</strong>
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	<strong>public static String getResourceString(String key) {
-		ResourceBundle bundle= RSESamplesPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}</strong>
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	<strong>public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("samples.rseSamplesResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}</strong>
-
-	/**
-	 * Initialize the image registry by declaring all of the required graphics.
-	 */
-	protected void initializeImageRegistry()
-	{
-	}
-
-	/**
-	 * Load a message file for this plugin.
-	 * @param messageFileName - the name of the message xml file. Will look for it in this plugin's install folder.
-	 * @return a message file object containing the parsed contents of the message file, or null if not found.
-	 */
-	<strong>public SystemMessageFile getMessageFile(String messageFileName)
-	{
-		return loadMessageFile(getBundle(), messageFileName);  	
-	}</strong>	
-
-	/**
-	 * Return our message file
-	 */
-	<strong>public static SystemMessageFile getPluginMessageFile()
-	{
-		return messageFile;
-	}</strong>  
-
-	/**
-	 * Retrieve a message from this plugin's message file
-	 */
-	<strong>public static SystemMessage getPluginMessage(String msgId)
-	{
-		return getMessage(messageFile, msgId);
-	}</strong>
-}
-</samp></pre>
-</p>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/RSESamplesPlugin2.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/RSESamplesPlugin2.html
deleted file mode 100755
index 0d8c9a4..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/RSESamplesPlugin2.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>RSESamplesPlugin Class</title>
-</head>
-
-<body>
-<h1>RSESamplesPlugin Class</h1>
-<pre><samp>
-package samples;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdapterManager;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.rse.services.clientserver.messages.SystemMessage;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageFile;
-import org.eclipse.rse.ui.SystemBasePlugin;
-import org.osgi.framework.BundleContext;
-
-import samples.subsystems.DeveloperSubSystemConfigurationAdapterFactory;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class RSESamplesPlugin extends SystemBasePlugin  {
-
-	//The shared instance.
-	private static RSESamplesPlugin plugin;
-
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-	private static SystemMessageFile messageFile = null;
-	
-	/**
-	 * The constructor.
-	 */
-	public RSESamplesPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		messageFile = getMessageFile("rseSamplesMessages.xml"); //$NON-NLS-1$
-
-		IAdapterManager manager = Platform.getAdapterManager();
-		samples.model.DeveloperAdapterFactory factory = new samples.model.DeveloperAdapterFactory();
-		manager.registerAdapters(factory, samples.model.TeamResource.class);
-		manager.registerAdapters(factory, samples.model.DeveloperResource.class);
-
-	    DeveloperSubSystemConfigurationAdapterFactory sscaf = new DeveloperSubSystemConfigurationAdapterFactory();
-	    sscaf.registerWithManager(manager);
-
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static RSESamplesPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle= RSESamplesPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				resourceBundle = ResourceBundle.getBundle("samples.rseSamplesResources");
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-
-	/**
-	 * @see AbstractUIPlugin#initializeDefaultPreferences
-	 */
-	//protected void initializeDefaultPreferences(IPreferenceStore store) 
-	//{
-	//	super.initializeDefaultPreferences(store);
-	//	//RSESamplesPreferencePage.initDefaults(store);
-	//}
-	
-	/**
-	 * Initialize the image registry by declaring all of the required graphics.
-	 */
-	protected void initializeImageRegistry()
-	{
-		String path = getIconPath();
-		putImageInRegistry("ICON_ID_TEAM", path + "team.gif");
-		putImageInRegistry("ICON_ID_DEVELOPER", path + "developer.gif");
-		putImageInRegistry("ICON_ID_TEAMFILTER", path + "teamFilter.gif");
-		putImageInRegistry("ICON_ID_DEVELOPERFILTER", path + "developerFilter.gif");
-	}
-
-	/**
-	 * Load a message file for this plugin.
-	 * @param messageFileName - the name of the message xml file. Will look for it in this plugin's install folder.
-	 * @return a message file object containing the parsed contents of the message file, or null if not found.
-	 */
-    public SystemMessageFile getMessageFile(String messageFileName)
-    {
-       return loadMessageFile(getBundle(), messageFileName);  	
-    }	
-
-	/**
-	 * Return our message file
-	 */
-	public static SystemMessageFile getPluginMessageFile()
-	{
-		return messageFile;
-	}  
-
-	/**
-	 * Retrieve a message from this plugin's message file
-	 */
-	public static SystemMessage getPluginMessage(String msgId)
-	{
-		return getMessage(messageFile, msgId);
-	}
-}
-</samp></pre>
-</p>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/ShowJarContents1.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/ShowJarContents1.html
deleted file mode 100755
index 90e137b..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/ShowJarContents1.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>ShowJarContents Class After Creation</title>

-</head>

-

-<body bgcolor="#ffffff">

-<h1>ShowJarContents Class After Creation</h1>

-<p>

-<pre><samp>

-package samples.ui.actions;

-

-import org.eclipse.rse.files.ui.actions.SystemAbstractRemoteFilePopupMenuExtensionAction;

-

-public class <b>ShowJarContents</b>

-	extends SystemAbstractRemoteFilePopupMenuExtensionAction

-{

-

-	/**

-	 * Constructor for ShowJarContents.

-	 */

-	public <b>ShowJarContents</b>()

-	{

-		super();

-	}

-

-	/**

-	 * @see org.eclipse.rse.ui.actions.SystemAbstractPopupMenuExtensionAction#run()

-	 */

-	public void <b>run</b>()

-	{

-	}

-

-}

-

-</samp></pre>

-</p>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/ShowJarContents2.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/ShowJarContents2.html
deleted file mode 100755
index a316ea3..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/ShowJarContents2.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>ShowJarContents Class After Editing</title>

-</head>

-

-<body bgcolor="#ffffff">

-<h1>ShowJarContents Class After Editing</h1>

-<p>

-<pre><samp>

-package samples.ui.actions;

-

-import org.eclipse.jface.dialogs.MessageDialog;

-import org.eclipse.rse.core.model.IHost;

-import org.eclipse.rse.files.ui.actions.SystemAbstractRemoteFilePopupMenuExtensionAction;

-import org.eclipse.rse.shells.ui.RemoteCommandHelpers;

-import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;

-import org.eclipse.rse.subsystems.shells.core.subsystems.IRemoteCmdSubSystem;

-

-public class ShowJarContents2 extends SystemAbstractRemoteFilePopupMenuExtensionAction {

-

-	public ShowJarContents2() {

-		super();

-	}

-

-	public void run() {

-		IRemoteFile selectedFile = getFirstSelectedRemoteFile();

-		String cmdToRun = "jar -tvf " + selectedFile.getAbsolutePath();

-		runCommand(cmdToRun);

-	}

-

-	private void runCommand(String command) {

-		IRemoteCmdSubSystem cmdss = getRemoteCmdSubSystem();

-		if (cmdss != null && cmdss.isConnected()) {

-			RemoteCommandHelpers.runUniversalCommand(getShell(), command, ".", cmdss);

-		} else {

-			MessageDialog.openError(getShell(), "No command subsystem", "Found no command subsystem");

-		}

-	}

-	

-	/**

-	 * Gets the Command subsystem associated with the current host

-	 */

-	private IRemoteCmdSubSystem getRemoteCmdSubSystem() {

-		IHost myHost = getSubSystem().getHost();

-		IRemoteCmdSubSystem[] subsys = RemoteCommandHelpers.getCmdSubSystems(myHost);

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

-			if (subsys[i].getSubSystemConfiguration().supportsCommands()) {

-				return subsys[i];

-			}

-		}

-		return null;

-	}

-

-}

-</samp></pre>

-</p>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamFilterDialog.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamFilterDialog.gif
deleted file mode 100755
index 4d2ae40..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamFilterDialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamFilterWizard.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamFilterWizard.gif
deleted file mode 100755
index 1590342..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamFilterWizard.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamResource.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamResource.html
deleted file mode 100755
index 9fbe890..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamResource.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>TeamResource Class After Editing</title>

-</head>

-

-<body>

-<h1>TeamResource Class After Editing</h1>

-<pre><samp>

-package samples.model;

-

-import org.eclipse.rse.core.subsystems.AbstractResource;

-import org.eclipse.rse.core.subsystems.ISubSystem;

-

-/**

- * This models a remote resource representing a team defined on a particular system.

- */

-public class TeamResource extends AbstractResource {

-

-	private String name;

-	private DeveloperResource[] developers;

-	

-	/**

-	 * Default constructor

-	 */

-	public TeamResource()

-	{

-		super();

-	}

-	/**

-	 * Constructor for TeamResource when given a parent subsystem.

-	 */

-	public TeamResource(ISubSystem parentSubSystem)

-	{

-		super(parentSubSystem);

-	}

-	

-	/**

-	 * Returns the name.

-	 * @return String

-	 */

-	public String getName()

-	{

-		return name;

-	}

-

-	/**

-	 * Sets the name.

-	 * @param name The name to set

-	 */

-	public void setName(String name)

-	{

-		this.name = name;

-	}

-

-	/**

-	 * Returns the developers.

-	 * @return DeveloperResource[]

-	 */

-	public DeveloperResource[] getDevelopers()

-	{

-		return developers;

-	}

-

-	/**

-	 * Sets the developers.

-	 * @param developers The developers to set

-	 */

-	public void setDevelopers(DeveloperResource[] developers)

-	{

-		this.developers = developers;

-	}

-

-

-}

-</samp></pre>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamResourceAdapter.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamResourceAdapter.html
deleted file mode 100755
index c576c6c..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/TeamResourceAdapter.html
+++ /dev/null
@@ -1,228 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>TeamResourceAdapter Class After Editing</title>

-</head>

-

-<body>

-<h1>TeamResourceAdapter Class After Editing</h1>

-<pre><samp>

-package samples.model;

-

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

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

-import org.eclipse.rse.ui.SystemMenuManager;

-import org.eclipse.rse.ui.view.AbstractSystemViewAdapter;

-import org.eclipse.rse.ui.view.ISystemRemoteElementAdapter;

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

-import org.eclipse.ui.views.properties.IPropertyDescriptor;

-

-<strong>import samples.RSESamplesPlugin;</strong>

-<strong>import samples.subsystems.DeveloperSubSystem;</strong>

-

-/**

- * This is the adapter which enables us to work with our remote team resources.

- */

-public class TeamResourceAdapter extends AbstractSystemViewAdapter implements

-		ISystemRemoteElementAdapter {

-

-	/**

-	 * Constructor.

-	 */

-	public TeamResourceAdapter() {

-		super();

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#addActions(org.eclipse.rse.ui.SystemMenuManager, 

-	 * org.eclipse.jface.viewers.IStructuredSelection, org.eclipse.swt.widgets.Shell, java.lang.String)

-	 */

-	public void addActions(SystemMenuManager menu,

-			IStructuredSelection selection, Shell parent, String menuGroup)

-	{

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getImageDescriptor(java.lang.Object)

-	 */

-	public ImageDescriptor getImageDescriptor(Object element)

-	{

-		<strong>return RSESamplesPlugin.getDefault().getImageDescriptor("ICON_ID_TEAM");</strong>

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getText(java.lang.Object)

-	 */

-	public String getText(Object element)

-	{

-		<strong>return ((TeamResource)element).getName();</strong>

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getAbsoluteName(java.lang.Object)

-	 */

-	<a id="getAbsoluteName"/>public String getAbsoluteName(Object object)

-	{

-		<strong>TeamResource team = (TeamResource)object;

-		return "Team_"+team.getName();</strong>

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getType(java.lang.Object)

-	 */

-	public String getType(Object element)

-	{

-		<strong>return RSESamplesPlugin.getResourceString("property.team_resource.type");</strong>

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getParent(java.lang.Object)

-	 */

-	public Object getParent(Object element)

-	{

-		return null; // not really used, which is good because it is ambiguous

-	}

-	

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#hasChildren(java.lang.Object)

-	 */

-	public boolean hasChildren(Object element)

-	{

-		<strong>return true;</strong>

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#getChildren(java.lang.Object)

-	 */

-	public Object[] getChildren(Object element)

-	{

-		<strong>return ((TeamResource)element).getDevelopers();</strong>

-	}

-

-	/**

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#internalGetPropertyDescriptors()

-	 */

-	protected IPropertyDescriptor[] internalGetPropertyDescriptors()

-	{

-		return null;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.AbstractSystemViewAdapter#internalGetPropertyValue(java.lang.Object)

-	 */

-	protected Object internalGetPropertyValue(Object key)

-	{

-		return null;

-	}

-

-	/**

-	 * Intercept of parent method to indicate these objects can be renamed using the RSE-supplied

-	 *  rename action.

-	 */

-	<a id="canRename"/>public boolean canRename(Object element)

-	{

-		<strong>return true;</strong>

-	}

-	

-	/**

-	 * Intercept of parent method to actually do the rename. RSE supplies the rename GUI, but 

-	 *  defers the action work of renaming to this adapter method.

-	 */

-	<a id="doRename"/>public boolean doRename(Shell shell, Object element, String newName)

-	{

-		<strong>((TeamResource)element).setName(newName);

-		return true;</strong>

-	}

-	// --------------------------------------

-	// ISystemRemoteElementAdapter methods...

-	// --------------------------------------

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getAbsoluteParentName(java.lang.Object)

-	 */

-	public String getAbsoluteParentName(Object element)

-	{

-		<strong>return "root";</strong> // not really applicable as we have no unique hierarchy

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getSubSystemConfigurationId(java.lang.Object)

-	 */

-	public String getSubSystemConfigurationId(Object element)

-	{

-		<strong>return "samples.subsystems.factory";</strong> // as declared in extension in plugin.xml 

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteTypeCategory(java.lang.Object)

-	 */

-	public String getRemoteTypeCategory(Object element)

-	{

-		<strong>return "developers";</strong> // Course grained. Same for all our remote resources.

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteType(java.lang.Object)

-	 */

-	public String getRemoteType(Object element)

-	{

-		<strong>return "team";</strong> // Fine grained. Unique to this resource type.

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteSubType(java.lang.Object)

-	 */

-	public String getRemoteSubType(Object element)

-	{

-		return null; // Very fine grained. We don't use it.

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#refreshRemoteObject(java.lang.Object, java.lang.Object)

-	 */

-	<a id="refreshRemoteObject"/>public boolean refreshRemoteObject(Object oldElement, Object newElement)

-	{

-		<strong>TeamResource oldTeam = (TeamResource)oldElement;

-		TeamResource newTeam = (TeamResource)newElement;

-		newTeam.setName(oldTeam.getName());

-		return false;</strong> // If developer objects held references to their team names, we'd have to return true

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteParent(org.eclipse.swt.widgets.Shell, java.lang.Object)

-	 */

-	public Object getRemoteParent(Shell shell, Object element) throws Exception

-	{

-		return null; // maybe this would be a Project or Roster object, or leave as null if this is the root 

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#getRemoteParentNamesInUse(org.eclipse.swt.widgets.Shell, java.lang.Object)

-	 */

-	<a id="getNames"/>public String[] getRemoteParentNamesInUse(Shell shell, Object element)

-			throws Exception

-	{

-		<strong>DeveloperSubSystem ourSS = (DeveloperSubSystem)getSubSystem(element);

-		TeamResource[] allTeams = ourSS.getAllTeams();

-		String[] allNames = new String[allTeams.length];

-		for (int idx = 0; idx &lt; allTeams.length; idx++)

-		  allNames[idx] = allTeams[idx].getName();

-		return allNames;</strong> // Return list of all team names 	

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.rse.ui.view.ISystemRemoteElementAdapter#supportsUserDefinedActions(java.lang.Object)

-	 */

-	public boolean supportsUserDefinedActions(Object object) {

-		<strong>return false;</strong>

-	}

-

-}

-</samp></pre>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/index.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/index.html
deleted file mode 100755
index c6cd775..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/index.html
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/newFilterAction.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/newFilterAction.gif
deleted file mode 100755
index 0883a89..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/newFilterAction.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_1.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_1.gif
deleted file mode 100755
index 717f78d..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_1.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props1.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props1.gif
deleted file mode 100755
index 21548f3..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props1.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2.gif
deleted file mode 100755
index 1d3b9ac..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2_addvar1.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2_addvar1.gif
deleted file mode 100755
index 0f24645..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2_addvar1.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2_addvar2.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2_addvar2.gif
deleted file mode 100755
index a417d2b..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props2_addvar2.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3.gif
deleted file mode 100755
index 3f985d8..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3_addvar1.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3_addvar1.gif
deleted file mode 100755
index add8e33..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3_addvar1.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3_addvar2.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3_addvar2.gif
deleted file mode 100755
index 6ab3d12..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props3_addvar2.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props4.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props4.gif
deleted file mode 100755
index 78683a7..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props4.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar1.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar1.gif
deleted file mode 100755
index 0106bbd..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar1.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar1_selectFolder.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar1_selectFolder.gif
deleted file mode 100755
index bf4d743..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar1_selectFolder.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar2.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar2.gif
deleted file mode 100755
index bad6554..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar2.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar3.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar3.gif
deleted file mode 100755
index 134ecca..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar3.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar4.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar4.gif
deleted file mode 100755
index 493a7c8..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar4.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar5.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar5.gif
deleted file mode 100755
index 8ec5cb2..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_addvar5.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_newVar_msg.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_newVar_msg.gif
deleted file mode 100755
index 8ec5cb2..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_props_newVar_msg.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_after.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_after.gif
deleted file mode 100755
index 53fa300..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_after.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page1.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page1.gif
deleted file mode 100755
index e4fdfff..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page1.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page3.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page3.gif
deleted file mode 100755
index 5c42bae..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page3.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page4.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page4.gif
deleted file mode 100755
index 8bbc87b..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProj_wiz_page4.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProject.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProject.html
deleted file mode 100755
index fd07da1..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/pdeProject.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-	<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>Creating a Plug-in Project</title>

-</head>

-

-	<body bgcolor="#ffffff">

-		<h1>Creating a Plug-in Project</h1>

-		<p>To use any Eclipse extension point, including those defined by the Remote System Explorer, you must first create a plug-in project using the plug-in development environment (PDE), which you will do shortly. At its simplest, a plug-in project requires a <tt>MANIFEST.MF</tt> file describing the plugin and its dependencies and, if extending the workbench a <samp>plugin.xml</samp> file identifying the extension points being implemented, and a set of Java classes implementing those extension points. There is usually also a plug-in class file that is used as the overall manager of the project, and point of integration that other classes can rely on.</p>

-		<p><i>If you already have a plugin project, you will need to update it slightly to make it extend SystemBasePlugin and add the few methods it requires. You may wish to examine these steps to see what methods to add. The Eclipse environment will keep your classpaths and plugin dependecies in sync for you.</i></p>

-		<p>Eclipse supplies a number of plug-in project templates, which generate a number of project files that illustrate examples of various Eclipse extension points. While you are free to pick one of these, or indeed start with any existing plug-in project if you have one, in the RSE tutorials everything is created by hand so as to keep focused on the RSE-required classes and files.</p>

-		<p>The following tutorial uses numbered steps to indicate where you are required to do something as you follow along.</p>

-		<h2>Step By Step: Creating an RSE Plug-in Project</h2>

-		<ol>

-			<li>Select <b>File-&gt;New-&gt;Project.</b>

-			<li>On the left of the dialog box, select <b>Plug-in Development</b> category, and on the right, select the <b><a href="pdeProj_1.gif">Plug-in Project</a></b> wizard. Press <b>Next &gt;</b>.

-			<li>In the <a href="pdeProj_wiz_page1.gif">first page</a> of the wizard (Plug-in Project Name), enter <b>&quot;RSESamples&quot;</b> for the project name (without the quotes). Press <b>Next &gt;</b>.

-			<li>In the second page of the wizard (Plug-in Project Structure), just take the defaults, and press <b>Next &gt;</b>.

-			<li>In the <a href="pdeProj_wiz_page3.gif">third page</a> of the wizard (Plug-in Code Generators), select <b>&quot;Default Plug-in Structure&quot;</b>, and press <b>Next &gt;</b>.

-			<li>In the <a href="pdeProj_wiz_page4.gif">fourth page</a> of the wizard (Simple Plug-in Content), enter your company for the <b>Provider Name</b>, and press <b>Finish</b>.

-			<li>Your new plugin project is created and visible in the Package Explorer of the Plug-in Development perspective. Your new <samp>plugin.xml</samp> file is also open in the <a href="pdeProj_wiz_after.gif">plug-in editor</a>. <i>Close this editor</i>, as you will not be using it in this tutorial.

-			

-			<li>Select the <samp>plugin.xml</samp> file, right click and select <b>Open</b>. Go to the dependencies tab and add the following plugins to the list:

-			<ul>

-			<li>org.eclipse.rse.ui

-			<li>org.eclipse.rse.services

-			<li>org.eclipse.rse.files.ui

-			<li>org.eclipse.rse.shells.ui

-			<li>org.rse.eclipse.subsystems.files.core

-			<li>org.rse.subsystems.shells.core

-			</ul>

-			<li>Expand the <b>src</b> folder, then the <b>RSESamples</b> package folder, and double-click on <samp><b>RSESamplesPlugin.java</b></samp> to edit this class to make it look like <a href="RSESamplesPlugin.html">this</a>.

-			

-			<li>Create the project's resources file for translatable strings: right-click on the <b>RSESamples</b> project and select <b>New-&gt;File</b> to open the <b>New File</b> wizard. Enter <samp><b>rseSamplesResources.properties</b></samp> for the file name, as was specified in the call to <samp>loadResourceBundle</samp> in the plug-in class's constructor. Press <b>Finish</b> to create the file. You will populate as you go through the tutorials, so for now just <i>close</i> the editor opened for the file.

-			

-			<li>Create the project's RSE-style messages file for translatable messages: right-click on the <b>RSESamples</b> project and select <b>New-&gt;File</b> to get the <b>New File</b> wizard. Enter <samp><b>rseSamplesMessages.xml</b></samp> for the file name, as was specified in the call to <samp>loadMessageFile</samp> in the plug-in class's constructor. Press <b>Finish</b> to create the file. You will see the XML editor open for the new file. Press the <b>Source</b> tab at the bottom of the editor, and enter the following lines (so that you can add messages to the file later on):

-				<pre><code>

-&lt;?xml version=&quot;1.0&quot; encoding='UTF-8'?&gt;

-&lt;!DOCTYPE MessageFile SYSTEM &quot;../org.eclipse.rse.ui/messageFile.dtd&quot;&gt;

-&lt;!-- This is a message file used by SystemMessage and SystemMessageDialog --&gt;

-&lt;<b>MessageFile</b> Version=&quot;1.0&quot;&gt;

-     &lt;<b>Component</b> Name=&quot;RSE Samples&quot; Abbr=&quot;RSS&quot;&gt;

-          &lt;<b>Subcomponent</b> Name=&quot;General&quot; Abbr=&quot;G&quot;&gt;

-                &lt;<b>MessageList</b>&gt;

-                    &lt;<b>Message</b> ID=&quot;1001&quot; Indicator=&quot;E&quot;&gt;

-                          &lt;<b>LevelOne</b>&gt;Sample message&lt;/<b>LevelOne</b>&gt;		

-                          &lt;<b>LevelTwo</b>&gt;This is a sample with one substution variable: %1&lt;/<b>LevelTwo</b>&gt;

-                    &lt;/<b>Message</b>&gt;

-                &lt;/<b>MessageList</b>&gt;

-          &lt;/<b>Subcomponent</b>&gt;

-     &lt;/<b>Component</b>&gt;

-&lt;/<b>MessageFile</b>&gt;

-</code></pre>

-				Save and close the file.

-			<li>That's it! Your plugin is created and you are ready to go. Now you only need to add code, to implement the extension points.

-		</ol>

-	</body>

-

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup.html
deleted file mode 100755
index aa95624..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2007. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Creating a Remote Resource Popup Menu Action</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Creating a Remote Resource pop-up Menu Action</h1>
-<p>In this tutorial, you will use the 
-<samp><A href="../plugin/popup.html">org.eclipse.ui.popupMenus</a></samp> extension point to
-create a pop-up menu action that will appear
-in the context menu for any <samp>.jar</samp> file, for any connection to 
-any system type. The action will be labeled "Show contents" and will simply
-run the <samp>jar -tvf</samp> JDK command when selected, displaying the results
-in the command console. You could expand this example to  copy the file 
-to a local temporary folder, extract the list of file names within the jar, and 
-display those names in an Eclipse table view. 
-</p>
-
-<p><b>Tip:</b> If you prefer your Java code to use lined-up braces, select the
-first two options in the <b><A href="preferences_JavaFormatting.gif">Code
-Formatter</A></b> preferences page for <b>Java</b>, via <b>Windows-&gt;Preferences</b>.
-
-This will affect code generated by wizards. The source code shown assumes this option has been set, but this is not required.
-
-<h2>Step-by-Step: Creating an RSE Remote Resource Pop-up Menu Action</h2>
-
-<ol>
-<li>If you have not already, first <a href="pdeProject.html">create or prepare a plugin project</a>. 
-</li>
-<li>Open the <b>plugin.xml</b> file for editing by right-clicking on it and selecting
-<b>Open With-&gt;Text Editor</b>. Before the ending &lt;/plugin&gt; statement, add the following lines:
-<pre><code>
-   &lt;!-- ======================================= --&gt;
-   &lt;!-- Remote Object Popup Menu Actions        --&gt;
-   &lt;!-- ======================================= --&gt;
-   &lt;extension point=&quot;org.eclipse.ui.popupMenus&quot;&gt;
-      &lt;objectContribution
-               objectClass=&quot;org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile&quot;
-               namefilter=&quot;*.jar&quot;´
-               id=&quot;actions.jar&quot;&gt;
-           &lt;action
-                   label=&quot;Show contents&quot;
-                   tooltip=&quot;List contents of this file&quot;
-                   class=&quot;samples.ui.actions.ShowJarContents&quot;
-                   menubarPath=&quot;additions&quot;
-                   enablesFor=&quot;1&quot;
-                   id=&quot;actions.jar.show&quot;&gt;
-           &lt;/action&gt;
-       &lt;/objectContribution&gt;
-    &lt;/extension&gt;
-</code></pre>
-Save and close the file.
-</li>
-<li>
-Create the Java package: right-click on the <B>src</B> source folder and select <B>New-&gt;Package</B> to open the <B>New
-	Java Package</B> wizard. Enter <B>&quot;samples.ui.actions&quot;</B> for the name of the package and press <B>Finish</B>.</li>
-<li>
-Create the Java class: right-click on the new <B>&quot;samples.ui.actions&quot;</B> package folder and select <B>New-&gt;Class</B>  to open the <B>New
-Java Class</B> wizard. Enter <B>&quot;ShowJarContents&quot;</B> for the <b>Name</b>  
-and <b>&quot;org.eclipse.rse.files.ui.actions.SystemAbstractRemoteFilePopupMenuExtensionAction&quot;</b> 
-for the <b>Superclass</b>. Select the <b>Constructors from superclass</b> check box, as shown 
-<A href="popup_newClass.gif">here</A>. 
-Press <b>Finish</b> to create the <samp><a href="ShowJarContents1.html">ShowJarContents</a></samp> class.
-</li>
-<li>Edit the generated <samp>ShowJarContents.java</samp> file as follows:
-<ol>
-  <li type="i">Add the following three statements to the body of the <samp>run()</samp> method:</li>
-  <pre><code>
-		IRemoteFile selectedFile = getFirstSelectedRemoteFile();
-		String cmdToRun = "jar -tvf " + selectedFile.getAbsolutePath();
-		runCommand(cmdToRun);  
-  </code></pre>
-  <li type="i">Add the following two methods to find the subsystem and run the command:</li>
-  <pre><code>
-	private void runCommand(String command) {
-		IRemoteCmdSubSystem cmdss = getRemoteCmdSubSystem();
-		if (cmdss != null && cmdss.isConnected()) {
-			RemoteCommandHelpers.runUniversalCommand(getShell(), command, ".", cmdss);
-		} else {
-			MessageDialog.openError(getShell(), "No command subsystem", "Found no command subsystem");
-		}
-	}
-	
-	/**
-	 * Gets the Command subsystem associated with the current host
-	 */
-	private IRemoteCmdSubSystem getRemoteCmdSubSystem() {
-		IHost myHost = getSubSystem().getHost();
-		IRemoteCmdSubSystem[] subsys = RemoteCommandHelpers.getCmdSubSystems(myHost);
-		for (int i = 0; i < subsys.length; i++) {
-			if (subsys[i].getSubSystemConfiguration().supportsCommands()) {
-				return subsys[i];
-			}
-		}
-		return null;
-	}
-  </code></pre>
-  <li type="i">User the "Source -> Organize Imports" context menu item to add the appropriate import statements.</li>
-</ol>
-The final result after editing is shown <a href="ShowJarContents2.html">here</a>.
-</li>
-</ol>
-
-<p>Thats it! Now, you can try your new action. Use <b>Run-&gt;Run As-&gt;Run-time Workbench</b>. Drill
-down in the RSE to a Jar file in a local or remote connection and right-click to <a href="popup_see.gif">see</a> and <a href="popup_run.gif">run</a> your new action. Notice
-how it does not appear for files that do not end with the ".jar" extension. This is because of  the "namefilter" attribute
-in our extension point .xml file.
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_newClass.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_newClass.gif
deleted file mode 100755
index 1e097dc..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_newClass.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_run.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_run.gif
deleted file mode 100755
index e6646d3..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_run.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_see.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_see.gif
deleted file mode 100755
index 5a1734f..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/popup_see.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/preferences_JavaFormatting.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/preferences_JavaFormatting.gif
deleted file mode 100755
index 80b15a2..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/preferences_JavaFormatting.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage.html
deleted file mode 100755
index a45195e..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Creating a Remote Resource Property Page</title>
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Creating a Remote Resource Property Page</h1>
-<p>In this tutorial, you will use the 
-<samp><A href="../plugin/propertypage.html">org.eclipse.ui.propertyPages</a></samp>
-extension point to
-create a <a href="propertypage_run_done.gif">property page</a> that will appear
-in the Properties dialog for any folder, for any connection to 
-any system type. The page will be labeled "Folder Contents" and will show the
-cumulative size of the contents of the folder, and the number of folders and files within it. 
-This will show the extension point, plus how to use some of the RSE user interface helpers, as well
-as the remote file API for querying information about remote folders and files.
-</p>
-
-<p><b>Tip:</b> If you prefer your Java code to use lined-up braces, select the
-first two options in the <b><A href="preferences_JavaFormatting.gif">Code
-Formatter</A></b> preferences page for <b>Java</b>, via <b>Windows-&gt;Preferences</b>.
-
-This will affect code generated by wizards. The source code shown assumes this option has been set, but this is not required.
-
-
-
-
-<h2>Step-by-Step: Creating a Remote Resource Property Page</h2>
-<ol>
-<li>If you have not already, first <a href="pdeProject.html">create or prepare a plugin project</a>. 
-
-Open the <b>plugin.xml</b> file for editing by right-clicking on it, and selecting
-<b>Open With-&gt;Text Editor</b>. Before the ending &lt;/plugin&gt; statement, add the following lines:
-<pre><code>
-   &lt;!-- ======================================= --&gt;
-   &lt;!-- Remote Object Property Pages            --&gt;
-   &lt;!-- ======================================= --&gt;
-   &lt;extension point=&quot;org.eclipse.ui.propertyPages&quot;&gt;
-       &lt;page name=&quot;Folder Contents&quot;
-               class=&quot;samples.ui.propertypages.FolderInfoPropertyPage&quot;
-               id=&quot;samples.ui.PropertyPage1&quot;&gt;
-           &lt;enabledWhen&gt;
-               &lt;instanceof value=&quot;org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile&quot;/&gt;                        
-           &lt;/enabledWhen&gt;
-           &lt;filter name=&quot;isDirectory&quot; value=&quot;true&quot;/&gt;  
-        &lt;/page&gt;
-   &lt;/extension&gt;    
-</code></pre></li>
-<li>Save and close the file.</li>
-<li>
-Create the Java package: right-click on the <B>src</B> source folder and select <B>New-&gt;Package</B> to get the <B>New
-	Java Package</B> wizard. Enter <B>&quot;samples.ui.propertypages&quot;</B> for the name of the package and press <B>Finish</B>.</li>
-<li>
-Create the Java class: right-click on the new <B>&quot;samples.ui.propertypages&quot;</B> package folder and select <B>New-&gt;Class</B>  to open the <B>New
-Java Class</B> wizard. Enter <B>&quot;FolderInfoPropertyPage&quot;</B> for the <b>Name</b>  
-and <b>&quot;org.eclipse.rse.files.ui.propertypages.SystemAbstractRemoteFilePropertyPageExtensionAction&quot;</b> 
-for the <b>Superclass</b>. Select the <b>Constructors from superclass</b> check box, as shown 
-<A href="propertypage_newClass.gif">here</A>. 
-Press <b>Finish</b> to create the <samp><a href="FolderInfoPropertyPage1.html">FolderInfoPropertyPage</a></samp> class.
-</li>
-<li>Edit the <samp>FolderInfoPropertyPage</samp> class to look like <A href="FolderInfoPropertyPage2.html">this</A>. There are many changes, so you should use
-the clipboard to copy and paste.
-</li>
-<li>Edit the <samp>rseSamplesMesssage.xml</samp> file to look like <A href="rseSamplesMessages2.html">this</A>, where the changes are highlighted.
-</li>
-<li>Edit the <samp>rseSamplesResources.properties</samp> file to look like <A href="rseSamplesResources2.html">this</A>.
-</li>
-</ol>
-
-<p>Thats it! Now, you can try out your new property page. Use <b>Run-&gt;Run As-&gt;Run-time Workbench</b>. Drill
-down in the RSE to a folder in a local or remote connection and right-click to <a href="propertypage_see.gif">see</a> 
-and <a href="propertypage_run_during.gif">run</a> your new property page. This sample is a unique case, in that this operation could potentially run for a long time, as you are recursively walking all
-the sub-folders and files to accumulate the size and count information. Because of this, we put this work
-in a background thread, and update the GUI as each sub-folder is processed. We also supply a stop button
-to the user and watch for them pressing Cancel or closing the dialog. When the thread ends, the
-result looks like <a href="propertypage_run_done.gif">this</a>.
-<p>Notice how this property page only appears for folders, due to the <b><samp>&lt;filter name="isDirectory&gt;</samp></b> markup
-in our extension point xml.
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_newClass.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_newClass.gif
deleted file mode 100755
index 32531d3..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_newClass.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_run_done.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_run_done.gif
deleted file mode 100755
index 084a08e..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_run_done.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_run_during.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_run_during.gif
deleted file mode 100755
index b14fcf5..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_run_during.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_see.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_see.gif
deleted file mode 100755
index 9f5d488..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/propertypage_see.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/renameAction.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/renameAction.gif
deleted file mode 100755
index 4812598..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/renameAction.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/renameDialog.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/renameDialog.gif
deleted file mode 100755
index c04042c..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/renameDialog.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesMessages2.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesMessages2.html
deleted file mode 100755
index ea240dd..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesMessages2.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>rseSamplesMessages Message File After Editing</title>

-</head>

-

-<body bgcolor="#ffffff">

-<h1>rseSamplesMessages Message File After Editing</h1>

-<p>

-<pre><samp>

-&lt;?xml version=&quot;1.0&quot; encoding='UTF-8'?&gt;

-&lt;!DOCTYPE MessageFile SYSTEM &quot;../org.eclipse.rse.ui/messageFile.dtd&quot;&gt;

-&lt;!-- This is a message file used by SystemMessage and SystemMessageDialog --&gt;

-&lt;MessageFile Version=&quot;1.0&quot;&gt;

-     &lt;Component Name=&quot;RSE Samples&quot; Abbr=&quot;RSS&quot;&gt;

-          &lt;Subcomponent Name=&quot;General&quot; Abbr=&quot;G&quot;&gt;

-                &lt;MessageList&gt;

-                    &lt;Message ID=&quot;1001&quot; Indicator=&quot;E&quot;&gt;

-                          &lt;LevelOne&gt;Sample message&lt;/LevelOne&gt;		

-                          &lt;LevelTwo&gt;This is a sample with one substution variable: %1&lt;/LevelTwo&gt;

-                    &lt;/Message&gt;

-                    <b>&lt;Message ID=&quot;1002&quot; Indicator=&quot;I&quot;&gt;</b>

-                          <b>&lt;LevelOne&gt;Processing...&lt;/LevelOne&gt;</b>

-                          <b>&lt;LevelTwo&gt;&lt;/LevelTwo&gt;</b>

-                    <b>&lt;/Message&gt;</b>

-                &lt;/MessageList&gt;

-          &lt;/Subcomponent&gt;

-     &lt;/Component&gt;

-&lt;/MessageFile&gt;

-</samp></pre>

-</p>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources2.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources2.html
deleted file mode 100755
index dae089a..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources2.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>rseSamplesResources Properties File After Editing</title>

-</head>

-

-<body bgcolor="#ffffff">

-<h1>rseSamplesResources Properties File After Editing</h1>

-<p>

-<pre><samp>

-pp.size.label=Size

-pp.size.tooltip=Cumulative size, in bytes

-pp.files.label=Files

-pp.files.tooltip=Cumulative number of files

-pp.folders.label=Folders

-pp.folders.tooltip=Cumulative number of folders

-pp.stopButton.label=Stop

-pp.stopButton.tooltip=Cancel the thread

-</samp></pre>

-</p>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources3.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources3.html
deleted file mode 100755
index 93b3df7..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources3.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>rseSamplesResources Properties File After Editing</title>

-</head>

-

-<body>

-<h1>rseSamplesResources Properties File After Editing</h1>

-<pre><samp>

-pp.size.label=Size

-pp.size.tooltip=Cumulative size, in bytes

-pp.files.label=Files

-pp.files.tooltip=Cumulative number of files

-pp.folders.label=Folders

-pp.folders.tooltip=Cumulative number of folders

-pp.stopButton.label=Stop

-pp.stopButton.tooltip=Cancel the thread

-

-<b>property.type.teamfilter=Team filter</b>

-</samp></pre>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources4.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources4.html
deleted file mode 100755
index 6b91d8a..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/rseSamplesResources4.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>rseSamplesResources Properties File After Editing</title>

-</head>

-

-<body>

-<h1>rseSamplesResources Properties File After Editing</h1>

-<pre><samp>

-pp.size.label=Size

-pp.size.tooltip=Cumulative size, in bytes

-pp.files.label=Files

-pp.files.tooltip=Cumulative number of files

-pp.folders.label=Folders

-pp.folders.tooltip=Cumulative number of folders

-pp.stopButton.label=Stop

-pp.stopButton.tooltip=Cancel the thread

-

-property.type.teamfilter=Team filter

-<b>property.type.devrfilter=Developer filter

-

-filter.team.dlgtitle=Change Team Filter

-filter.team.pagetitle=Team Filter

-filter.team.pagetext=Create a new filter to list teams

-

-filter.devr.dlgtitle=Change Developer Filter

-filter.devr.pagetitle=Developer Filter

-filter.devr.pagetext=Create a new filter to list developers

-filter.devr.teamprompt.label=Parent team

-filter.devr.teamprompt.tooltip=Specify the team within which to list developers

-filter.devr.devrprompt.label=Developers

-filter.devr.devrprompt.tooltip=Specify a simple or generic developer name pattern

-</b>

-</samp></pre>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/runIt1.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/runIt1.gif
deleted file mode 100755
index 57af6bf..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/runIt1.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/runIt2.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/runIt2.gif
deleted file mode 100755
index 41b63a4..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/runIt2.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/startup.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/startup.html
deleted file mode 100755
index 7e715b6..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/startup.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">

-<html>

-

-<head>

-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">

-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">

-<title>Startup Method in RSESamplesPlugin</title>

-</head>

-

-<body>

-<h1>Startup Method in RSESamplesPlugin</h1>

-<pre><samp>

-	public void startup() throws CoreException 

-	{

-		super.startup();

-		<b>IAdapterManager manager = Platform.getAdapterManager();

-		samples.model.DeveloperAdapterFactory factory = new samples.model.DeveloperAdapterFactory();

-		manager.registerAdapters(factory, samples.model.TeamResource.class);

-		manager.registerAdapters(factory, samples.model.DeveloperResource.class);</b>

-	}    

-</samp></pre>

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/subsystem.html b/core/org.eclipse.ptp.doc.isv/guide/tutorial/subsystem.html
deleted file mode 100755
index d7e960d..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/subsystem.html
+++ /dev/null
@@ -1,246 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<LINK REL="STYLESHEET" HREF="../../book.css" TYPE="text/css">
-<title>Creating a Subsystem Configuration</title>
-</head>
-
-<body>
-<h1>Creating a Subsystem Configuration</h1>
-<p>In this tutorial you will use the RSE <A href="../../reference/extension-points/org_eclipse_rse_core_subsystemConfigurations.html">subsystemConfigurations</A> extension point to show new subsystems within connections, which will then appear when those connections are expanded. Effectively, you will add a new <i>remote-accessing tool</i> to the Remote System Explorer.</p>
-<p>
-A full-blown tutorial to illustrate this extension point is a bit difficult without inventing
-server-side code and a communication layer for that server-side code to communication with the
-client-side subsystem. Rather than becoming bogged down in these details, this tutorial will not
-write server-side code or a communications-layer, but instead will hard-code the remote resources
-on the client-side so as to focus discussion on the client-side code. The extension point assumes
-you already have server-side code and a communication layer you now want to exploit within
-Eclipse.
-</p>
-		<p>When you are finished you should have a working subsystem similar to the one found in the org.eclipse.rse.examples.tutorial plugin.</p>
-		<h2>Scenario</h2>
-		<p>This tutorial pretends that you have server-side code which manages user profiles for developers and teams of developers. We assume there is a master list of developers identified for development access to this server, and there is a grouping mechanism that allows developers to be assigned to named teams. A developer may exist on multiple teams. Each developer can have one or more <i>roles</i> which may affect what they are allowed to access.</p>
-<p>In this tutorial you will define a subsystem for working with these resources in the remote system identified by the connection. This will first list teams and then developers within teams. Roles will be accessible via an action.</p>
-<p><i>Do not worry about how useful or realistic the example is. The point of the exercise is
-show the code necessary to fully enable new subsystems. It is up to the subsystem developer to
-decide what resources to expose and what actions on those resources.</i></p>
-
-<br>
-<hr>
-
-
-<h2>Step By Step: Creating a Subsystem Configuration</h2>
-		<p>If you have not already, first <a href="pdeProject.html">create or prepare a plugin project</a>
-We will follow the steps listed in the <A href="../plugin/subsystem.html#steps">Overview of Steps</A> section in the description of the plugin.</p>
-		<ol>
-<li>Create a package named <samp><b>samples.subsystems</b></samp>, by right-clicking on the <samp>src</samp> folder 
-and using the <b>New-&gt;Package</b> wizard. In the new package, create an empty interface named <A href="IDeveloperSubSystem.html"><samp>IDeveloperSubSystem</samp></A>, by right-clicking on the package and selecting <b>New-&gt;Interface</b>. 
-</li>
-<li>Also in package <samp>samples.subsystems</samp>, use <b>New-&gt;Class</b> to
-create a class named <samp><b>DeveloperConnectorService</b></samp> that extends <b>superclass</b> 
-<samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorService.html">AbstractConnectorService</A></samp>,
-selecting the option to include <b>Constructors from superclass</b>. Edit the result to add
-a <samp>connected</samp> instance variable that is used in the methods, as shown in bold <a href="DeveloperConnectorService.html">here</a>.
-</li>
-<li>Again in package <samp>samples.subsystems</samp>, use <b>New-&gt;Class</b> to
-create a class named <samp><b>DeveloperConnectorServiceManager</b></samp> that extends <b>superclass</b> 
-<samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractConnectorServiceManager.html">AbstractSystemManager</A></samp>,
-selecting the option to include <b>Constructors from superclass</b>. Edit the result to add
-a factory method, and flesh out the methods, as highlighted <a href="DeveloperConnectorServiceManager.html">here</a>.
-</li>
-<li>Create a package named <samp><b>samples.model</b></samp>. Create two classes in it: 
-<b><samp>TeamResource</samp></b> and <b><samp>DeveloperResource</samp></b>, each of which extend
-<A href="../../reference/api/org/eclipse/rse/core/subsystems/AbstractResource.html"><samp>AbstractResource</samp></A>.
-  <ol>
-    <li type="i">Edit <samp>DeveloperResource</samp> to add <samp>name</samp>, <samp>id</samp>, and <samp>deptNbr</samp> properties, as shown in bold <a href="DeveloperResource.html">here</a>. You can use the refactoring support in eclipse to generate the getters and setters for these properties.<li type="i">Edit <samp>TeamResource</samp> to add <samp>name</samp> and <samp>developers</samp> (array) properties, 
-    as shown in bold <a href="TeamResource.html">here</a>.
-  </ol>
-<li>You need to think about  filter support. For now, you can keep it simple: users can only create filters that list teams,
-by specifying a single string that is either a scalar or a generic team name. If scalar, one team will be shown when the filter is expanded.
-If generic, all teams matching the generic pattern will be listed. Given the simplicity, you will not need to create a filter string class to perform 
-parsing. As a result, you have nothing to do for this step.</li>
-<li>Return to package <samp>samples.subsystems</samp>, and create class <b><samp>DeveloperSubSystem</samp></b>
-that extends <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystem.html">SubSystem</A></samp>.
-Edit the generated class to add code highlighted <a href="DeveloperSubSystem.html">here</a>.</li>
-<li>Again in package <samp>samples.subsystems</samp>, create class <b><samp>DeveloperSubSystemConfiguration</samp></b>
-that extends <samp><A href="../../reference/api/org/eclipse/rse/core/subsystems/SubSystemConfiguration.html">SubSystemConfiguration</A></samp>.
-Edit the generated class to add code highlighted <a href="DeveloperSubSystemConfiguration.html">here</a>.
-</li>
-<li>In the project's root folder, find and edit file <samp>rseSamplesResources.properties</samp> and 
-add the line highlighted <a href="rseSamplesResources3.html">here</a>.
-</li>
-<li>Update your <samp>plugin.xml</samp> file to include the following lines:
-<pre><samp>
-   &lt;!-- ======================================= --&gt;
-   &lt;!-- SubSystem Configuration                 --&gt;
-   &lt;!-- ======================================= --&gt;
-   &lt;extension point=&quot;org.eclipse.rse.core.subsystemConfigurations&quot;&gt;
-        &lt;configuration
-             id=&quot;samples.subsystems.factory&quot;
-             systemTypeIds=&quot;org.eclipse.rse.systemtype.linux;org.eclipse.rse.systemtype.unix;org.eclipse.rse.systemtype.windows&quot;
-             name=&quot;Teams&quot;
-             class=&quot;samples.subsystems.DeveloperSubSystemConfiguration&quot;
-             category=&quot;users&quot;
-             vendor=&quot;ACME&quot;
-        &gt;
-        &lt;/configuration&gt;
-   &lt;/extension&gt;            
-</samp></pre>
-<b>Note:</b> You would normal use the <samp>icon</samp> and <samp>iconlive</samp> attributes to specify 
-a unique icon for your subsystem, but to keep it simple here, just use the default icon. Also, the
-<samp>priority</samp> attribute has been left out for simplicity.
-</li>
-</ol>
-		<p>Now you are far enough along that you can try our what you have, before proceeding. Select
-<b>Run-&gt;Run As-&gt;Run-time workbench</b>. Create a new Linux connection in the RSE, and 
-expand it. You'll now see your <A href="runIt1.gif">new subsystem</A>, which you can expand
-to see its default filter, which in turn you can expand to see your hardcoded list of teams:<br>
-<IMG border="0" src="runIt1.gif" width="800" height="514">
-<br>
-You will be prompted for a user ID and password, but since the system class does not really 
-connect, enter anything you like!
-<p>Eventually, you will be able to expand a team to see its developers.</p>
-<p>Now it is time to work on the appearance and functions of those remote resources. You will do this
-by creating adapters for the resources:</p>
-<ol start="10">
- <li>Select the <samp>samples.model</samp> package, and:
-   <ol>
-   <li type="i">Create a new class named <samp>TeamResourceAdapter</samp> that extends <a href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html"><samp>AbstractSystemViewAdapter</samp></A> and implements
-       <a href="../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html"><samp>ISystemRemoteElementAdapter</samp></A>. 
-       Edit the generated class and add the code highlighted <a href="TeamResourceAdapter.html"><b>here</b></a>.
-   </li>
-   <li type="i">Create a new class named <b><samp>DeveloperResourceAdapter</samp></b>
-       that extends <a href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html"><samp>AbstractSystemViewAdapter</samp></a> and implements
-       <a href="../../reference/api/org/eclipse/rse/ui/view/ISystemRemoteElementAdapter.html"><samp>ISystemRemoteElementAdapter</samp></A>. 
-       Edit the generated class and add the code highlighted <a href="DeveloperResourceAdapter.html"><b>here</b></a>.
-   </li>
-   <li type="i">Next, you need the icons for your remote resources, which you referred to in your adapters. Edit the <samp>RSESamplesPlugin</samp> file and edit the <samp>initializeImageRegistry</samp>
-       to add the lines of code highlighted <a href="InitializeImageRegistry.html"><b>here</b></a>. Now, you need the icons. Select the <samp>RSESamplesPlugin</samp> project, right-click and select <b>New-&gt;Folder</b> and create a folder named <b>icons</b>. Select the new folder, and use <b>File-&gt;Import</b> to 
-       import the <samp>team.gif</samp> and <samp>developer.gif</samp> files from the <samp>org.eclipse.rse.examples.tutorial/icons</samp> folder.</li>
-   </ol>
- </li>
- <li>Creating the adapters does nothing until you register them with the platform. To do that, you need
- an adapter factory class and you need to register it with the platform:
-   <ol>
-     <li type="i">Select the <samp>samples.model</samp> package and in it create a class named
-     <b>DeveloperAdapterFactory</b> that extends <samp><a href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemRemoteAdapterFactory.html">AbstractSystemRemoteAdapterFactory</a></samp> 
-     and implements interface <samp><b>org.eclipse.core.runtime.IAdapterFactory</b></samp>.
-     Edit the generate class as per the highlighted code <a href="DeveloperAdapterFactory.html"><b>here</b></a>.
-     </li>
-     <li type="i">Back in the <samp>RSESamplesPlugin</samp> class, add the highlighted code 
-     <b><a href="startup.html">here</a></b> to your <samp>startup</samp> method.
-     </li>
-   </ol>
-</li>
-</ol>
-
-<p>Once again, run the workbench to see your new subsystem:<br>
-<IMG border="0" src="runIt2.gif" width="886" height="594"><br>
-It is looking better now! There are icons and labels, and the team resources are expandable. Try the following things with
-your new subsystem resources:</p>
-<ul>
-<li>Right-click on <samp>Team 1</samp> and select the <a href="renameAction.gif">rename action</A>. The rename action is enabled because you
-overwrote <a href="TeamResourceAdapter.html#canRename">canRename</a> in the team resource adapter class. Try renaming it to a name already in use.
-The <a href="renameDialog.gif">rename dialog</a> can catch this error because we returned the list of names in use in 
-the <a href="TeamResourceAdapter.html#getNames">getRemoteParentNamesInUse</a>
-method in our team resource adapter class. Rename to a new name. The rename in fact happens because we implemented
-the <a href="TeamResourceAdapter.html#doRename">doRename</a> method.
-<li>The default filter <samp>All teams</samp> exists because we wrote code to create it in our <a href="DeveloperSubSystemConfiguration.html#createDefaultFilterPool">createDefaultFilterPool</a> method of our subsystem configuration. Try creating a new filter: right-click on <samp>Teams</samp> subsystem and select 
-<a href="newFilterAction.gif">New-&gt;Filter</a> to get the
-<a href="NewFilterWizard.gif">New Filter wizard</a>. Enter <samp>*2</samp>, press <b>Next</b>, and 
-enter <samp>Test filter</samp> for the filter name. Press <b>Finish</b>
-to create the filter. Expand it, and you will see that only teams whose name ends with "2" are shown:<br>
-<IMG border="0" src="testFilter.gif">
-<br>
-Filter support is free in the RSE,
-but you do have to write our own code to apply that filter pattern as you see fit. In this case, we did this in our 
-<a href="DeveloperSubSystem.html#resolveFilterString">internalResolveFilterString</a> method of our subsystem.<li>Notice how a resource like team can display multiple times, by different filters that resolve to it.
-Rename <samp>Team 2</samp> shown under the new expanded <samp>Test filter</samp>, and notice how it is successfully
-renamed under both filters. This ability to refresh the name in all occurrences of the same resource is made
-possible by the adapter methods <a href="TeamResourceAdapter.html#getAbsoluteName">getAbsoluteName</a>, which helps
-RSE find redundant copies of the same object, and <a href="TeamResourceAdapter.html#refreshRemoteObject">refreshRemoteObject</a>,
-which the RSE calls, on each redundant copy, on a rename operation.
-<IMG border="0" src="testRename.gif"></ul>
-<p><em>Note:</em> For your reference here is some information on how to further 
-evolve the functions via your adapter, should you want to:</p>
-<ul>
-<li>To not show the rename and delete actions at all, or to enable them, 
-override appropriate methods in the adapter class. For details see the methods 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#showRename(java.lang.Object)">showRename</A>, 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#showDelete(java.lang.Object)">showDelete</A>, 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#doRename(org.eclipse.swt.widgets.Shell, java.lang.Object, java.lang.String)">doRename</A>
- and 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#doDelete(org.eclipse.swt.widgets.Shell, java.lang.Object)">doDelete</A> in the parent 
-<samp><A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html">AbstractSystemViewAdapter</A></samp> class.
-<li>To supply your own validator for syntax checking of new names on the rename dialogs,
-override <A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#getNameValidator(java.lang.Object)">getNameValidator</A>.
-<li>To add additional actions to the pop-up menus, implement the <A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#addActions(org.eclipse.rse.ui.SystemMenuManager, org.eclipse.jface.viewers.IStructuredSelection, org.eclipse.swt.widgets.Shell, java.lang.String)">addActions</a> 
-method in your adapter class.
-<li>To support dragging and dropping, override the 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#canDrag(java.lang.Object)">canDrag</a> and 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#canDrop(java.lang.Object)">canDrop</a> parent methods in your adapter class.
-<li>To add additional properties to the property sheet, implement the 
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#internalGetPropertyDescriptors()">internalGetPropertyDescriptors</a> and
-<A href="../../reference/api/org/eclipse/rse/ui/view/AbstractSystemViewAdapter.html#internalGetPropertyValue()">internalGetPropertyValue</a> methods
-in your adapter class.
-<li>To add property pages to your remote objects (the Properties popup menu item will then appear) use
-the RSE <A href="../plugin/propertypage.html">propertyPages</a> extension point. 
-</ul>
-<p>Now you will continue with the tutorial by enhancing the running example to supply its own actions for creating and changing
-filters. You will support two types of filters in our subsystems: team filters and developer filters. You have seen team filter already,
-but developer filters will be new. They will contain a team name and a developer name-pattern, and when expanded, they will list all the
-matching developers in the given team. The filter string syntax for developer filters will be "team-name/developer-generic-name". Because
-you have more than one type of filter, our filter wizards will set the type attribute for the filters, so the change action will know
-which dialog to present to the user. This will also allow you to have different icons for each filter. 
-<ol start="11"> 
-  <li>Follow these steps to enable support for our own filter-support:
-      <ol>
-         <li type="i">First,  create the new GUI pane for your developer filter prompts. Select the <samp>samples.subsystems</samp>
-         package and in it create a new class named <samp><b>DeveloperFilterStringEditPane</b></samp> that extends the
-         class <samp><b>SystemFilterStringEditPane</b></samp> in package <samp>org.eclipse.rse.ui.filters</samp>. 
-         Edit the new class, adding the code highlighted <a href="DeveloperFilterStringEditPane.html">here</a>.
-         </li>
-         
-         <li type="i">Edit the <samp>DeveloperSubSystemConfiguration</samp> class, and add the code highlighted 
-         <a href="DeveloperSubSystemConfiguration2.html">here</a>.
-         </li>
-         
-         <li type="i">Next, you need the unique icons for your own filters, which you referred to in your subsystem factory. Edit the <samp>RSESamplesPlugin</samp> file and edit the <samp>initializeImageRegistry</samp>
-         to add the lines of code highlighted <a href="InitializeImageRegistry2.html">here</a>. Now you need these icons. 
-         Select the folder named <b>icons</b> and use <b>File-&gt;Import</b> to 
-         import the <samp>teamFilter.gif</samp> and <samp>developerFilter.gif</samp> files from the 
-         <samp>org.eclipse.rse.examples.tutorial\icons</samp> folder.</li>
-         
-         <li type="i">Now you need to edit your subsystem so it will parse the two types of filters you now
-         have. Edit <samp>DeveloperSubSystem</samp> and edit it as highlighted <a href="DeveloperSubSystem2.html#resolve">here</a>.
-         </li>
-
-         <li type="i">In the project's root folder, find and edit file <samp>rseSamplesResources.properties</samp> and 
-         add the line highlighted <a href="rseSamplesResources4.html">here</a>.
-         </li>
-         
-         <li type="i">Now you can run again. Right click on the <samp>Teams</samp> subsystem, to see the new actions for 
-         creating filters:<br>
-         <IMG border="0" src="NewFilterActions.gif">
-         <IMG border="0" src="TeamFilterWizard.gif"><br><br>
-         <IMG border="0" src="DeveloperFilterWizard.gif"><br><br>
-         
-         Create a team filter and a developer filter, and notice the new icons:<br>
-         <IMG border="0" src="NewFilterIcons.gif"><br><br>
-         
-         Now right-click on a team filter and select Change, and then do the same for a developer filter:<br>
-         <IMG border="0" src="TeamFilterDialog.gif">
-         <IMG border="0" src="DeveloperFilterDialog.gif"><br>
-         </li>
-         
-      </ol>
-  </li>
-</ol>
-
-
-<br><br><br>
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/testFilter.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/testFilter.gif
deleted file mode 100755
index 38008bb..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/testFilter.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorial/testRename.gif b/core/org.eclipse.ptp.doc.isv/guide/tutorial/testRename.gif
deleted file mode 100755
index 8c1f64b..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorial/testRename.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/tutorials.html b/core/org.eclipse.ptp.doc.isv/guide/tutorials.html
deleted file mode 100755
index 35122cf..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/tutorials.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2004, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<title>Tutorials</title>
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Tutorials</h1>
-<p>This section walks through the tutorials that demonstrate how to use the RSE <a href="Extensions.html">extension points</a> to
-extend the RSE:
-<ul>
-<li>Popup menu actions for remote resources should now be contributed via the standard Eclipse extension point, <tt>org.eclipse.ui.popupMenus</tt>.  An example of this usage is provided in the <tt>org.eclipse.rse.examples.tutorial</tt> plug-in.
-<li>Property pages should for remote resources now be contributed via the standard Eclipse extension point, <tt>org.eclipse.ui.propertyPages<tt>. An example of this usage is provided in the <tt>org.eclipse.rse.examples.tutorial</tt> plug-in.
-<li><a href="tutorial/subsystem.html">Creating a subsystem configuration</a> for working with remote resources, using the <a href="plugin/subsystem.html">org.eclipse.rse.core.subsystemConfigurations</a> extension point.
-</ul>
-<p>The source code for all tutorials is available in the RSE-examples package, which 
-can be obtained from the DSDP <a href="http://download.eclipse.org/dsdp/tm/downloads/">
-Target Management download site</a> or directly from the RSE <b>Update Site</b>. In fact, 
-the simplest way to get the examples is to choose <I>Help &gt; Software Updates &gt;
-Find and Install</I> from the Workbench, get the Examples installed, and then choose
-<I>File &gt; Import... &gt; Plug-in development &gt; Plug-ins and Fragments</I>.
-Choose the <tt>org.eclipse.rse.examples.tutorial</tt> plug-in and import it with
-source folders.</p>
-<p>In addition to providing the ready-made code, the tutorial also shows you 
-how to actally create the Eclipse plug-in project (Please bear with us if the
-instructions do not 100% match the latest code due to recent refactorings).
-The tutorial starts out by showing
-you how to <A href="tutorial/pdeProject.html">create an Eclipse plug-in
-project</A>, using the Plug-in Development Environment. While any Eclipse plug-in
-project will do, there are benefits to using the RSE-supplied <A
-	href="api/plugin/uiPluginAPI.html">base class</A> for your project, and other RSE-supplied
-infrastructure such as<A href="api/messages/uiMessageAPI.html"> messages</A>, and the many other user interface base classes and re-usable <A
-	href="api/uiAPI.html">user interface classes</A> supplied by
-the RSE core plug-in project. The tutorial step for creating a plug-in project sets up your project for using these.
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/usingAPIs.html b/core/org.eclipse.ptp.doc.isv/guide/usingAPIs.html
deleted file mode 100755
index d6e4f83..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/usingAPIs.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<title>Using the Remote System Explorer API</title>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Using the Remote System Explorer API</h1>
-<p>In addition to all the programming API provided by Eclipse, the Remote System Explorer itself
-comes with numerous classes and interfaces that may be of value to programmers extending the RSE.
-Typically, these are used in conjunction with the <a href="Extensions.html">extension points</a>
-defined by the RSE.
-<p>
-The API set supplied by the RSE can be roughly partitioned into three areas:
-<ol>
-<li><a href="api/uiAPI.html">User interface</a> support, to make it easier to author plug-ins that extend or use the RSE.
-<li><a href="api/resourceAPI.html">Remote resources</a> support, to enable access to remote resources via predefined subsystems.
-<li><a href="api/modelAPI.html">Model</a> support, to enable traversal of the RSE model, to access connections, subsystem factories, subsystems, filters, and so on.
-</ol>
-</p>
-<p>
-This guide will introduce the capabilities of the API, leaving the programming details to the 
-reference section.</p>
-
-<h2>Provisional API</h2>
-<table>
-<!--
-<table bgcolor="yellow" border="1">
-<tr><th><b>API Status</b></th></tr>
--->
-<tr><td>
-<p>Although RSE API has been reviewed and proven useful in earlier proprietary 
-versions, we want to give the Open Source Communitiy a chance to provide public
-feedback and help further improving the APIs. Therefore,</p>
-
-<p><b>As of RSE 1.0, all API is considered provisional.</b></p>
-
-<p>This means, that we reserve the right to change any API after RSE 1.0
-in a not backward compatible way. All such API changes will be voted on
-by committers on the <a href="https://dev.eclipse.org/mailman/listinfo/dsdp-tm-dev">
-dsdp-tm-dev</a> developer mailing list, and documented in a migration guide
-for future releases. We expect that with Community Feedback, we'll reach a 
-stable, hardened API for RSE 2.0. Please give your feedback on 
-<a href="https://bugs.eclipse.org/bugs/">Eclipse Bugzilla</a>
-under category DSDP, Product Target Management.</p>
-</td></tr></table>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/guide/view_RS.gif b/core/org.eclipse.ptp.doc.isv/guide/view_RS.gif
deleted file mode 100755
index 8ee06ea..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/view_RS.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/guide/view_pulldown.gif b/core/org.eclipse.ptp.doc.isv/guide/view_pulldown.gif
deleted file mode 100755
index 5b8aa81..0000000
--- a/core/org.eclipse.ptp.doc.isv/guide/view_pulldown.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/icons/developer.gif b/core/org.eclipse.ptp.doc.isv/icons/developer.gif
deleted file mode 100755
index 9dae955..0000000
--- a/core/org.eclipse.ptp.doc.isv/icons/developer.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/icons/developerFilter.gif b/core/org.eclipse.ptp.doc.isv/icons/developerFilter.gif
deleted file mode 100755
index aaf3084..0000000
--- a/core/org.eclipse.ptp.doc.isv/icons/developerFilter.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/icons/team.gif b/core/org.eclipse.ptp.doc.isv/icons/team.gif
deleted file mode 100755
index 510a753..0000000
--- a/core/org.eclipse.ptp.doc.isv/icons/team.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/icons/teamFilter.gif b/core/org.eclipse.ptp.doc.isv/icons/teamFilter.gif
deleted file mode 100755
index a8091af..0000000
--- a/core/org.eclipse.ptp.doc.isv/icons/teamFilter.gif
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.isv/notices.html b/core/org.eclipse.ptp.doc.isv/notices.html
deleted file mode 100755
index e59346d..0000000
--- a/core/org.eclipse.ptp.doc.isv/notices.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-
-<meta name="copyright" content="Copyright (c) 2011 IBM Corporation and others. This page is made available under license. 
-For full details see the LEGAL in the documentation book that contains this page." >
-
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <LINK REL="STYLESHEET" HREF="book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-   <title>Legal Notices</title>
-</head>
-<body>
-
-<h3>
-<a NAME="Notices"></a>Notices</h3>
-<p>
-The material in this guide is Copyright (c) 2011 IBM Corporation and others.
-</p>
-<p>
-<a href="about.html">Terms and conditions regarding the use of this guide.</a>
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/options.txt b/core/org.eclipse.ptp.doc.isv/options.txt
deleted file mode 100755
index 10ec489..0000000
--- a/core/org.eclipse.ptp.doc.isv/options.txt
+++ /dev/null
@@ -1,85 +0,0 @@
--quiet
--encoding "iso-8859-1"
--charset "iso-8859-1"
--source 1.5
--sourcepath "../org.eclipse.ptp.core/src
-;../org.eclipse.ptp.debug.core/src
-;../org.eclipse.ptp.debug.core/pdi
-;../org.eclipse.ptp.debug.ui/src
-;../org.eclipse.ptp.launch/src
-;../org.eclipse.ptp.remote.core/src
-;../org.eclipse.ptp.remote.ui/src
-;../org.eclipse.ptp.services.core/src
-;../org.eclipse.ptp.services.ui/src
-;../org.eclipse.ptp.ui/src"
--d reference/api
--bootclasspath @rt@
--classpath @cp@
--breakiterator
--tag generated:X
--tag lastgen:X
--tag model:X
--tag ordered:X
--use
--splitIndex
--windowtitle "PTP API Specification"
--doctitle "PTP API Specification"
--header "<b>PTP</b><br>Release 5.0"
--bottom "Copyright (c) 2011 IBM Corporation and others. All Rights Reserved."
--group "PTP Core Plug-in Packages" "org.eclipse.ptp.core;org.eclipse.ptp.core.*"
--group "PTP UI Plug-in Packages" "org.eclipse.ptp.ui;org.eclipse.ptp.ui.*"
--link http://java.sun.com/j2se/1.4.2/docs/api
--linkoffline ./../../../org.eclipse.platform.doc.isv/reference/api @javadoc.link.location@/platform/reference/api/
--link http://bundles.osgi.org/javadoc/r4
-
-org.eclipse.ptp.core
-org.eclipse.ptp.core.events
-org.eclipse.ptp.core.listeners
-org.eclipse.ptp.core.rmsystem
-org.eclipse.ptp.debug.core
-org.eclipse.ptp.debug.core.event
-org.eclipse.ptp.debug.core.launch
-org.eclipse.ptp.debug.core.model
-org.eclipse.ptp.debug.core.sourcelookup
-org.eclipse.ptp.debug.core.pdi
-org.eclipse.ptp.debug.core.pdi.event
-org.eclipse.ptp.debug.core.pdi.manager
-org.eclipse.ptp.debug.core.pdi.model
-org.eclipse.ptp.debug.core.pdi.model.aif
-org.eclipse.ptp.debug.core.pdi.request
-org.eclipse.ptp.debug.ui
-org.eclipse.ptp.debug.ui.events
-org.eclipse.ptp.debug.ui.listeners
-org.eclipse.ptp.debug.ui.sourcelookup
-org.eclipse.ptp.debug.ui.views
-org.eclipse.ptp.launch
-org.eclipse.ptp.launch.ui
-org.eclipse.ptp.remote.core
-org.eclipse.ptp.remote.core.exception
-org.eclipse.ptp.remote.core.server
-org.eclipse.ptp.remote.ui
-org.eclipse.ptp.remote.ui.dialogs
-org.eclipse.ptp.remote.ui.widgets
-org.eclipse.ptp.rm.core
-org.eclipse.ptp.rm.core.rmsystem
-org.eclipse.ptp.rm.ui
-org.eclipse.ptp.rm.ui.launch
-org.eclipse.ptp.rm.ui.preferences
-org.eclipse.ptp.rm.ui.wizards
-org.eclipse.ptp.services.core
-org.eclipse.ptp.services.ui
-org.eclipse.ptp.services.ui.dialogs
-org.eclipse.ptp.services.ui.preferences
-org.eclipse.ptp.services.ui.views
-org.eclipse.ptp.services.ui.widgets
-org.eclipse.ptp.services.ui.wizards
-org.eclipse.ptp.ui
-org.eclipse.ptp.ui.actions
-org.eclipse.ptp.ui.hover
-org.eclipse.ptp.ui.listeners
-org.eclipse.ptp.ui.managers
-org.eclipse.ptp.ui.model
-org.eclipse.ptp.ui.preferences
-org.eclipse.ptp.ui.views
-org.eclipse.ptp.ui.wizards
-
diff --git a/core/org.eclipse.ptp.doc.isv/plugin.properties b/core/org.eclipse.ptp.doc.isv/plugin.properties
deleted file mode 100755
index d3b782f..0000000
--- a/core/org.eclipse.ptp.doc.isv/plugin.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-pluginName=PTP Developer's Guide
-providerName=Eclipse.org
diff --git a/core/org.eclipse.ptp.doc.isv/plugin.xml b/core/org.eclipse.ptp.doc.isv/plugin.xml
deleted file mode 100755
index af006f4..0000000
--- a/core/org.eclipse.ptp.doc.isv/plugin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!-- ===================================================== -->
-<!-- Declare the documentation for the RSE ISV Guide       -->
-<!-- We will declare only one infoset (book)               -->
-<!-- ===================================================== -->
-
-<plugin>
-
-
-<!-- ============================================================================= -->
-<!-- Define primary TOC                                                            -->
-<!-- ============================================================================= -->
-
-   <extension point="org.eclipse.help.toc"> 
-       <toc file="toc.xml" primary="true" category="PTP"/>
-       <index path="index/"/>
-   </extension>
-
-<!-- ============================================================================= -->
-<!-- Define TOCs                                                                   -->
-<!-- ============================================================================= -->
-
-   <extension point="org.eclipse.help.toc"> 
-       <toc file="guide.xml"/>   
-       <toc file="reference.xml"/>   
-   </extension>
-   
-<!-- ============================================================================= -->
-<!-- Define Javadoc locations                                                      -->
-<!-- ============================================================================= -->
-   <extension point="org.eclipse.pde.core.javadoc">
-       <javadoc path="reference/api">
-           <plugin id="org.eclipse.ptp.core" />
-           <plugin id="org.eclipse.ptp.ui" />
-       </javadoc>
-   </extension>
-   
-</plugin>
diff --git a/core/org.eclipse.ptp.doc.isv/pom.xml b/core/org.eclipse.ptp.doc.isv/pom.xml
deleted file mode 100644
index 589fe16..0000000
--- a/core/org.eclipse.ptp.doc.isv/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse.ptp</groupId>
-    <artifactId>ptp-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.ptp.doc.isv</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/core/org.eclipse.ptp.doc.isv/provisional_api.html b/core/org.eclipse.ptp.doc.isv/provisional_api.html
deleted file mode 100644
index d317d98..0000000
--- a/core/org.eclipse.ptp.doc.isv/provisional_api.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<title>Parallel Tools Platform API Status</title>
-<meta name="copyright" content="Copyright (c) 2011 IBM Corporation and others. This page is made available under license. 
-For full details see the LEGAL in the documentation book that contains this page." >
-<link rel="stylesheet" type="text/css" HREF="book.css">
-</head>
-
-<body bgcolor="#ffffff">
-<h1>Parallel Tools Platform API Status</h1>
-<h2>Provisional API</h2>
-<div class="p">
-<p>Although PTP API has been reviewed and proven useful in earlier proprietary 
-versions, we want to give the Open Source Communitiy a chance to provide public
-feedback and help further improving the APIs. Therefore,</p>
-
-<p><b>As of PTP 1.0, all API is considered provisional.</b></p>
-
-<p>This means, that we reserve the right to change any API after PTP 1.0
-in a not backward compatible way. We will attempt to announce such API changes 
-on the <a href="https://dev.eclipse.org/mailman/listinfo/ptp-dev">
-ptp-dev</a> developer mailing list, and ensure they are documented in a migration guide
-for future releases.</p>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/reference.xml b/core/org.eclipse.ptp.doc.isv/reference.xml
deleted file mode 100755
index 91dea1a..0000000
--- a/core/org.eclipse.ptp.doc.isv/reference.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- ============================================================================= -->
-<!-- Define topics for the references                                              -->
-<!-- ============================================================================= -->
-<toc label="Reference">
-	
-	<topic label="API Reference" href="provisional_api.html">
-		<topic label="org.eclipse.ptp.core" href="reference/api/org/eclipse/ptp/core/package-summary.html" />
-		<topic label="org.eclipse.ptp.ui" href="reference/api/org/eclipse/ptp/ui/package-summary.html" />
-	    <topic label="org.eclipse.ptp.debug.core" href="reference/api/org/eclipse/ptp/debug/core/package-summary.html" />
-	    <topic label="org.eclipse.ptp.debug.core.pdi" href="reference/api/org/eclipse/ptp/debug/core/pdi/package-summary.html" />
-	    <topic label="org.eclipse.ptp.debug.ui" href="reference/api/org/eclipse/ptp/debug/ui/package-summary.html" />
-		<topic label="org.eclipse.ptp.launch" href="reference/api/org/eclipse/ptp/launch/package-summary.html" />
-		<topic label="org.eclipse.ptp.remote.core" href="reference/api/org/eclipse/ptp/remote/core/package-summary.html" />
-		<topic label="org.eclipse.ptp.remote.ui" href="reference/api/org/eclipse/ptp/remote/ui/package-summary.html" />
-	    <topic label="org.eclipse.ptp.rm.core" href="reference/api/org/eclipse/ptp/rm/core/package-summary.html" />
-      	<topic label="org.eclipse.ptp.rm.ui" href="reference/api/org/eclipse/ptp/rm/ui/package-summary.html" />
-		<topic label="org.eclipse.ptp.services.core" href="reference/api/org/eclipse/ptp/services/core/package-summary.html" />
-		<topic label="org.eclipse.ptp.services.ui" href="reference/api/org/eclipse/ptp/services/ui/package-summary.html" />
-	</topic>
-	
-	<topic label="Extension Points Reference" href="provisional_api.html">
-		<topic label="org_eclipse_ptp_core_resourceManagers.html" href="reference/extension-points/org_eclipse_ptp_core_resourceManagers" />
-		<topic label="org_eclipse_ptp_core_runtimeSystems.html" href="reference/extension-points/org_eclipse_ptp_core_runtimeSystems" />
-		<topic label="org_eclipse_ptp_debug_core_parallelDebuggers.html" href="reference/extension-points/org_eclipse_ptp_debug_core_parallelDebuggers" />
-		<topic label="org_eclipse_ptp_debug_ui_debuggerConfigurations.html" href="reference/extension-points/org_eclipse_ptp_debug_ui_debuggerConfigurations" />
-		<topic label="org_eclipse_ptp_launch_rmLaunchConfigurations.html" href="reference/extension-points/org_eclipse_ptp_launch_rmLaunchConfigurations" />
-		<topic label="org_eclipse_ptp_remote_core_remoteServer.html" href="reference/extension-points/org_eclipse_ptp_remote_core_remoteServer" />
-		<topic label="org_eclipse_ptp_remote_core_remoteServices.html" href="reference/extension-points/org_eclipse_ptp_remote_core_remoteServices" />
-		<topic label="org_eclipse_ptp_remote_ui_remoteUIServices.html" href="reference/extension-points/org_eclipse_ptp_remote_ui_remoteUIServices" />
-		<topic label="org_eclipse_ptp_services_core_providers.html" href="reference/extension-points/org_eclipse_ptp_services_core_providers" />
-		<topic label="org_eclipse_ptp_services_core_serviceCategories.html" href="reference/extension-points/org_eclipse_ptp_services_core_serviceCategories" />
-		<topic label="org_eclipse_ptp_services_core_services.html" href="reference/extension-points/org_eclipse_ptp_services_core_services" />
-		<topic label="org_eclipse_ptp_services_ui_providerContributors.html" href="reference/extension-points/org_eclipse_ptp_services_ui_providerContributors" />
-		<topic label="org_eclipse_ptp_services_ui_serviceContributors.html" href="reference/extension-points/org_eclipse_ptp_services_ui_serviceContributors" />
-		<topic label="org_eclipse_ptp_services_ui_wizardExtensions.html" href="reference/extension-points/org_eclipse_ptp_services_ui_wizardExtensions" />
-		<topic label="org_eclipse_ptp_ui_rmConfigurationSelections.html" href="reference/extension-points/org_eclipse_ptp_ui_rmConfigurationSelections" />
-		<topic label="org_eclipse_ptp_ui_rmConfigurationWizards.html" href="reference/extension-points/org_eclipse_ptp_ui_rmConfigurationWizards" />
-		<topic label="org_eclipse_ptp_ui_runtimeModelPresentations.html" href="reference/extension-points/org_eclipse_ptp_ui_runtimeModelPresentations" />
-		<anchor id="ptp-extension-points-ref" />
-	</topic>
-
-</toc>
diff --git a/core/org.eclipse.ptp.doc.isv/reference/.cvsignore b/core/org.eclipse.ptp.doc.isv/reference/.cvsignore
deleted file mode 100644
index 9e5bfb4..0000000
--- a/core/org.eclipse.ptp.doc.isv/reference/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-api
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/reference/extension-points/.cvsignore b/core/org.eclipse.ptp.doc.isv/reference/extension-points/.cvsignore
deleted file mode 100644
index 9c59eab..0000000
--- a/core/org.eclipse.ptp.doc.isv/reference/extension-points/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-org_eclipse_*.html
diff --git a/core/org.eclipse.ptp.doc.isv/reference/extension-points/index.html b/core/org.eclipse.ptp.doc.isv/reference/extension-points/index.html
deleted file mode 100755
index 9579b8a..0000000
--- a/core/org.eclipse.ptp.doc.isv/reference/extension-points/index.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-<meta name="copyright" content="Copyright (c) 2011 IBM Corporation and others. This page is made available under license. 
-For full details see the LEGAL in the documentation book that contains this page." >
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>PTP Extension Points</title>
-<link rel="stylesheet" type="text/css" HREF="../../book.css">
-</head>
-<body>
-<h1>PTP Extension Points</h1>
-<p>The following extension points can be used to extend the capabilities of the
-  PTP infrastructure: </p>
-<ul>
-  <li><a href="org_eclipse_ptp_core_resourceManagers.html">org_eclipse_ptp_core_resourceManagers</a></li>
-  <li><a href="org_eclipse_ptp_core_runtimeSystems.html">org_eclipse_ptp_core_runtimeSystems</a></li>
-  <li><a href="org_eclipse_ptp_debug_core_parallelDebuggers.html">org_eclipse_ptp_debug_core_parallelDebuggers</a></li>
-  <li><a href="org_eclipse_ptp_debug_ui_debuggerConfigurations.html">org_eclipse_ptp_debug_ui_debuggerConfigurations</a></li>
-  <li><a href="org_eclipse_ptp_launch_rmLaunchConfigurations.html">org_eclipse_ptp_launch_rmLaunchConfigurations</a></li>
-  <li><a href="org_eclipse_ptp_remote_core_remoteServer.html">org_eclipse_ptp_remote_core_remoteServer</a></li>
-  <li><a href="org_eclipse_ptp_remote_core_remoteServices.html">org_eclipse_ptp_remote_core_remoteServices</a></li>
-  <li><a href="org_eclipse_ptp_remote_ui_remoteUIServices.html">org_eclipse_ptp_remote_ui_remoteUIServices</a></li>
-  <li><a href="org_eclipse_ptp_services_core_providers.html">org_eclipse_ptp_services_core_providers</a></li>
-  <li><a href="org_eclipse_ptp_services_core_serviceCategories.html">org_eclipse_ptp_services_core_serviceCategories</a></li>
-  <li><a href="org_eclipse_ptp_services_core_services.html">org_eclipse_ptp_services_core_services</a></li>
-  <li><a href="org_eclipse_ptp_services_ui_providerContributors.html">org_eclipse_ptp_services_ui_providerContributors</a></li>
-  <li><a href="org_eclipse_ptp_services_ui_serviceContributors.html">org_eclipse_ptp_services_ui_serviceContributors</a></li>
-  <li><a href="org_eclipse_ptp_services_ui_wizardExtensions.html">org_eclipse_ptp_services_ui_wizardExtensions</a></li>
-  <li><a href="org_eclipse_ptp_ui_rmConfigurationSelections.html">org_eclipse_ptp_ui_rmConfigurationSelections</a></li>
-  <li><a href="org_eclipse_ptp_ui_rmConfigurationWizards.html">org_eclipse_ptp_ui_rmConfigurationWizards</a></li>
-  <li><a href="org_eclipse_ptp_ui_runtimeModelPresentations.html">org_eclipse_ptp_ui_runtimeModelPresentations</a></li>
-</ul>
-
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/reference/misc/index.html b/core/org.eclipse.ptp.doc.isv/reference/misc/index.html
deleted file mode 100755
index 23f7624..0000000
--- a/core/org.eclipse.ptp.doc.isv/reference/misc/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">

-<html>

-<head>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

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

-<meta name="Author" content="IBM">

-<link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css">

-<title>Other Reference Information</title>

-</head>

-<body>

-<h1>Other Reference Information</h1>

-<p>The following specifications, white papers, and design notes describe various

-  aspects of the remote development tooling. </p>

-<ul>

-  <li><a href="overview-rse.html">Map of Eclipse Remote System Explorer Plug-ins</a>

-  </li>

-</ul>

-

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/reference/misc/overview-rse.html b/core/org.eclipse.ptp.doc.isv/reference/misc/overview-rse.html
deleted file mode 100755
index 1cfe3cf..0000000
--- a/core/org.eclipse.ptp.doc.isv/reference/misc/overview-rse.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">

-<html>

-<head>

-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >

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

-<meta name="Author" content="IBM">

-<title>RSE Overview - Map of RSE Plug-ins</title>

-<link rel="STYLESHEET" href="../../book.css" charset="ISO-8859-1" type="text/css">

-</head>

-<body>

-<h1>RSE Overview - Map of RSE Plug-ins</h1>

-<p>The Remote System Explorer provides a comprehensive environment for managing remote resources and processes </p>

-<p>The Remote System Explorer tooling itself is divided up into a number of separate

-  plug-ins. The following table shows which API packages are found in which plug-ins as of

-Eclipse 3.0. This table is useful

-  for determining which plug-ins a given plug-in should include as prerequisites.

-</p>

-<table border="1" width="80%" align="center">

-  <tbody>

-  <tr>

-    <td><b>API Package</b></td>

-    <td><b>Required plug-in id</b></td>

-  </tr>

-    <tr>

-    <td><tt>org.eclipse.rse.core[.*]</tt></td>

-    <td><tt>org.eclipse.rse.core</tt></td>

-  </tr>

-  <tr>

-    <td><tt>org.eclipse.rse.ui[.*]</tt></td>

-    <td><tt>org.eclipse.rse.ui</tt></td>

-  </tr>

-  <tr>

-    <td><tt>junit.*</tt></td>

-    <td><tt>org.junit</tt></td>

-  </tr>

-  </tbody>

-</table>

-

-</body>

-</html>

diff --git a/core/org.eclipse.ptp.doc.isv/reference/misc/runtime-options.html b/core/org.eclipse.ptp.doc.isv/reference/misc/runtime-options.html
deleted file mode 100644
index 5c9baaa..0000000
--- a/core/org.eclipse.ptp.doc.isv/reference/misc/runtime-options.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2005, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-<meta name="Author" content="IBM">
-<meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-<title>Remote System Explorer runtime options</title>
-</head>
-
-<body>
-
-<h1>Remote System Explorer runtime options</h1>
-<p>Version 1.0 - Last revised September 20, 2006</p>
-<p>The Remote System Explorer (RSE) is configurable through System properties. Many of these
-properties can be used to specify initial RSE settings.</p>
-
-<h2>System properties</h2>
-<p>The following System properties are used by RSE.</p>
-<p>Properties can be set in the following ways:</p>
-<ul>
-  <li>use -DpropName=propValue as a VM argument to the Java VM</li>
-  <li>set the desired property in the config.ini file in the appropriate configuration
-    area</li>
-</ul>
-<dl>
-  <dt><a name="showNewConnectionPrompt" id="showNewConnectionPrompt"></a>rse.showNewConnectionPrompt</dt>
-  <dd>whether to show the New Connection prompt in RSE views by default. "True" or "false".</dd>
-  
-  <dt><a name="showLocalConnection" id="showLocalConnection"></a>rse.showLocalConnection</dt>
-  <dd>whether to create and show a Local connection by default when RSE starts with a new worspace. "True" or "false".</dd>
-  
-  <dt><a name="enableSystemTypes" id="enableSystemTypes"></a>rse.enableSystemTypes</dt>
-  <dd>a comma-separated list of system types to enable by default. This property can be used to limit the system types in RSE.</dd>
-  
-  <dt><a name="showProfilePage" id="showProfilePage"></a>rse.showProfilePage</dt>
-  <dd>whether to show a New Profile wizard by default when creating a new connection for the first time. "True" or "false". If this is "false", a new profile with the hostname is created without asking the user.</dd>
-</dl>
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.isv/samples/samples.html b/core/org.eclipse.ptp.doc.isv/samples/samples.html
deleted file mode 100644
index 52193a1..0000000
--- a/core/org.eclipse.ptp.doc.isv/samples/samples.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-
-<head>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-<meta name="copyright" content="Copyright (c) IBM Corporation and others 2002, 2006. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-<link rel="stylesheet" type="text/css" HREF="../book.css">
-<title>Installing The Examples</title>
-</head>
-
-<body>
-<h1>Installing The Examples
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.isv/schema.css b/core/org.eclipse.ptp.doc.isv/schema.css
deleted file mode 100644
index 00f9d01..0000000
--- a/core/org.eclipse.ptp.doc.isv/schema.css
+++ /dev/null
@@ -1,66 +0,0 @@
-H6.CaptionFigColumn#header {
-	font-size:16px; 
-	display:inline
-}
-
-P.Note#copyright {
-	font-size: smaller; 
-	font-style: normal;
-	color: #336699; 
-	display:inline;
-	margin-top: 3.000000pt;
-	margin-bottom: 11.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.Code#dtd {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-P.Code#dtdAttlist {
-	color: #800000; 
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 20.000000pt;
-}
-
-P.Code#tag {
-	color: #000080; 
-	display:inline;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;
-}
-
-P.Code#cstring {
-	color: #008000; 
-	display:inline;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 0.000000pt;	
-}
-
-.ConfigMarkup#elementDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 10.000000pt;
-}
-
-.ConfigMarkup#attlistDesc {
-	color: black;
-	margin-top: 0.000000pt;
-	margin-bottom: 0.000000pt;
-	margin-right: 0.000000pt;
-	margin-left: 32.000000pt;
-}
-
diff --git a/core/org.eclipse.ptp.doc.isv/toc.xml b/core/org.eclipse.ptp.doc.isv/toc.xml
deleted file mode 100755
index fa507e5..0000000
--- a/core/org.eclipse.ptp.doc.isv/toc.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- ============================================================================= -->
-<!-- Define the top level topics                                                   -->
-<!-- ============================================================================= -->
-
-<toc label="PTP Developer's Guide">
-	<!--topic label="Programmer&apos;s Guide" href="guide/guide.html">
-		<link toc="guide.xml" />
-		<anchor id="guide_additions"/>
-	</topic-->
-	<topic label="Reference" href="api.html">
-		<link toc="reference.xml" />
-		<anchor id="reference_additions"/>
-	</topic>
-	<topic href="../org.eclipse.ptp.rm.jaxb.help/html/toc.html" label="Configuring the JAXB Resource Manager">
-            <anchor id="ptpJAXB"/>
-   </topic>       
-	<topic label="Legal" href="notices.html"/>
-</toc>
diff --git a/core/org.eclipse.ptp.doc.user/.classpath b/core/org.eclipse.ptp.doc.user/.classpath
deleted file mode 100755
index 7cec603..0000000
--- a/core/org.eclipse.ptp.doc.user/.classpath
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/core/org.eclipse.ptp.doc.user/.cvsignore b/core/org.eclipse.ptp.doc.user/.cvsignore
deleted file mode 100755
index ba077a4..0000000
--- a/core/org.eclipse.ptp.doc.user/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/core/org.eclipse.ptp.doc.user/.project b/core/org.eclipse.ptp.doc.user/.project
deleted file mode 100755
index fb14d44..0000000
--- a/core/org.eclipse.ptp.doc.user/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.doc.user</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/core/org.eclipse.ptp.doc.user/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.doc.user/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 627bd78..0000000
--- a/core/org.eclipse.ptp.doc.user/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Apr 16 13:02:18 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.ptp.doc.user/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 12f09c1..0000000
--- a/core/org.eclipse.ptp.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.doc.user;singleton:=true
-Bundle-Version: 5.0.0.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/core/org.eclipse.ptp.doc.user/about.html b/core/org.eclipse.ptp.doc.user/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/core/org.eclipse.ptp.doc.user/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.user/build.properties b/core/org.eclipse.ptp.doc.user/build.properties
deleted file mode 100755
index 1cdfdb4..0000000
--- a/core/org.eclipse.ptp.doc.user/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               toc.xml,\
-               intro/,\
-               about.html,\
-               html/,\
-               META-INF/,\
-               plugin.properties
diff --git a/core/org.eclipse.ptp.doc.user/html/00newNoteworthy.html b/core/org.eclipse.ptp.doc.user/html/00newNoteworthy.html
deleted file mode 100644
index 57351c3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/00newNoteworthy.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<title>New and Noteworthy - Parallel Tools Platform (PTP) Release 5.0 </title>
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-<body>
-<h1>Parallel Tools Platform (PTP) Release 5.0 - New and Noteworthy</h1>
-
-<p>This version has had many enhancements and bug fixes since the 4.0  
-release. 
-<p>Please see the online <a href="http://wiki.eclipse.org/PTP/new_and_noteworthy/5.0.0"> 
-New and Noteworthy</a> features in PTP release 5.0 for information and screenshots.
-
-<p>Detailed PTP 5.0 release notes, including installation instructions, and more information on
-the new features in PTP 5.0 are available at <a href="http://wiki.eclipse.org/PTP/release_notes">
-    	http://wiki.eclipse.org/PTP/release_notes</a></p>
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
diff --git a/core/org.eclipse.ptp.doc.user/html/00overview.html b/core/org.eclipse.ptp.doc.user/html/00overview.html
deleted file mode 100755
index 5974499..0000000
--- a/core/org.eclipse.ptp.doc.user/html/00overview.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<html>
-<head>
-<title>PTP - Overview and Features</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-<body>
-<h1 id="top">PTP - Overview and Features</h1>
-<p><p>The Parallel Tools Platform (PTP) extends Eclipse to enabled the development of parallel applications. It is primarily aimed at message passing codes, 
-such as those using MPI, but also provides support for Open MP and Unified Parallel C (UPC) programs. PTP also includes support for Fortran programs. 
-<p>
-PTP provides a range of tools and services to support 
-application development in the following four main areas:
-<ul>
-<li>Runtime tools that allow developers to monitor and control the execution of parallel applications
-<li>Debugging tools for locating runtime errors in parallel applications
-<li>Analysis tools that provide advanced editing, error checking, and programmer assistance for developing parallel applications
-<li>A framework for the integration of additional tools, such as performance tools for analyzing and optimizing the performance of parallel applications
-</ul>
-<p>PTP tools are provided for projects located both on the local machine (where Eclipse and PTP are installed) 
-as well as on a remote target machine.  Remote machines can be utilized for a variety of services including 
-source file hosting, remote builds, execution and monitoring, and debugging.
-
-<h2>Runtime Tools</h2>
-
-These tools aid the developer in launching and monitoring parallel applications on a range of local and remote systems. PTP provides a parallel model
-that represents the state of a (possibly remote) parallel system, and the applications running on that system. This model includes the notion of 
-a <i>resource manager</i> which is used to control interaction with the target system. Developers can use the normal Eclipse launch configuration 
-mechanism to specify the system-specifc attributes necessary to launch a parallel job, and monitor the status of the system and job using a number of 
-different views.
-
-<h2>Debugging Tools</h2>
-
-PTP provides an integrated parallel debugger that provides a range of basic debugging functions for locating errors in parallel applications. 
-This includes the ability to set breakpoints and control program execution (single step, resume, etc.) across an arbitrary set of application 
-processes. The developer can also drill down into individual process to obtain more detailed information about the process state, variable information, etc.
-
-<h2>Analysis Tools</h2>
-
-These tools are built on the C/C++ Development Tools (CDT) abstract syntax tree infrastructure and use static 
-analysis techniques to provide a range of advanced editing and error checking features. Examples include content 
-assist for MPI, OpenMP, LAPI, and UPC APIs and directives, barrier analysis for MPI programs, and concurrency analysis for OpenMP 
-programs.  Future versions of PTP will combine this with the External Tools Framework  to provide dynamic 
-analysis functions, such as parallelization assistance.
-
-<h2>External Tools Framework and Performance Tools</h2>
-
-The External Tools Framework (formerly the Performance Tools Framework) provides a simple mechanism 
-for integrating external performance tools, and other arbitrary external tools, with PTP. 
-By providing an XML description file, the tool is able to be integrated with the editor, build, and 
-launch systems. 
-A Feedback view provides display of results from arbitrary tools in an Eclipse view and maps the
-results to source code lines for simplified interaction between the tool's results and the source code,
-as well as providing extension points for integration of other tools based on results.
-Currently, support is provided for the Tuning and Analysis Utilities (TAU) performance analysis 
-system and the Parallel Performance Wizard (PPW).
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-
-</html>
diff --git a/core/org.eclipse.ptp.doc.user/html/00prereqs.html b/core/org.eclipse.ptp.doc.user/html/00prereqs.html
deleted file mode 100755
index 5db7fd3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/00prereqs.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<html>
-<head>
-<title>PTP - Prerequisites</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-<body>
-<h1 id="top">PTP - Prerequisites</h1>
-
-<p>The following prerequisites are required for PTP 5.0 installation. For more 
-detailed information, including installation instructions, see
-<a href="http://wiki.eclipse.org/PTP/release_notes/5.0">
-http://wiki.eclipse.org/PTP/release_notes/5.0</a></p>
-<ul>
-<li>Java 1.5 or later</li>
-<li><a href="http://eclipse.org/downloads">Eclipse SDK</a> version 3.7 or later</li>
-<li><a href="http://eclipse.org/cdt/">Eclipse C/C++ Development Tools (CDT)</a> version 8.0.0 or later</li>
-<li><a href="http://eclipse.org/dsdp/tm">Remote System Explorer 3.3 or later</a></li>
-</ul>
-
-<table border="1">
-  <tr>
-    <th colspan="4" scope="col">PTP Support Matrix <br></th>
-  </tr>
-  <tr>
-    <th scope="col">Operating System</th>
-    <th scope="col">Architecture</th>
-    <th scope="col">Components</th>
-    <th scope="col">Debugging</th>
-  </tr>
-  <tr>
-    <td>Linux</td>
-    <td>x86, x86_64, ppc</td>
-    <td>Eclipse+Agents</td>
-    <td>gdb 6.3 and later</td>
-  </tr>
-  <tr>
-    <td>MacOS X</td>
-    <td>x86</td>
-    <td>Eclipse+Agents</td>
-    <td>gdb 6.3 and later</td>
-  </tr>
-  <tr>
-    <td>Windows</td>
-    <td>x86</td>
-    <td>Eclipse only</td>
-    <td>N/A</td>
-  </tr>
-  <tr>
-    <td>AIX</td>
-    <td>ppc</td>
-    <td>Eclipse+Agents</td>
-    <td>N/A</td>
-  </tr>
-</table>
-
-<p>PTP supports a number of parallel runtime systems and job schedulers. These need to be installed on the target system prior to using PTP:</p>
-<ul>
-<li><a href="http://open-mpi.org">Open MPI</a> version 1.3 or later (preferred version is 1.4.x)</li>
-<li>MPICH2 version 1.0.6p1 and later</li>
-<li>IBM Parallel Environment (PE)</li>
-<li>IBM LoadLeveler (LL)</li>
-<li>SLURM</li>
-<li>PBS/Torque</li>
-</ul>
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-
-</html>
diff --git a/core/org.eclipse.ptp.doc.user/html/01buildMPIprog.html b/core/org.eclipse.ptp.doc.user/html/01buildMPIprog.html
deleted file mode 100755
index 714c790..0000000
--- a/core/org.eclipse.ptp.doc.user/html/01buildMPIprog.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<html>
-<head>
-<title>Creating a MPI Projects</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head> 
-<body>
-<h1>Creating MPI Projects</h1>
-<p>This section provides a brief introduction to creating, building and launching an MPI program. It will cover the following steps:
-<ul>
-<li><a href="#create">Create the project</a></li>
-<li><a href="#configure">Configure to use MPI</a></li>
-<li><a href="#build">Build the executable</a></li>
-<li><a href="#launch">Launch the program</a></li>
-</ul>
-
-<h2 id="create">Step 1: Create the project</h2>
-<p>Note: this tutorial uses the
-<a href="PLUGINS_ROOT/org.eclipse.ptp.pldt.doc.user/html/toc.html">Parallel Language Development Tools (PLDT)</a> wizards for creating MPI projects. 
-Please make sure this feature is installed before continuing.
-
-<ol>
-<li><p>Switch to the C/C++ Perspective using <b>Window &gt; Open Perspective &gt; Other...</b>  and then choose <b>C/C++</b></p><p><br></p></li>
-<li><p>Create a new MPI project using the managed build facility. Select <b>File &gt; New &gt; C Project ...</b> and the <b>New Project</b> dialog should open.</p><p><br></p></li>
-<li><p>Enter a name for the project e.g. MyMPIProject.</p><p><br></p></li>
-<li><p>From the <b>Project types</b> list, expand <b>Executable</b> and select <b>MPI Hello World C Project</b></p><p><br></p>
-<p>Make sure the toolchain selected is valid for your machine.
-<p><img src="images/01newMPIproject.png"></p><p><br></p>
-</li>
-<li><p>In the <b>Basic Settings</b> dialog, fill in the author name and change any other values you like.
-The 'Source' value indicates the name of the folder in which the source file will be created.
-
-</p><p><br></p>
-<p><img src="images/01projBasicSettings.png"></p><p><br></p>
-<p>Click <b>Next</b>.</p><p><br></p></li>
-</ol>
-
-<h2 id="configure">Step 2: Configure the project to use MPI</h2>
-<p></p>
-<ol>
-<li><p>In the <b>MPI Project Settings</b> dialog, make sure <b>Add MPI Project settings to this project</b> is checked.
-You can uncheck <b>Use default information</b> if you need to change any values for include paths, libraries or search path,
-or MPI build commands.
- 
-<p>For more information see <a href="PLUGINS_ROOT/org.eclipse.ptp.pldt.doc.user/html/includes.html">Include Paths and MPI Preferences</a>.
-
-</p><p><br></p>
-<p><img src="images/01mpiProjSettings.png"></p><p><br></p>
-<p>Click <b>Finish</b>.</p><p><br></p></li>
-<li><p>The new project is created and appears in the <b>C/C++ Projects</b> view. Expand the <b>src</b> folder to see the new source file.</p><p><br></p>
-<p><script> full("images/01proj.png") </script></p>
-</li>
-</ol>
-
-<h2 id="build">Step 3: Build the executable</h2>
-<p></p>
-<ol>
-<li><p>Assuming that you have MPI installed and that the project was configured correctly, the application should now autmatically build. When the automatic 
-build setting is selected, Eclipse will build the application whenever you save changes in an editor. 
-Automatic/manual build can be toggled by selecting <b>Project &gt; Build Automatically...</b>. When 
-manual build is selected, a build can be initiated using <b>Project &gt; Build All</b>.</p><p><br></p></li>
-<li><p>Once the build is complete, any errors will be dislayed in the <b>Problems view</b>, the 
-corresponding source files will be flagged, and markers will be insterted into the editor window.</p><p><br></p></li>
-<li><p>Double-click on the source file name to open the C/C++ editor in order to correct any errors.</p><p><br></p>
-<p><img src="images/01wbSrcEditor.png"></p><p><br></p>
-</li>
-<li><p>Details of the commands that were executed to complete the build can be seen in the <b>Console 
-view</b> (click on the <b>Console</b> tab near the bottom right hand corner of the Eclispe 
-workbench.)</p></li>
-</ol>
-
-<h2 id="launch">Step 4: Launch the program</h2>
-<p></p>
-<ol>
-<li><p>Before launching the program, you will need to <i>create</i> and <i>start</i> a 
-<a href="02resMgrSetup.html">Resource Manager</a></p><p><br></p></li>
-<li><p>Once you have verified that the resource manager is operating correctly, you can then 
-<a href="03pLaunchConfig.html">create a configuration and launch the parallel program.</a></p></li>
-</ol>
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-</body>
-
-</html>
diff --git a/core/org.eclipse.ptp.doc.user/html/02resMgrRemoteLaunch.html b/core/org.eclipse.ptp.doc.user/html/02resMgrRemoteLaunch.html
deleted file mode 100644
index d983924..0000000
--- a/core/org.eclipse.ptp.doc.user/html/02resMgrRemoteLaunch.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<html>
-<head>
-<title>Remote Launch Resource Manager</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-
-<h1 id="top">Remote Launch Resource Manager</h1>
-<p>
-The "Remote Launch" resource manager can be used to run an arbitrary executable on the local or a remote machine. It doesn't matter if the executable
-is parallel program or not, however if you want to run a parallel program it is recommended you use one of the other resource manager types.
-<p>To create a Remote Launch resource manager, launch the resource manager wizard by opening the 
-<b>Parallel Runtime</b> perspective and right-clicking in the <b>Resource Managers</b> view.
-<p>
-
-<ol>
-<li>
-<p>Select the Remote Launch type of resource manager and click Next.</p>
-<p><br></p>
-<p><img src="images/02GenericRemLaunch01.png"></p>
-<p><br></p>
-</li>
-<li>
-<p>In the <b>Connection Configuration</b> page, fill in the connection information including the 
-<b>Remote service provider</b> (e.g. Remote Tools) and the <b>Connection name</b>.
-If you have not already <a href="02resMgrSetup.html#remote">configured a connection</a>,
-you can do it here.
-</p>
-<p><br></p>
-<p>
-The <b>Advanced Options</b> can be used to modify port forwarding for ssh connections.
-</p>
-<p><br></p>
-<p><img src="images/02GenericRemLaunch03.png">
-<p><br></p>
-</li>
-<li>
-Click <b>Next</b>, or <b>Finish</b>. If you clicked <b>Next</b>, the next wizard page allows you to change the default name and startup options for
-this resource manager.
-<p><br></p>
-<p><img src="images/02GenericRemLaunch04.png">
-<p><br></p>
-<li>
-<p>Back in the <b>Resource Managers</b> view, you should see the new resource manager.
-Right-click on the new resource manager and choose <b>Start Resource Manager</b> to start it.
-Its icon should turn green.
-<p><br></p>
-<p><img src="images/02GenericRemLaunch02.png"></p>
-<p><br></p>
-</li>
-<li>
-<p>Now, to run a program with the Remote Launch resource manager,
-create a simple remote project.  Create a run configuration for a Parallel Application, and select the Remote Launch resource manager that you just created.
-When you run, your program should run on the remote machine.
-</li>
-<!--  FIXME give more of an example.  e.g. from tutorial. -->
-
-
-<p>Back to <a href="02ResMgrSetup.html">Resource Managers</a>.
-<p>&nbsp;
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
-
-
-
-
diff --git a/core/org.eclipse.ptp.doc.user/html/02resMgrSetup.html b/core/org.eclipse.ptp.doc.user/html/02resMgrSetup.html
deleted file mode 100644
index b2e0dcb..0000000
--- a/core/org.eclipse.ptp.doc.user/html/02resMgrSetup.html
+++ /dev/null
@@ -1,309 +0,0 @@
-<html>
-<head>
-<title>Resource Managers</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-
-<h1 id="top">Configuring Resource Managers</h1>
-
-<p>Topics  include:
-<ul>
-<li><a href="#defn">Resource managers</a></li>
-<li><a href="#list">List of PTP-supported Resource managers</a></li>
-<li>Steps for defining a resource manager</li>
-<ol style="margin:0;">
-<li><a href="#creat">Creating a resource manager</a></li>
-<li><a href="#config">Configuring a resource manager</li>
-<ol type="a" style="margin:0;">
-<li><a href="#local">Local resource manager</a></li>
-<li><a href="#remote">Remote resource manager</a></li>
-</ol>
-<li><a href="#spec">Resource manager-specific configuration</a> (OpenMPI example)</li>
-<li><a href="#finish">Finishing resource manager configuration</a></li>
-<li><a href="#start">Starting the resource manager</a></li>
-</ol>
-<li><a href="#edit">Editing a Resource Manager</a></li>
-<li><a href="#rm">Removing a Resource Manager</a></li>
-</ul>
-<h2 id="defn">Resource Managers</h2>
-<p>PTP uses the term <i>resource manager</i> to refer to any subsystem that controls the resources required for 
-launching a parallel job. If the target parallel system employs a job scheduler for controlling access to compute resources, 
-then the job scheduler would be considered the resource manager for the system. For a cluster with Open MPI installed, the 
-Open MPI runtime system would be considered the resource manager.</p>
-
-<p>In order for PTP to launch, monitor, and control applications on a target system, it must know what type of resource manager 
-is being employed. PTP allows you to configure and manage resource managers that correspond to target systems. Each (PTP) resource manager 
-controls one target system, although a particular target system may have more than one type of resource manager.</p>
-
-<p>In PTP, resource managers can be <i>local</i> or <i>remote</i>. A local resource manager controls resources on the local machine running 
-Eclipse. A remote resource manager controls resources on a physically remote system. The process of configuring a local or remote 
-resource manager is the same.</p>
-<h2 id="list">List of PTP-Supported Resource Managers</h2>
-<p>
-<ul>
-<li><a href="02resMgrRemoteLaunch.html">Remote Launch</a></li>
-<li>Open MPI - covered in examples below
-<li><a href="PLUGINS_ROOT/org.eclipse.ptp.rm.ibm.ll.help/html/IBMLLMainHelp.html">IBM
-		Loadleveler</a>
-<li><a href="PLUGINS_ROOT/org.eclipse.ptp.rm.ibm.pe.help/html/PEMainHelp.html">IBM
-		Parallel Environment</a>
-<li>MPICH2 - setup is similar to Open MPI (not covered separately here)
-<li><a href="PLUGINS_ROOT/org.eclipse.ptp.rm.jaxb.pbs.doc.user/html/toc.html">PBS</a>
-<li><a href="PLUGINS_ROOT/org.eclipse.ptp.rm.slurm.help/html/toc.html">SLURM</a>
-
-</ul>
-<p>More information about PTP resource managers and what they support can be
-found on the <a href="http://wiki.eclipse.org/PTP/release_notes">Release Notes page</a> for this version of PTP.
-<p>
-<h2 id="creat">Step 1: Creating a resource manager</h2>
-<p>PTP uses a wizard to create and configure a resource manager that corresponds to the target system. Most of the wizard steps are the same regardless of
-the resource manager type. In the example below, we will show how to create and configure an Open MPI resource manager.</p>
-<ol>
-<li><p>Open the <b>Parallel Runtime Perspective</b> (or <b>System Monitoring Perspective</b>) using 
-<b>Window &gt; Open Perspective &gt; Other...</b> and then choose <b>Parallel Runtime</b> from the 
-list of perspectives.</p><p><br></p>
-<p><img src="images/02RuntimePerspEmpty.png"></p><p><br></p>
-</li>
-<li><p>To start the wizard, right-click in <b>Resource Managers</b> view and select 
-<b>Add Resource Manager...</b></p><p><br></p>
-<p><img src="images/02addResMgr.png"></p><p><br></p>
-</li>
-<li><p>Choose the resource manager that corresponds to the target system. In this example we 
-will use the <b>Open MPI</b> resource manager, which is used to control the Open MPI Open Runtime 
-Environment.</p><p><br></p>
- 
-<p><img src="images/02chooseResMgrType.png"></p><p><br></p></li>
-<li><p>Select <b>Next &gt;</b></p></li>
-</ol>
-
-<h2 id="config">Step 2: Configuring a resource manager</h2>
-<p>
-The target system controlled by a resource manager can be either local or remote. To access the target system, PTP provides a number of
-<i>remote service providers</i>. Currently supported remote service providers include <b>Remote Tools</b> (part
-of PTP) and the <b>Eclipse Remote Systems Explorer (RSE)</b> which is an optional package that can be installed at any time. 
-<b>The preferred remote service provider is Remote Tools</b> which supports all the PTP and Remote Development Tools (RDT) functionality, however
-some installations use additional features that are only available in RSE. We will only consider Remote Tools here, but the steps for configuring RSE are similar.</p>
-<p>See also <a href="localVsRemote.html">Local vs. Remote Projects</a> for more information on the differences.
-</p>
-<p>
-Once you have chosen a resource manager type, the <b>Open MPI connection configuration</b>
-wizard page will be displayed to allow you to specify the location of the target system. 
-</p>
-<h3 id="local">Step 2a: Local resource manager</h3>
-<p>
-To configure the simple case of a local resource manager, for example where you have Open MPI installed on your local machine, use the following steps:
-</p>
-<ol>
-	<li>
-		<p>
-		Select <b>Local</b> as the <b>Remote service provider</b>.
-		</p><p><br></p>
-		<p><img src="images/02-RM-OpenMPI-Connection-Local.png"></p>
-		<p><br></p>
-	</li>
-	
-	<li>
-		<p>The <b>Connection name</b> will be automatically set to <b>Local</b> and can't be changed.
-		</p>
-		<p><br></p>
-	</li>
-
-    <li><p>Select <b>Next &gt;</b></p>
-</ol>
-
-<h3 id="remote">Step 2b: Remote resource manager</h3>
-
-<p>To configure a remote resource manager, use the following steps:</p>
-
-<ol>
-	<li>
-		<p>In the <b>Open MPI connection configuration</b> dialog,  select <b>Remote Tools</b> as the <b>Remote service provider</b>.
-		</p>
-		<p><br></p>
-		<p><img src="images/02-RM-OpenMPI-Connection-Remote0.png"></p>
-		<p><br></p>
-	</li>
-	
-	<li>
-		<p>
-		The <b>Connection name</b> will be blank at this point if no connections have been previously configured.
-		If you have previously configured a connection and wish to use it, select it here (it may be selected already).
-		</p>
-		<p><br></p>
-	</li>
-	<li>The process for configuring a new connection will differ depending on the remote service provider that you selected in the 
-	    previous step. The following steps describe configuring a <b>Remote Tools</b> location. 
-		<p><br></p>
-		To create a new Connection:
-		</p>
-		<p><br></p>
-		</li>
-	<ol type="a">
-		<li>
-			<p>Select <b>New...</b></p>
-			<p><br></p>
-		</li>		
-		<li>
-			<p>In the <b>Remote Host</b> dialog, enter a name for the connection in the <b>Target Name</b> field (can be anything, but it is suggested to not use a name with spaces).</p>
-<!--  FIXME is the target name with spaces bug still a problem? if so get new screenshot-->		
-			<p><br></p>
-			<p><img src="images/02newRemoteHost.png">rr</p>
-			<p><br></p>
-		</li>
-		<li><p>Select the <b>Remote Host</b> radio button.</p><p><br></p></li>
-		<li><p>Enter the address of the remote host in the <b>Host</b> field.</p><p><br></p></li>
-		<!--  port field no longer exists
-		<li><p>The <b>Port</b> field should be left at <code>22</code> unless your installation uses a different port for <code>ssh</code> connections.</p><p><br></p></li>
-		-->
-		<li><p>Enter your user name on the remote machine in the <b>User</b> field.</p><p><br></p></li>
-		<li><p>If you use password authentication, select the <b>Password based authentication</b> radio button and enter the password in the <b>Password</b> field.</p><p><br></p></li>
-		<li><p>If you use key based authentication, select the <b>Public key based authentication</b> radio button, select the file containing your public key, and enter the passphrase for your key (or leave blank if you don't use a passphrase).</p><p><br></p></li>
-		<li><p>Click <b>Finish</b></p><p><br></p></li>
-	</ol>
-
-	<li>
-		<p>The new connection should now be selected in the <b>Connection name</b> field.
-		<p><br></p>
-		<p><img src="images/02-RM-OpenMPI-Connection-Remote1.png"></p>
-		<p><br></p>
-	</li>
-	
-	<li>
-		<p>The <b>Advanced Options</b> can be used to control how the connection is used. By default, PTP will attempt to tunnel all communication over
-		a single ssh connection, however this can be disabled if the target system does not support port forwarding. Note that you may need to reconfigure 
-		or disable the firewall on your local machine if this option is selected. Also, if your site does not allow outbound connections from the remote 
-		machine to your local machine, then you <i>must</i> use port forwarding.</p>
-		<p><br></p>
-	</li>
-
-	<li><p>Select <b>Next &gt;</b></p></li>
-</ol>
-
-<h2 id="spec">Step 3: Resource manager-specific configuration</h2>
-<p>The contents of the resource manager-specific configuration page will depend
-on the type of resource manager that was initially selected. In this section we will show how to configure an <b>Open MPI</b> resource manager.
-Please refer to the IBM PE, IBM LoadLeveler,
-PBS, or SLURM resource manager documentation for information on these systems.</p>
-<ol>
-<li>
-<p>
-In this case, the <b>Open MPI tool configuration</b> dialog is shown. 
-You will not normally need to change this information. Just leave the <b>Open MPI version</b> set to <b>Auto Detect</b>, 
-and default values will automatically loaded into the fields.</p>
-<p><br></p>
-<p><img src="images/02-RM-OpenMPI-Configuration.png">r</p>
-<p><br></p></li>
-<li><p>If you wish to modify the defaul configuration (for experts only!), select a specific Open MPI version and 
-uncheck the <b>Use default settings</b> checkbox.</p>
-<p><br></p></li>
-<dl>
-<dt><b>Launch command</b></dt>
-<dd>A command line executed to launch the parallel application with Open MPI</p></dd>
-<dt><b>Debug command</b></dt>
-<dd>A command line executed to use Open MPI to launch a debug session for the parallel application</p></dd>
-<dt><b>Discover command</b></dt>
-<dd>A command line executed when the Resource Manager is started, to collect information about the Open MPI environment</p></dd>
-</dl>
-<p>Only a single command is allowed on each command field.
-Several place holders (macros) are allowed, the most relevant are:</p>
-<ul>
-<li><b>Open_MPI_args</b>: Command line arguments to be passed to the mpirun command, specifying options selected in the launch configuration dialog.</li>
-<li><b>Open_MPI_env</b>: Command line arguments to be passed to the mpirun command, specifying name of environment variables.</li>
-<li><b>execPath</b> and <b>execName</b>: Path and name of the executable of the parallel application to be launched by mpirun.
-<li><b>progArgs</b>: arguments to be passed to the parallel application.</li>
-</ul>
-<li><p>If you have installed Open MPI in a non-standard location, or it is not in your path, uncheck the <b>Use default location</b> checkbox, then
-enter the path to the installation <code>bin</code> directory. So, for example if your installation is in <code>/usr/local/openmpi-1.3.4</code>, you
-would enter <code>/usr/local/openmpi-1.3.4/bin</code> for the location.</p></li>
-<p>
-<li><p>Select <b>Next &gt;</b></p></li>
-</ol>
-
-<h2 id="name">Step 4: Final resource manager configuration</h2>
-<p>The final wizard page is the <b>Common Resource Manager Configuration</b>, which provides an opportunity
-to change a few remaining parameters about the resource manager.</p>
-<ol>
-<li><p>If you wish to change the name or description, uncheck the <b>Use default name and 
-description</b> checkbox.</p>
-<p><br></p>
-<ol type="a">
-<li><p>Enter a new name in the <b>Name</b> field. Anything can be entered.</p><p><br></p></li>
-<li>
-  <p>Enter a new description in the <b>Description</b> field. Anything can be entered.</p><p><br></p>
-</li>
-</ol>
-<p><img src="images/02ChooseResMgrNameAndDesc.png"></p>
-<p><br></p>
-</li>
-<li><p>If you want the resource manager to start automatially when you start a new Eclipse session, check the <b>Automatically start resource
-manager when Eclipse starts</b> checkbox.</p>
-<p><br></p>
-<p><img src="images/02ChangeResMgrStartup.png"></p>
-<p><br></p>
-</li>
-<li><p>Select <b>Finish</b>. The new Resource Manager should appear in the list of Resource
-Managers.</p>
-<p><br></p>
-<p><img src="images/02-RM-OpenMPI-View-List.png"></p>
-</li>
-</ol>
-
-<h2 id="start">Step 6: Starting the resource manager</h2>
-<p></p>
-<ol>
-<li><p>To start the resource manager, right mouse click on the resource manager in the <b>Resource 
-Managers view</b>, then select <b>Start Resource Manager</b> from the context menu.</p><p><br></p>
-<p><img src="images/02-RM-OpenMPI-View-Start.png"></p><p><br></p>
-</li>
-<li><p>The resource manager icon should change color to green to indicate has been successfully 
-started.</p><p><br></p>
-  <p><img src="images/02-RM-OpenMPI-View-Running.png"></p><p><br></p>
-</li>
-<li>
-  <p>In the <b>Machines view</b> you should see an icon representing your target system and icons 
-  showing status of the node(s).</p><p><br></p>
-  <p><img src="images/02-RM-OpenMPI-View-Machines.png"></p><p><br></p>
-</li>
-<li><p>If the resource manager fails to start (the icon is red), right click on the resource 
-manager and select <b>Stop Resource Manager</b>. Check the log files for the reason that the 
-resource manager failed to start, correct the error and restart again.</p></li>
-</ol>
-
-<h2 id="edit">Editing a resource manager</h2>
-<p>It is sometimes necessary to change the configuration of an existing resource manager, for example, to change the remote machine that the resource manager controls. Note that the resource manager cannot be edited when it is running.</p>
-<ol>
-<li><p>If the resource manager is running, stop it first. Right-click on the resource manager and 
-select <b>Stop Resource Manager</b></p><p><br></p></li>
-<li><p>Right-click on the resource manager and select <b>Edit Resource Manager</b><p><br></p></p>
-<p><img src="images/02-RM-OpenMPI-View-Edit.png"></p><p><br></p>
-</li>
-<li><p>Modify the required configuration settings and click <b>Finish</b>.</p><p><br></p></li>
-<li><p>Restart the resource manager.</p></li>
-</ol>
-
-<h2 id="rm">Removing a Resource Manager</h2>
-<p>If the resource manager is no longer required, it can be removed from the <b>Resource Managers view</b></p>
-<ol>
-<li><p>If the resource manager is running, stop it first. Right-click on the resource manager and 
-select <b>Stop Resource Manager</b></p><p><br></p></li>
-<li><p>Right-click on the resource manager and select <b>Remove Resource Manager</b></p><p><br></p>
-<p><img src="images/02-RM-OpenMPI-View-Remove.png"></p><p><br></p>
-</li>
-<li>
-  <p>You will be prompted to confirm removal. Click <b>OK</b></p>
-</li>
-</ol>
-
-
-<p>Proceed to <a href="03pLaunchConfig.html">Launching a parallel application</a>.
-<p>&nbsp;
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
-
-
-
-
diff --git a/core/org.eclipse.ptp.doc.user/html/03pLaunchConfig.html b/core/org.eclipse.ptp.doc.user/html/03pLaunchConfig.html
deleted file mode 100755
index bb527de..0000000
--- a/core/org.eclipse.ptp.doc.user/html/03pLaunchConfig.html
+++ /dev/null
@@ -1,306 +0,0 @@
-<html>
-<head>
-<title>Running Parallel Programs</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-
-<h1 id="top">Running Parallel Programs</h1>
-<p>This section describes how to run a parallel program. In PTP,
-this is called &quot;launching a job&quot;. Launching requires the
-services of a resource manager, which should have been set up as
-described in <a href="02resMgrSetup.html">Resource Managers</a>. PTP is
-able to launch parallel applications that use a variety of programming
-models (e.g. MPI, OpenMP, UPC, etc.) provided that the resource manager
-supports the programming model. It is also possible to launch multiple
-copies of a sequential program so that they execute simultaneously.</p>
-
-<p>Eclipse uses a <i>launch configuration</i> to encapsulate all the
-settings and arguments necessary to launch a job normally or under the
-control of a debugger. A launch configuration is created using the <b>Run
-&gt; Run Configurations...</b> menu. 
-
-<p>This section only describes how to launch a parallel program. A
-description of how to monitor the application launch is provided in 
-<a href="05monitoring.html">Monitoring Jobs and Systems</a>. A
-description of how to debug an application is provided in 
-<a href="06parDebugging.html">Parallel Debugging</a>.</p>
-
-<p>Topics include:</p>
-<ol>
-	<li><a href="#create">Creating a <b>Parallel Application</b>
-	launch configuration</a></li>
-	<li><a href="#resources">Completing the <b>Resources tab</b></a></li>
-	<li><a href="#application">Completing the <b>Application
-	tab</b></a></li>
-	<li><a href="#arguments">Completing the <b>Arguments tab</b></a></li>
-	<li><a href="#environment">Completing the <b>Environment
-	tab</b></a></li>
-	<li><a href="#synchronize">Completing the <b>Synchronize
-	tab</b></a></li>
-	<li><a href="#launch">Launching the application </a></li>
-</ol>
-<h2 id="create">Step 1: Create a Parallel Application launch
-configuration</h2>
-<p>Note: At least one resource manager must have been configured
-before it is possible to create a parallel application run
-configuration.</p>
-<ol>
-	<li>
-	<p>To set up a launch configuration, open the <b>Run Configuration</b>
-	dialog using <b>Run &gt; Run Configurations...</b> or click the run
-	icon menu on the tool bar and select <b>Run Configuration...</b>.</p>
-	</p>
-	<p><br>
-	</p>
-	</li>
-	<li>
-	<p>Create a new Parallel Application launch configuration by
-	clicking <b>Parallel Application</b> and then clicking on the <b>New</b>
-	button icon.</p>
-	<p><br>
-	</p>
-	<p><img src="images/03launch1.png"></p>
-	<p><br>
-	</p>
-	</li>
-	<li>
-	<p>Enter a name for the configuration in the <b>Name:</b> field.
-	Here we use the same name as the project.</p>
-	<p><br>
-	</p>
-	<p><img src="images/03launch1a.png"></p>
-	</li>
-</ol>
-
-<h2 id="resources">Step 2: Complete the Resources tab</h2>
-<p>The <b>Resources tab</b> is used to specify the resources
-required for the job execution. The contents of this tab will vary for
-different resource managers. This description only applys to the Open
-MPI and MPICH2 resource managers.</p>
-<ol>
-	<li>
-	<p>Select a resource manager you wish to use from the drop-down. If the resource manager you have selected is not running,
-	then you will see a warning message in the dialog.</p>
-	<p><br>
-	</p>
-	</li>
-	<li>
-	<p>Enter a value in the <b>Number of Processes</b> field. This
-	field must be greater than 0 in order to launch a job, and specifies
-	the number of processes to use for the application launch.</p>
-	<p><br>
-	</p>
-	</li>
-	<li>
-	<p>Fields in the <b>Options</b> section correspond to command-line
-	options supported by Open MPI. If desired, it is also possible to
-	specify a file containing the list of hosts on which to run the
-	application using the <b>Host file</b> field, or the list can be
-	entered directly into the <b>Host list</b> field.</p>
-	<p><br>
-	</p>
-	<p><img src="images/03launchResTab.png"></p>
-	</li>
-</ol>
-
-<h2 id="application">Step 3: Complete the <b>Application</b> tab</h2>
-<p>The <b>Application tab</b> is used to specify the application
-(executable) to be launched.</p>
-<ol>
-	<li>
-	<p>Ensure that the correct the <b>Parallel Project</b> is selected.
-	This is the project containing the source and binaries for the
-	application.</p>
-	<p><br>
-	</p>
-	</li>
-
-	<li>
-	<p>Select the <b>Application Program</b> (executable) you wish to
-	launch. If the resource manager is connected to a remote target, then
-	this means the <i>path of the executable on the remote target</i>.
-	Otherwise, for a resource manager on the local machine, it should be
-	the path to the executable within the project directory.</p>
-	<p><br>
-	</p>
-	</li>
-
-	<li>
-	<p>If you are running the application on a remote machine and the
-	project was <i>built</i> locally, then you will have to copy the
-	executable to the remote machine first. For this purpose, you may
-	enable <b>Copy executable from local filesystem</b> and fill <b>Path
-	to the local file</b> with the path to the executable within the project
-	directory. This configures the launcher to copy the executable
-	automatically to the remote target before starting the run/debug
-	session. If not enabled, then you will need to copy the executable
-	manually to the remote target.</p>
-	<p><br>
-	</p>
-	</li>
-	<p><img src="images/03launch6.png"></p>
-	<p><br>
-	</p>
-
-	<li>
-	<p>If you wish to have the output from all processes in a single
-	output console, ensure that the <b>Display output from all
-	processes in a console view</b> option is checked.</p>
-	<p><br>
-	</p>
-	</li>
-</ol>
-
-<h2 id="arguments">Step 4: Complete the Arguments tab</h2>
-<p>The <b>Arguments tab</b> is used to specify any command-line
-arguments require by the parallel application and to modify the working
-directory.</p>
-<ol>
-	<li>
-	<p>Enter any arguments required by the application in the <b>Parallel
-	program arguments</b> field. This is a free form text field that will be
-	passed to the application verbatim.</p>
-	<p><br>
-	</p>
-	</li>
-	<li>
-	<p>Select a different working directory if desired. The working
-	directory is set just prior to the application launch. Note that for a
-	remote launch, this will be a directory on the remote machine.</p>
-	</li>
-	<p><img src="images/03launch3.png"></p>
-	<p><br>
-	</p>
-</ol>
-
-<h2 id="environment">Step 5: Complete the Environment tab</h2>
-<p>The <b>Environment tab</b> is used to specify any environment
-variables require by the parallel application or in order to run the
-application. The tab also provides the option to append the environment
-variables to the native environment, or to replace the native
-environment with the variables specified in the tab.</p>
-<ol>
-	<li>
-	<p>Use the <b>New...</b> button to create a new environment
-	variable.</p>
-	<p><br>
-	</p>
-	</li>
-	<li>
-	<p>Use the <b>Select...</b> button to import environment variables.</p>
-	<p><br>
-	</p>
-	</li>
-	<li>
-	<p>Use the <b>Edit...</b> button to edit an environment variables.</p>
-	<p><br>
-	</p>
-	</li>
-	<li>
-	<p>Use the <b>Remove...</b> button to remove an environment
-	variables.</p>
-	<p><br>
-	</p>
-	</li>
-	<p><img src="images/03launch4.png"></p>
-	<p><br>
-	</p>
-</ol>
-
-<h2 id="synchronize">Step 6: Complete the <b>Synchronize</b> tab</h2>
-<p>The <b>Synchronize tab</b> is used in scenarios where the
-resource manager is connected to a remote target. The tab specifies
-rules that describe files or directories that need to be copied (<i>uploaded</i>)
-to the remote target before starting the parallel application execution.
-Typically, this feature is used to upload dependencies (like dynamic
-libraries) or input data for test cases.</p>
-<p>This tab also allows to specify rules describing files on the
-remote host to be retrieved back (<i>downloaded</i>) to the local host
-after the parallel application finishes execution, as output data
-produced by the parallel application execution.</p>
-
-<ol>
-	<li>
-	<p>If you wish to enable file transfer to the remote target, enable
-	the <b>Upload rules enabled</b> or <b>Download rules enabled</b>
-	according which direction of file transfer is required.</p>
-	<p><br>
-	</p>
-	<p><img src="images/03launch7.png"></p>
-	<p><br>
-	</p>
-	</li>
-
-	<li>
-	<p>In order to specify files to be copied from the local system to
-	the remote target (<i>uploaded</i>), click on <b>New upload rule</b>.
-	An upload rule lists a collection of files or directories that shall be
-	copied into a single directory.</p>
-	<p><br>
-	</p>
-	<p>If <b>Use directory from launch configuration</b> is enabled,
-	then the listed files or directories are copied to the working
-	directory specified on the launch configuration. At the moment, this is
-	equivalent to same directory that contains the executable for the
-	parallel application. If not enabled, they you must specify on <b>Remote
-	directory</b> a path where the files or directories will be placed. The
-	path may be absolute or relative (to the working directory).</p>
-	<p><br>
-	</p>
-	<p>In the list underneath, <b>Selected file(s)</b>, add the files
-	or directories that shall be copied. Click on <b>File(s)</b> to select
-	one or more individual files from anywhere in the local file system.
-	The <b>Directory</b> button works similarly to select a directory from
-	the local file system. Directories are copied recursively. The <b>Workspace</b>
-	button allows easily choosing files from the current workspace.</p>
-	<p><br>
-	</p>
-	<p>On the bottom of the dialog, you may wish to set attributes to
-	be applied to the copied files on the remote target. The options <b>Readonly</b>
-	or <b>Executable</b> sets all copied files to read-only or executable
-	on the remote host. If <b>Preserve time attributes</b> is enabled, then
-	the remote copy will assume the same time stamp then the local file,
-	otherwise, the time stamp will be the time the file was copied. Also,
-	if the file already exists on the remote target, you may choose how to
-	react in the <b>If file already exists</b> dropdown.</p>
-	<p><br>
-	</p>
-	<p><img src="images/03launch8.png"></p>
-	<p><br>
-	</p>
-	<p><br>
-	</p>
-	</li>
-	<li>
-	<p>In order to specify files to be copied from the remote target to
-	the local system (<i>downloaded</i>) after the parallel application
-	finishes, click on <b>New download rule</b>.</p>
-	<p><br>
-	</p>
-	<p>An download rule lists a collection of files or directories that
-	shall be copied into a single local directory. Its options are very
-	similar to the upload rule.</p>
-	<p><br>
-	</p>
-	<p><img src="images/03launch9.png"></p>
-	<p><br>
-	</p>
-	</li>
-</ol>
-
-<h2 id="launch">Step 7: Launching the application</h2>
-<p>The launch configuration is now complete. Click on the <b>Apply</b>
-button to save the configuration and then
-click on the <b>Run</b> button to launch the job.
-Switch to the <b>Parallel Runtime</b> perspective (or <b>System Monitoring</b> perspective)
-to view the status of the job and inspect the program output.
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to
-Table of Contents</a>
-</body>
-</html>
-
-
-
-
diff --git a/core/org.eclipse.ptp.doc.user/html/05monitoring.html b/core/org.eclipse.ptp.doc.user/html/05monitoring.html
deleted file mode 100755
index dcbeec6..0000000
--- a/core/org.eclipse.ptp.doc.user/html/05monitoring.html
+++ /dev/null
@@ -1,202 +0,0 @@
-<html>
-<head>
-<title>Monitoring Jobs and Systems</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-<head>
-<body>
-<h1 id="top">Monitoring Jobs and Systems</h1>
-<p>This section describes the features of PTP the enable the developer to monitor activity on target parallel machines, to monitor job status, and to control jobs. 
-It will cover the following topics:</p>
-
-<ul>
-<li><a href="#resMgr">Resource Managers view</a></li>
-<li><a href="#output">Console view</a></li>
-<li><a href="#persp">Parallel Runtime perspective</a></li>
-<ul style="margin:0;">
-<li><a href="#machines">Machines view</a></li>
-<li><a href="#jobs">Jobs List view</a></li>
-<li><a href="#legend">Icon Legend</a></li>
-</ul>
-<li><a href="#sysMonPersp">System Monitoring perspective</a> (new for 5.0)</li>
-<ul style="margin:0;">
-<li><a href="#sysMonView">System Monitor view</a></li>
-<li><a href="#active">Active Jobs view</a></li>
-<li><a href="#inactive">Inactive Jobs view</a></li>
-</ul>
-</ul>
-
-<p>
-PTP provides two perspectives for job and system monitoring: the <a href="#persp">Parallel Runtime perspective</a> and the 
-<a href="#sysMonPersp">System Monitoring perspective</a>. The Parallel Runtime perspective is the original perspective provided
-by PTP and is used for most of the current resource managers. The System Monitoring perspective is new for PTP 5.0 and provides 
-scalable monitoring of large remote systems. It is currently only used by the PBS resource manager, but addition resource managers
-will be transitioned over to this perspective in future releases.
-</p>
-
-<h2 id="resMgr">Resource Managers View</h2>
-<p>The Resource Managers view shows all resource managers that have been configured, and is used to manage and control these resource managers.
-This view is shared between the Parallel Runtime and System Monitoring perspectives.
-Each resource manager has an icon and a name. The icon color indicates the current state of the resource manager. The following image shows two resource 
-managers, one that is <i>stopped</i> and one that is <i>running</i>. A stopped resource manager is know to the system, but is not providing any information 
-to PTP. A running resource manager is the normal state, and indicates that PTP is receiving information and can launch jobs using the resource manager.</p>
-
-<table><tr>
-<td><img src="images/05runtimeResMgrView.png"></td>
-<td><img src="images/05ptpLegendResMgr.png"></td>
-</tr></table>
-
-<p>This view can also be used to create new resource managers, edit or remove resource managers, and control resource manager operation. Right-click in the 
-view to access these functions.</p>
-<p><b>Note that if a resource manager is removed and re-added, the launch configurations using the original resource
-manager must be changed to use the new one, even if it has the same name.</b></p>  
-
-<h2 id="output">Console View</h2>
-Depending on the functionality of the resource manager, PTP can also display standard output and standard error from the parallel program in the
-Console view. This view is also shared between the Parallel Runtime and System Monitoring perspectives. 
-Output is only displayed in this view if the <b>Display combined output in a console 
-view</b> option was selected in the job launch configuration (see <a href="03pLaunchConfig.html">Running Parallel Programs</a>). Output
-from jobs visible in the System Monitoring perspective can also be shown by selecting the appropriate actions (more below).</p>
-
-<p><img src="images/05ptpRuntimeConsoleView.png"></p>
-
-<h2 id="persp">Parallel Runtime Perspective</h2>
-<i>For use with all resource managers <b>except</b> PBS</i>
-<p>
-The Parallel Runtime perspective is used to monitor the status of target parallel systems and the parallel jobs that are running on these systems. 
-At least one resource manager must be active to see anything in the views. See <a href="02resMgrSetup.html">configuring resource managers</a> for 
-information on setting up resource managers and <a href="03pLaunchConfig.html">running parallel programs</a> for how to launch a parallel program.</p>
-
-<p>The perspective provides two main views for monitoring systems and jobs: <a href="#machines">Machines view</a> and <a href="#jobs">Jobs List view</a>.
- Each of these views will be discussed in more detail below.</p>
-
-<p>To open the Parallel Runtime perspective,
-select <b>Window &gt; Open Perspective &gt; Other ...</b> and choose <b>Parallel Runtime</b> from the list.</p>
-<p><img src="images/05runtimePerspAnn.png"></p>
-
-<h3 id="machines"><img src="images/05parallel_perspective.png">Machines View</h3>
-The <b>Machines view</b> shows the status of all machines being controlled by running resource managers. The upper left-hand panel of this view shows a 
-collective list of all machines known by all the resource managers. A machine is represented by an icon and an address. The icon represents the state of the 
-machine, and the address is typically the hostname of the machine.</p>
-
-<p>Selecting one of the machines in the upper left-hand panel will show the nodes of that machine in the upper right-hand panel of this view. Nodes are 
-represented by an icon only. The icon shows the state of the node. The following image shows a typical view:</p>
-<p><img src="images/05runtimeMachinesView.png"></p>
-
-<p>The left edge of the node panel displays the node number of the first node in the row. This is useful for quickly locating a particular node. Also, if 
-there are too many nodes to fit in the display the zoom buttons in the view toolbar can be used to zoom the display.</p>
-
-<p>The machine and node icons indicate the state of each machine and node, as shown in the following image. There are icons representing most typical 
-states. There are also node states that indicate access to the nodes that could be controlled by a job scheduler (user exclusive, user shared, etc.) 
-These states are only used by certain types of resource managers.</p>
-<p><img src="images/05ptpLegendMachines.png"></p>
-
-<p>Placing the mouse over a node in the view will show information about that node, including the node number, in a tooltip popup.</p>
-<p>Double-click on a node icon to display the more detailed information about the node in the lower two panes of the view. 
-The lower left-hand pane (Node Attributes) will show the detailed attributes of the node, and the lower right-hand pane (Process Info) will show the processes 
-that are running, or have recently run, on the node.</p>
-<p><img src="images/05runtimeNodeDetails.png"></p>
-
-<h3 id="jobs"><img src="images/05parallel_perspective.png">Jobs List View</h3>
-This view shows the current status of jobs in the system. Pending, running, and completed jobs are shown. The actual jobs displayed in this 
-view are resource manager dependent, but will typically be the user's jobs that have been launched by PTP. Some resource managers may show jobs 
-that have been launched using other means, or jobs for all users on the system.</p>
-
-<p><img src="images/05ptpRuntimeJobsView.png"></p>
-
-<p>There are icons representing most job and process states. The following image shows the states that can be represented:</p>
-<p><img src="images/05ptpLegendJobProcess.png"></p>
-
-<p>Usually a job will terminate when it finishes executing. However the user can also terminate a job using the <b>terminate button</b> on the toolbar
-of the Jobs List view. 
-This button will become enabled when a running job is selected. Clicking on the button will instruct the resource manager to terminate the job. If the 
-job is pending in a queue, then it will normally be removed from the queue.</p>
-
-<h3 id="legend">Icon Legend</h3>
-There are many different icons representing the state of the various components of the parallel system. If you need to identify a particular icon, 
-click on the legend icon <img src="images/05legendIcon.png"> in the toolbar.  This will open a dialog that shows all the icons and their meanings. 
-An example is shown below.</p>
-
-<p><img src="images/05ptpLegend.png"></p>
-
-<h2 id="sysMonPersp">System Monitoring Perspective (new for 5.0)</h2>
-<i>For use with PBS resource manager</i>
-<p>
-The System Monitoring perspective provides scalable job and system monitoring for large-scale systems. It is based on the 
-<a href="http://www2.fz-juelich.de/jsc/llview">LLview monitoring system</a>
-but has been extended to support monitoring of any type of system. The System Monitoring perspective is currently only used for the PBS
-resource manager, but will be extended to other resource managers in the future.
-</p>
-<p>
-Like the Parallel Runtime perspective, at least one resource manager must be active to see anything in the views. 
-See <a href="02resMgrSetup.html">configuring resource managers</a> for 
-information on setting up resource managers and <a href="03pLaunchConfig.html">running parallel programs</a> for how to launch a parallel program.</p>
-
-
-<p>To open the System Monitoring perspective,
-select <b>Window &gt; Open Perspective &gt; Other ...</b> and choose <b>System Monitoring</b> from the list.</p>
-<p><img src="images/05sysMonPersp.png"></p>
-<p>The perspective provides four main views for monitoring systems and jobs: <b><a href="#resMgr">Resource Managers view</a></b>, <b>System Monitor view</b>, 
-<b>Active Jobs view</b>, 
-and <b>Inactive Jobs view</b>. The Resource Managers view is the same view used for the Parallel Runtime perspective. Each of the other
- views will be discussed in more detail below.</p>
-
-<h3 id="sysMonView">System Monitor View</h3>
-
-The System Monitor view provides an overall view of the activity on the target remote system. The view tab will contain the name of the remote system
-(as provided by the resource manager). The layout of this view will depend on the configuration of
-the target system, but will generally consist of a number of boxes that represent aggregations of computing resources (such as racks). These boxes may in turn 
-contain other elements that represent the computing resources (such as nodes). The color of the boxes is used to indicate which jobs are running on the nodes.
-<p>
-The view currently supports two mouse actions. Hovering over an element in the view will display a tooltip box with information about that element, including
-which jobs are associated with the element. Clicking on an element will highlight all associated elements (those with the same color) in the display. This
-shows the user where a particular job is running on the system.
-<p><img src="images/05sysMonView1.png"></p>
-
-<h3 id="active">Active Jobs View</h3>
-
-The Active Jobs view shows a list of all the jobs that are running on the system. The exact columns displayed in the view will depend on the capabilities of
-the remote system. Each job in the table is assigned a color in the first column. This color corresponds to the colors displayed in the System Monitor view.
-Clicking on a row in the table will highlight the row and also the location of the jobs in the System Monitor view.
-<p><img src="images/05activeJobs1.png"></p>
-<p>
-Job actions are available by right-clicking on a job in the view. The actions available will depend on the type of job, its state, and the job owner.
-<p><img src="images/05activeJobs3.png"></p>
-<p>
-Rows in the table can be sorted by clicking on the column heading. This will cycle though a sort sequence of "ascending", "descending", and none.
-Columns can also be removed from the view by right-clicking on the column heading and unselecting the column name.
-<p><img src="images/05activeJobs2.png"></p>
-
-<h3 id="inactive">Inactive Jobs View</h3>
-
-The Inactive Jobs view is essentially the same as the Active Jobs view, but displays jobs that are not currently running on the system. As these jobs don't
-have associated nodes in the System Monitor view, they are not assigned a color.
-<p>
-Jobs that are launched by the user will initially appear in the Inactive Jobs view with status SUBMITTED. These jobs can be controlled (e.g. canceled)
- by right clicking on the job and selecting an available action. <b>Refresh Job Status</b> can be used to get an immediate update of the job status rather
- than waiting for the next update.
-<p><img src="images/05inactiveJobs1.png"></p>
-<p>
-Once a job has finished executing, it will appear in this view with status COMPLETED. The stdout and stderr from the job can be displayed in
-the <a href="#output">Console view</a> by right clicking on the job and
-selecting the appropriate action. Completed jobs will remain in the view between Eclipse sessions, so you can leave Eclipse and return at a later time without
-losing information about the jobs. If you wish to remove the job from the view (permanently), use the <b>Remove Job Entry</b> action.
-<p><img src="images/05inactiveJobs2.png"></p>
-
-
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/org.eclipse.ptp.doc.user/html/06parDebugging.html b/core/org.eclipse.ptp.doc.user/html/06parDebugging.html
deleted file mode 100755
index 9b6af42..0000000
--- a/core/org.eclipse.ptp.doc.user/html/06parDebugging.html
+++ /dev/null
@@ -1,295 +0,0 @@
-<html>
-<head>
-<title>Parallel Debugging</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-<!-- test -->
-<h1>Parallel Debugging</h1>
-<p>This section describes the features of PTP that enable a developer to debug a parallel application. The topics that will be covered include:</p>
-<ul>
-<li><a href="#launch">Creating a Debug Launch Configuration</a></li>
-<li><a href="#feat">The Parallel Debug Perspective </a></li>
-<li><a href="#pSets">Process Sets</a></li>
-<li><a href="#pSetsOper">Operations on Process Sets</a></li>
-<li><a href="#pSetsCreate">Managing Process Sets</a></li>
-<li><a href="#bkpt">Breakpoints</a></li>
-<li><a href="#cip">Current Instruction Pointer</a></li>
-<li><a href="#reg">Process Registration </a> and the Debug view (including stack traces)</li>
-<li><a href="#finish">Terminating Execution</a></li>
-</ul>
-
-<h2 id="launch">Creating a Debug Launch Configuration</h2>
-In order to launch a debug job, the user must first create a Debug Configuration. The process for doing this is identical to that used to 
-<a href="03pLaunchConfig.html">run a parallel program</a>,
-with the exception of a single extra tab that needs to be completed. Only this extra tab will be described here.
-<p>
-To create a debug configuration, use the following steps:
-<ol>
-<li>Select the <b>Run &gt; Debug Configurations...</b> menu.
-<p><br></p>
-</li>
-<li>Follow the same steps as described in <a href="03pLaunchConfig.html">running parallel programs</a> for completing the other launch tabs, e.g.
-Resources, Application, Arguments, Environment, Synchronize.
-<p><br></p>
-</li>
-<li>Switch to the <b>Debugger</b> tab.
-<p><br></p>
-<p><img src="images/06launchConfig.png"></p>
-<p><br></p>
-</li>
-<li>If no debugger is visible in the <b>Debugger</b> drop-down,
-	select one. This is the debugger that will control the parallel debug
-	session. Currently only <b>SDM</b> is supported (SDM stands for
-	Scalable Debug Manager), so select this.
-	<p><br></p>
-	</li>
-	<li>
-	If you wish the debugger to automatically suspend the
-	application on launch, make sure <b>Stop at main() on startup</b> is
-	checked
-	<p><br></p>
-	</li>
-	<li>
-	Under <b>Debugger Options</b>, leave the <b>Debugger backend</b> set to <code>gdb-mi</code>.
-	<p><br></p>
-	</li>
-	<li>Make sure that the <b>Path to debugger
-	executable</b> is correct.
-	<p><br></p>
-	<p>If you are debugging on the local machine, this path should
-	point to the <code>sdm</code> executable in your Ecilpse installation's
-	<code>plugins/org.eclipse.ptp.<i>os.arch_version</i>/bin</code>
-	directory, where <code><i>os.arch_version</i></code> is your operating
-	system (<code>linux</code>, <code>macosx</code>, or <code>aix</code>),
-	architecture (<code>x86</code>, <code>x86_64</code>, or <code>ppc</code>),
-	and version number of the plugin (e.g. <code>5.0.0.201106080812</code>).</p>
-	<p><br></p>
-	<b>Note: This may have required an extra step during installation to build this executable.</b>
-	<p><br></p>
-	<p>If you are debugging remotely, then this path will be the path
-	to where the <code>sdm</code> executable was installed on the remote
-	machine.</p>
-	<p><br></p>
-	</li>
-	<li>
-	<p>Set the <b>Debugger session address</b>. This is the address
-	that the debugger will connect to when it starts, and will depend on
-	where you are launching the application:</p>
-	<p><br></p>
-	<p>If you are launching onto the local machine, or onto a remote
-	machine using port forwarding, use <code>localhost</code>. (Note that
-	you will need to have the <code>GatewayPorts</code> option set to <code>yes</code>
-	in the <code>sshd</code> configuration file on the remote system for
-	this to work with port forwarding.)</p>
-	<p><br></p>
-	<p>If you are launching onto a remote machine without using port
-	forwarding, then this should be the address of the local machine (the
-	one running Eclipse). <i>This address must be accessible from the
-	remote machine.</i>. If your local network configuration precludes the
-	remote machine accessing your local machine, you will need to
-	reconfigure the resource manager to use port forwarding.</p>
-	</li>
-	</ol>
-
-
-<h2 id="feat">The Parallel Debug perspective</h2>
-<p>The Parallel Debug perspective is used when debugging a parallel application. The default behavior is to switch to the 
-perspective when a debug session is launched. Experienced Eclipse users will notice that many 
-of the views are similar to those available in the CDT Debug perspective. Please refer to the <b>C/C++ Development User Guide</b> for
-a description of these views.</p>
-
-<p><img src="images/06ptpDebugPersp.png"></p>
-<p>This image shows a typical debug session. In the upper left of the perspective is the <b>Parallel Debug view</b> which shows the processes associated with the job, 
-and allows bulk control of the processes. Underneath this is the <b>Debug view</b> which is the standard view showing process threads and stack frames. The 
-source window shows a current line marker, which represents the current location of all 64 processes. In the upper right, the Variables view
- is showing the variables from the processes currently selected in the Debug view. There are also a number of other views available for setting breakpoints, 
- manipulating signals, etc. Below this is the standard <b>Outline view</b>. At the very bottom are the standard <b>Problems</b>, <b>Console</b>, and <b>Memory</b> 
- views.</p>
-
-<h2 id="pSets">Process Sets</h2>
-<p>A key concept for debugging parallel programs with PTP is the notion of a <i>process set</i>. Traditional debuggers apply operations to a single
-process.  Parallel debugging operations apply to arbitrary collections of processes (including a single process). The PTP debugger calls these arbitrary 
-collections process sets, and uses them as a means of simultaneously referring to one or more processes.</p>
-
-<p>When a parallel debug session is first started, all processes are contained
-in a set, called the <b>Root</b> set.  Sets are always associated with a single Job.
-A job can have any number of process sets, and a set can contain from 1 to the
-number of processes in a job. Process sets from the same job can contain overlapping sets of processes. This is
-shown in the following diagram.</p>
-
-<p><img src="images/06pSets.png"></p>
-
-<p>Debug commands on the Parallel Debug view toolbar always apply to the <i>current process set</i>, which is the set of processes that is visible in the view.</p>
-
-<p><img src="images/06parallelDebugViewCmds.png"></p>
-
-<h2 id="pSetsOper">Operations on Process sets</h2>
-
-<p>PTP provides buttons on the toolbar of the Parallel Debug view
-to create, modify, and delete process sets, and to change
-the current process set.</p>
-
-<p><img src="images/06parallelDebugViewSets.png"></p>
-
-
-<h2 id="pSetsCreate">Managing Process Sets</h2>
-
-<p>Select the processes to be placed in the set
-by selecting a rectangular region with the mouse,
-or click the mouse and shift-click or ctrl-click to 
-select a contiguous region, or separate processes, respectively.</p>
-
-<p>For example, to select a rectangular set of processes:</p>
-
-<p><img src="images/06pSetSelect.png")</script></p>
-
-<p>Once the processes have been selected, create a process set clicking on the <b>Create Set button</b> <img src="images/06createProcessSetIcon.png">.</p>
-
-<p><img src="images/06selectProcessSetCreate.png")</script></p>
-
-<p>To add processes to an existing process set, select the processes you wish to add and click on
-the down-arrow <img src="images/06downArrowSelect.png"> to the right of the icon:</p>
-
-<p><img src="images/06selectProcessSetCreateAdd.png"></p>
-
-
-<p>To change the current process set, select the <b>Change Set button</b>
-<img src="images/06pSetChooseIcon.png">
-and choose from the list via the down-arrow <img src="images/06downArrowSelect.png">, or 
-click on the button itself to cycle through the sets.</p>
-
-<p><img src="images/06pSetChange.png")</script></p>
-
-<p>To remove processes from the <i>current set</i>, select the processes 
-as described above, and click the
-<b>Remove Elements button</b>.</p>
-
-<p><img src="images/06pSetRemove.png"></p>
-
-<p>Select the <b>Delete Set button</b> to delete the current process set:</p>
-
-<p><img src="images/06pSetDelete.png"></p>
-
-<h2 id="bkpt">Breakpoints</h2>
-<p>PTP has a special type of breakpoint known as a <i>parallel breakpoint</i>. These breakpoints differ from normal breakpoints 
-because they apply to a set of processes instead of a single process (or thread). There are two types of parallel breakpoints:</p>
-
-<ul>
-<li><p><i>Global breakpoints</i> apply to <i>all</i> processes in <i>any</i> job. A global breakpoint remains in effect between job launches. 
-Typically, a global breakpoint is used for gaining control of an application at a predetermined point. Global breakpoints are identified by a 
-parallel breakpoint icon with a small <code>G</code> in the upper left corner:</p>
-<p><br></p>
-<p><img src="images/06globalBreakpoint.png"></p> 
-<p><br></p>
-</li>
-
-<li><p><i>Set Breakpoints </i> apply only to a <i>specific set</i> of processes
-(which can include the root set) for a <i>single</i> job. When the job completes,
-these breakpoints are removed.</p>
-<p><br></p>
-<p><img src="images/06setBreakpoint.png"></p> 
-<p><br></p>
-</li>
-<p>Set breakpoints can be one of three colors:<p>
-<ul>
-<li><p>Green indicates the breakpoint applies to the current set.</p></li>
-<li><p>Blue indicates the breakpoint applies to some other set than the current set, but there are overlapping processes in the sets.</p></li>
-<li><p>Yellow indicates the breakpoint applies to some other set than the current set, and there are no overlapping processes in the sets.</p></li>
-</ul>
-</ul>
-
-<h3>Setting a breakpoint</h3><p>
-To create a breakpoint, double-click on the left edge of 
-an editor window, at the line on which you want to set the breakpoint.
-You can also right-click and use the <b>Parallel Breakpoint &gt; Toggle breakpoint</b> context menu.</p>
-
-<p><img src="images/06bkptSetContext.png"></p> 
-
-<p>A global breakpoint is created if no jobs are selected in the Parallel Debug view.
-If a job is selected, the breakpoint will apply to the current set.</p>
-
-<h3>Breakpoint information</h3>
-
-<p>There are a number of ways to find out more information about a breakpoint, such as the source file, line and process set it applies to. 
-Placing the mouse over a breakpoint will display a tooltip popup:</p>
-
-<p><img src="images/06bkptHover.png"></p> 
-
-<p>The <b>Breakpoints view</b> can be used to see all breakpoints that have been created: </p>
-
-<p><img src="images/06bkptsView.png"></p> 
-
-<p>Use <b>Show &gt; Parallel Breakpoint Set</b> in the menu on the Breakpoints view toolbar to group breakpoints
-by the process set they apply to:</p>
-
-<p><img src="images/06bkptsViewMenu.png"></p> 
-
-<p>For example the above selection will list the breakpoints
-by process set:</p>
-
-<p><img src="images/06bkptsViewByProcessSet.png"></p> 
-
-<h2 id="cip">Current Instruction Pointer</h2>
-<p>The current instruction pointer is used to show the current
-location of <i>suspended</i> processes.
-In traditional programs, there is only a single instruction pointer displayed at any one time.
-In parallel programs, there is an instruction pointer for every process.</p>
-
-<p>The PTP debugger shows one instruction pointer for
-<i>every group of processes at the same location</i>. In the following example, there are processes suspended
-at three different locations in the program.</p>
-
-<p><img src="images/06mip.png"></p> 
-
-<p><i>The group of processes represented by an instruction pointer
-is not necessarily the same as a process set.</i></p>
-
-<p>Different markers are used to indicate the types of processes stopped at that location (the different types will be discussed below):</p>
-<ul>
-<li><p><img src="images/06ipReg.png">Registered processes marker</p></li>
-<li><p><img src="images/06ipUnreg.png">Un-registered processes marker</p></li>
-<li><p><img src="images/06ipMult.png">Marker indicating a combination of registered and un-registered processes</p></li>
-</ul>
-
-<p>Placing the mouse over an instruction pointer provides additional information about the processes suspended at that location:</p>
-<p><img src="images/06cipHover.png"></p> 
-
-<h2 id="reg">Process Registration and the Debug View</h2> 
-
-<p>Once processes of a parallel job have been suspended, it is often desirable to obtain more detailed information about an individual process. 
-In order to do this, a particular process must first be <i>registered</i>. Once a process is registered it's threads and stack frames appear in 
-the Debug view. By selecting the stack frame in this view, detailed information about the local variables can be obtained in the Variables view.</p>
-
-<p>Any number of processes can be registered, and processes can be registered or un-registered at any time. To register a process, double-click its 
-process icon in the Parallel Debug view. A black box will be shown around the process icon to indicate that it has been registered. At the same time, 
-the process will appear in the Debug view.</p>
-
-<p><img src="images/06reg1.png"></p>
-
-<p>To un-register a process, double-click on the same process icon. The box disappears, and the process is removed from the debug view.</p>
-
-<p>The Debug view also provides a set of debug commands (resume, pause, step over, etc.) that apply to the <i>currently selected process</i> in the view. 
-This provides a convenient means of controlling individual processes.</p>
-
-<h2 id="finish">Terminating Execution</h2>
-At the end of a debug session, it is necessary to terminate the execution of the job. To do this, click on the terminate icon 
-<img src="images/06terminateAll.png"> in the Parallel Debug view.  Note that the terminate icon in the Debug view
- <img src="images/06terminate.png"> will only terminate the currently selected process in that view.
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-
-</body>
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/org.eclipse.ptp.doc.user/html/07ptpPrefs.html b/core/org.eclipse.ptp.doc.user/html/07ptpPrefs.html
deleted file mode 100755
index 57d8747..0000000
--- a/core/org.eclipse.ptp.doc.user/html/07ptpPrefs.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<html>
-<head>
-<title>Preferences</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head>
-<body>
-
-<h1>Preferences</h1>
-<p>Topics include:</p>
-<ul>
-	<li><a href="#open">Opening PTP Preferences</li>
-	<li><a href="#main">Main Parallel Tools Preferences </li>
-	<li><a href="#debug">Debug Preferences  </li>
-	<ul>
-		<li><a href="#sdm">SDM (Scalable Debug Manager) Preferences</a></li>
-	</ul>
-	<li><a href="#external">External Tools Framework (ETFw) Preferences</a></li>
-	<li><a href="#pldt">PLDT</a></li>
-	
-	<li><a href="#rm">Resource Manager Preferences</a></li>
-	<li><a href="#viewer">PTP Viewer Preferences</a></li>
-	<li><a href="#service">Service Configurations Preferences </a></li>
-</ul>
-<h2 id="open">Opening the PTP Preferences</h2>
-<p>To open the <b>Preferences dialog</b>, select:</p>
-<ul>
-	<li>
-	<p><b>Window &gt; Preferences...</b> for Windows and Linux</p>
-	</li>
-	<li>
-	<p><b>Eclipse &gt; Preferences...</b> for MacOS X</p>
-	</li>
-</ul>
-
-<p>Next, expand <b>Parallel Tools</b> in the list of preferences
-pages on the left side and choose the component's preferences you wish
-to change. The following image shows all available components:</p>
-
-<p><img src="images/07prefsAll.png"></p>
-
-<h2 id="main"><a name="run"></a>Parallel Tools Preference Page</h2>
-<p>This is the main preferences page for PTP. Available preferences
-are:</p>
-<dl>
-	<dt><b>Temporary output directory</b></dt>
-	<dd>Temporary directory to use to save process output</dd>
-	<dt><b>Console buffer size (lines)</b></dt>
-	<dd>Number of lines of output from each process to save (0 means
-	infinite)</dd>
-</dl>
-
-<h2 id="debug">Debug Preferences Page (Parallel Tools &gt; Debug)</h2>
-<p>This is the main parallel debugger preferences page. These are
-preferences that apply to any parallel debugger.</p>
-<p><img src="images/07prefsDebug.png"></p>
-
-<h3>Default setting</h3>
-<p>These preferences control some debugger default behavior</p>
-<dl>
-	<dt><b>Show full paths on breakpoint</b> (default disabled)</dt>
-	<dd>Use the full path to the source file when displayed in the
-	debugger <b>Breakpoint view</b></dd>
-	<dt><b>Register process 0 by default</b> (default enabled)</dt>
-	<dd>Will register process 0 with the <b>Debug view</b> when the
-	parallel debugger starts. This is required to enable Eclipse to switch
-	automatically to the <b>PTP Debug perspective</b> when a debugger
-	breakpoint is hit.</dd>
-</dl>
-
-<h3>Communication</h3>
-<p>These are preferences relating to the communication between
-Eclipse and the external parallel debugger. They do not normally need to
-be changed.</p>
-<dl>
-	<dt><b>Command timeout (ms)</b> (default 60000)</dt>
-	<dd>This specifices the period Eclipse waits after sending a
-	command to the external debugger. If no response is received the debug
-	session will be terminated.</dd>
-</dl>
-
-<h3>Variable</h3>
-<p>These variables control the action of the debugger to update
-variable information.</p>
-<dl>
-	<dt><b>The debugger is suspended</b> (default enabled)</dt>
-	<dd>The debugger allows variable values to be displayed in tooltip
-	popups when the mouse hovers over a process in the <b>Parallel
-	Debug view</b>. Enabling this option will update all the values each time
-	the process is suspended. When this option is disabled, the value will
-	be updated when the tooltip popup is displayed.</dd>
-	<dt><b>Job or Set is changed</b> (default disabled)</dt>
-	<dd>Variable values will be updated when the current job or set is
-	changed.</dd>
-</dl>
-
-<h2 id="sdm">SDM (Scalable Debug Manager) Preferences (Parallel Tools &gt;
-Debug &gt; SDM)</h2>
-<p>These are preferences for controlling the behavior of the
-scalable debug manager, which is server component of the parallel
-debugger. They do not normally need to be changed.</p>
-
-<p><img src="images/07prefsDebugSDM.png"></p>
-
-<h3>Debugger launch preferences</h3>
-<p>These preferences control how the debugger behaves when it is
-launched. They do not normally need to be altered.</p>
-
-<dl>
-	<dt><b>Backend debugger</b> (default gdb-mi)</dt>
-	<dd>The name of the backend debugger to use when debugging the
-	application. This is an internal name known by the SDM, not the name of
-	the debugger itself. Currently only gdb using the MI mode is supported.</dd>
-	<dt><b>Path to backend debugger</b> (default empty)</dt>
-	<dd>If the backend debugger (e.g. gdb) is not located in a standard directory
-	then this field can be used to specify an alternate location.</dd>
-	<dt><b>Extra SDM arguments</b> (default empty)</dt>
-	<dd>Any extra arguments that need to be supplied to the sdm (e.g.
-	for debugging purposes)</dd>
-</dl>
-
-<h3>SDM debugging options</h3>
-<p>These preference allow the SDM operation to be debugged. They are
-normally only used by PTP developers.</p>
-
-<dl>
-	<dt><b>Enable SDM debugging</b></dt>
-	<dd>This turns on debugging of the SDM. Additional options can be
-	set to control the type and amount of debugging information that is
-	generated.</dd>
-	<dt><b>Enable SDM client debugging</b></dt>
-	<dd>Enables debugging of the SDM Eclipse client. Additional
-	options can be set to control the type and amount of debugging
-	information that is generated.</dd>
-</dl>
-
-<h2 id="external">External Tools Preferences Page (Parallel Tools &gt; External Tools)</h2>
-<p>This is a category for configuring external tools that are
-provided using the ETFw extensions.
-For more information see <a href="http://wiki.eclipse.org/PTP/ETFw/PTP_External_Tools_Framework">the ETFw wiki page</a>.
-</p>
-<p><img src="images/07prefsExternal.png"></p>
-<a name="feedback"></a>
-<p>The Feedback view preferences page handles cases where extensions are installed that utilize the
-Feedback view.  Here a checkbox controls whether or not the items in the Feedback tree table view
-are left expanded/contracted or not.
-See <a href="PLUGINS_ROOT/org.eclipse.ptp.etfw.feedback/html/toc.html">
-Feedback view</a> for more information.
-</p>
-<p><img src="images/07prefsExternal2.png"></p>
-<p>The Tool Configuration Location page allows the user to enter information about where to find
-tools that utilize the ETFw extensions.  In this case PPW and TAU tools can have their bin directories specified.
-
-</p>
-<p><img src="images/07prefsExternal3.png"></p>
-
-<h2 id="pldt">Parallel Language Development Tools (PLDT) Preferences</h2>
-<p>See the help for <a
-	href="PLUGINS_ROOT/org.eclipse.ptp.pldt.doc.user/html/toc.html">PLDT</a></p>
-
-<h2 id="rm">Resource Manager Preferences (Parallel Tools &gt;
-Resource Managers )</h2>
-<p>These are preferences for controlling the behavior of resource managers.</p>
-
-<p><img src="images/07prefsRM.png"></p>
-
-<h3>General settings for resource managers</h3>
-<p>These are general preferences that apply to all resource managers.</p>
-<dl>
-	<dt><b>Start resource managers when Eclipse launches</b> (default enabled)</dt>
-	<dd>When this option is selection, any resource managers
-	that were running from a previous session will be restarted automatically.</dd>
-</dl>
-
-<p>See the help for <a
-	href="PLUGINS_ROOT/org.eclipse.ptp.ibmll.help/html/IBMLLMainHelp.html">Loadleveler</a>
-and <a
-	href="PLUGINS_ROOT/org.eclipse.ptp.ibmpe.help/html/PEMainHelp.html">Parallel
-Environment</a> for details on their preference pages.</p>
-
-<h2 id="viewer">Viewer (Parallel Tools &gt; Viewer)</h2>
-<p>These preferences are used to change the behavior of some of the
-PTP views. They do not normally need to be altered.</p>
-<p><img src="images/07prefsViewer.png"></p>
-
-<h3>Tooltip</h3>
-<p>Controls the way tooltips for PTP variables are displayed.</p>
-<dl>
-	<dt><b>Show all the time</b></dt>
-	<dd>Always show tooltips</dd>
-	<dt><b>Timeout (ms)</b> (default 5000)</dt>
-	<dd>Changes the time the tooltip remains displayed when the mouse
-	hovers over a node or process icon.</dd>
-	<dt><b>Wrap text</b> (default enabled)</dt>
-	<dd>Wrap the text to fit into the tooltip</dd>
-</dl>
-
-<h2 id="service">Service Configurations Preferences (Parallel Tools
-&gt; Service Configurations)</h2>
-
-<p>This preference page allows you to add, remove, or edit service
-configurations.</p>
-<p><img src="images/07prefsServiceConfig.png"></p>
-
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to
-Table of Contents</a>
-</body>
-</html>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/org.eclipse.ptp.doc.user/html/help.css b/core/org.eclipse.ptp.doc.user/html/help.css
deleted file mode 100644
index f34a23d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/help.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/* following font face declarations need to be removed for DBCS */
-
-
-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, sans-serif; color: #000000}
-pre				{ font-family: Courier, monospace}
-
-/* end font face declarations */
-
-/* following font size declarations should be OK for DBCS */
-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; }
-pre				{ font-size: 10pt}
-
-/* end font size declarations */
-
-body	     { background: #FFFFFF}
-h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	
-h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
-h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
-h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
-p 	     { font-size: 10pt; }
-pre	     { margin-left: 6; font-size: 9pt }
-
-a:link { color: #006699 }
-a:visited { color: #996699 }
-a:hover  { color: #006699 }
-
-ul	     { margin-top: 0; margin-bottom: 10 }
-li	     { margin-top: 0; margin-bottom: 0 } 
-li p	     { margin-top: 0; margin-bottom: 0 } 
-ol	     { margin-top: 0; margin-bottom: 10 }
-dl	     { margin-top: 0; margin-bottom: 10 }
-dt	     { margin-top: 0; margin-bottom: 0; font-weight: bold }
-dd	     { margin-top: 0; margin-bottom: 0 }
-strong	     { font-weight: bold}
-em	     { font-style: italic}
-var	     { font-style: italic}
-div.revision { border-left-style: solid; border-left-width: thin; 
-				   border-left-color: #7B68EE; padding-left:5 }
-th	     { font-weight: bold }
-
-/* Mike Behm's addition to the style sheet */
-.userinput { font-family: monospace; }
-.guitab, .important, .guibutton, .selectblue, .guimenu, .guilabel, 
-.notetitle  {
-     color: #000000;
-     font-family: helvetica, arial, sans-serif;
-     font-weight: bold;
-     }
-div.linux  {display:none;}
-.firsterm {font-style:italic;}
-
diff --git a/core/org.eclipse.ptp.doc.user/html/images/.cvsignore b/core/org.eclipse.ptp.doc.user/html/images/.cvsignore
deleted file mode 100755
index 980b5d2..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-pspbrwse.jbf
-old
diff --git a/core/org.eclipse.ptp.doc.user/html/images/01mpiProjSettings.png b/core/org.eclipse.ptp.doc.user/html/images/01mpiProjSettings.png
deleted file mode 100644
index 756ab8f..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/01mpiProjSettings.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/01newMPIproject.png b/core/org.eclipse.ptp.doc.user/html/images/01newMPIproject.png
deleted file mode 100644
index 89ccf7c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/01newMPIproject.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/01proj.png b/core/org.eclipse.ptp.doc.user/html/images/01proj.png
deleted file mode 100644
index 33db54d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/01proj.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/01projBasicSettings.png b/core/org.eclipse.ptp.doc.user/html/images/01projBasicSettings.png
deleted file mode 100644
index d994e6c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/01projBasicSettings.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/01wbSrcEditor.png b/core/org.eclipse.ptp.doc.user/html/images/01wbSrcEditor.png
deleted file mode 100644
index 32a9369..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/01wbSrcEditor.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Configuration.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Configuration.png
deleted file mode 100644
index fa8c3a6..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Configuration.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Local.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Local.png
deleted file mode 100644
index 3aab13f..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Local.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote.png
deleted file mode 100644
index 985a0e8..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote0.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote0.png
deleted file mode 100644
index 0ecca88..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote0.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote1.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote1.png
deleted file mode 100644
index 21ae0db..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-Connection-Remote1.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Edit.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Edit.png
deleted file mode 100644
index 9ce03b5..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Edit.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-List.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-List.png
deleted file mode 100644
index f989454..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-List.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Machines.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Machines.png
deleted file mode 100644
index daccbc3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Machines.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Remove.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Remove.png
deleted file mode 100644
index 5b6faf3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Remove.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Running.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Running.png
deleted file mode 100644
index c5abd1e..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Running.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Start.png b/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Start.png
deleted file mode 100644
index d1bf10b..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02-RM-OpenMPI-View-Start.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02ChangeResMgrStartup.png b/core/org.eclipse.ptp.doc.user/html/images/02ChangeResMgrStartup.png
deleted file mode 100644
index 5b96e82..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02ChangeResMgrStartup.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02ChooseResMgrNameAndDesc.png b/core/org.eclipse.ptp.doc.user/html/images/02ChooseResMgrNameAndDesc.png
deleted file mode 100644
index fb6284a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02ChooseResMgrNameAndDesc.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch01.png b/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch01.png
deleted file mode 100644
index 78b4e68..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch01.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch02.png b/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch02.png
deleted file mode 100644
index a422d3a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch02.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch03.png b/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch03.png
deleted file mode 100644
index 21ae0db..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch03.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch04.png b/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch04.png
deleted file mode 100644
index e8c238a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02GenericRemLaunch04.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02RuntimePerspEmpty.png b/core/org.eclipse.ptp.doc.user/html/images/02RuntimePerspEmpty.png
deleted file mode 100644
index 64910e5..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02RuntimePerspEmpty.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02addResMgr.png b/core/org.eclipse.ptp.doc.user/html/images/02addResMgr.png
deleted file mode 100644
index 10a0d9e..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02addResMgr.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType.png b/core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType.png
deleted file mode 100644
index 6328e43..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02chooseResMgrType.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02newRemoteHost.png b/core/org.eclipse.ptp.doc.user/html/images/02newRemoteHost.png
deleted file mode 100644
index f126a07..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02newRemoteHost.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02remoteBrowseProxy.png b/core/org.eclipse.ptp.doc.user/html/images/02remoteBrowseProxy.png
deleted file mode 100644
index 7f0cce3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02remoteBrowseProxy.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02resMgrEdit.png b/core/org.eclipse.ptp.doc.user/html/images/02resMgrEdit.png
deleted file mode 100644
index 0ba69c3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02resMgrEdit.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02resMgrListOrteLocal.png b/core/org.eclipse.ptp.doc.user/html/images/02resMgrListOrteLocal.png
deleted file mode 100644
index 247ba17..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02resMgrListOrteLocal.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02resMgrRemove.png b/core/org.eclipse.ptp.doc.user/html/images/02resMgrRemove.png
deleted file mode 100644
index cd5a38e..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02resMgrRemove.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02resMgrRunning.png b/core/org.eclipse.ptp.doc.user/html/images/02resMgrRunning.png
deleted file mode 100644
index 5463a85..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02resMgrRunning.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02resMgrStart.png b/core/org.eclipse.ptp.doc.user/html/images/02resMgrStart.png
deleted file mode 100644
index 591ed4a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02resMgrStart.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/02rmServiceConfig.png b/core/org.eclipse.ptp.doc.user/html/images/02rmServiceConfig.png
deleted file mode 100644
index 2dc0812..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/02rmServiceConfig.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03combinedConsole1.png b/core/org.eclipse.ptp.doc.user/html/images/03combinedConsole1.png
deleted file mode 100644
index a630514..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03combinedConsole1.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch1.png b/core/org.eclipse.ptp.doc.user/html/images/03launch1.png
deleted file mode 100644
index 4a878a3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch1.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch1a.png b/core/org.eclipse.ptp.doc.user/html/images/03launch1a.png
deleted file mode 100644
index 712c798..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch1a.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch2.png b/core/org.eclipse.ptp.doc.user/html/images/03launch2.png
deleted file mode 100644
index b804e79..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch2.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch3.png b/core/org.eclipse.ptp.doc.user/html/images/03launch3.png
deleted file mode 100644
index 5332435..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch3.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch4.png b/core/org.eclipse.ptp.doc.user/html/images/03launch4.png
deleted file mode 100644
index fcc58d8..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch4.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch5.png b/core/org.eclipse.ptp.doc.user/html/images/03launch5.png
deleted file mode 100644
index ec2a2ce..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch5.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch6.png b/core/org.eclipse.ptp.doc.user/html/images/03launch6.png
deleted file mode 100644
index 7ef041f..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch6.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch7.png b/core/org.eclipse.ptp.doc.user/html/images/03launch7.png
deleted file mode 100644
index 76e8a66..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch7.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch8.png b/core/org.eclipse.ptp.doc.user/html/images/03launch8.png
deleted file mode 100644
index 0be70ff..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch8.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launch9.png b/core/org.eclipse.ptp.doc.user/html/images/03launch9.png
deleted file mode 100644
index 5ca1276..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launch9.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/03launchResTab.png b/core/org.eclipse.ptp.doc.user/html/images/03launchResTab.png
deleted file mode 100644
index 7da0549..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/03launchResTab.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05activeJobs1.png b/core/org.eclipse.ptp.doc.user/html/images/05activeJobs1.png
deleted file mode 100644
index 7892ea3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05activeJobs1.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05activeJobs2.png b/core/org.eclipse.ptp.doc.user/html/images/05activeJobs2.png
deleted file mode 100644
index a5856e8..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05activeJobs2.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05activeJobs3.png b/core/org.eclipse.ptp.doc.user/html/images/05activeJobs3.png
deleted file mode 100644
index 69ea026..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05activeJobs3.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05inactiveJobs1.png b/core/org.eclipse.ptp.doc.user/html/images/05inactiveJobs1.png
deleted file mode 100644
index c7ac2a7..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05inactiveJobs1.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05inactiveJobs2.png b/core/org.eclipse.ptp.doc.user/html/images/05inactiveJobs2.png
deleted file mode 100644
index ac0efeb..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05inactiveJobs2.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05legendIcon.png b/core/org.eclipse.ptp.doc.user/html/images/05legendIcon.png
deleted file mode 100644
index 7ae660e..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05legendIcon.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05parallel_perspective.png b/core/org.eclipse.ptp.doc.user/html/images/05parallel_perspective.png
deleted file mode 100644
index c292250..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05parallel_perspective.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegend.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpLegend.png
deleted file mode 100644
index eb4d1a8..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegend.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendJobProcess.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendJobProcess.png
deleted file mode 100644
index 675ffd3..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendJobProcess.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendMachines.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendMachines.png
deleted file mode 100644
index f8ed957..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendMachines.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendResMgr.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendResMgr.png
deleted file mode 100644
index 790e6d4..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpLegendResMgr.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeConsoleView.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeConsoleView.png
deleted file mode 100644
index 41b99bb..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeConsoleView.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsView.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsView.png
deleted file mode 100644
index bfd619f..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsView.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsViewHover.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsViewHover.png
deleted file mode 100644
index a6e9b75..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeJobsViewHover.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeProcessDetails.png b/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeProcessDetails.png
deleted file mode 100644
index 7d6e79c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05ptpRuntimeProcessDetails.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05runtimeMachinesView.png b/core/org.eclipse.ptp.doc.user/html/images/05runtimeMachinesView.png
deleted file mode 100644
index bee9852..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05runtimeMachinesView.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05runtimeNodeDetails.png b/core/org.eclipse.ptp.doc.user/html/images/05runtimeNodeDetails.png
deleted file mode 100644
index f116f0f..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05runtimeNodeDetails.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05runtimePerspAnn.png b/core/org.eclipse.ptp.doc.user/html/images/05runtimePerspAnn.png
deleted file mode 100644
index 201d1b6..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05runtimePerspAnn.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05runtimeResMgrView.png b/core/org.eclipse.ptp.doc.user/html/images/05runtimeResMgrView.png
deleted file mode 100644
index 201a266..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05runtimeResMgrView.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05sysMonPersp.png b/core/org.eclipse.ptp.doc.user/html/images/05sysMonPersp.png
deleted file mode 100644
index a206ccf..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05sysMonPersp.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/05sysMonView1.png b/core/org.eclipse.ptp.doc.user/html/images/05sysMonView1.png
deleted file mode 100644
index a15fc11..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/05sysMonView1.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06bkptHover.png b/core/org.eclipse.ptp.doc.user/html/images/06bkptHover.png
deleted file mode 100644
index d8869f1..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06bkptHover.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06bkptSetContext.png b/core/org.eclipse.ptp.doc.user/html/images/06bkptSetContext.png
deleted file mode 100644
index cf79560..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06bkptSetContext.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06bkptsView.png b/core/org.eclipse.ptp.doc.user/html/images/06bkptsView.png
deleted file mode 100644
index 8995d4a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06bkptsView.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewByProcessSet.png b/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewByProcessSet.png
deleted file mode 100644
index f798772..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewByProcessSet.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewMenu.png b/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewMenu.png
deleted file mode 100644
index 4f54600..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06bkptsViewMenu.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06cipHover.png b/core/org.eclipse.ptp.doc.user/html/images/06cipHover.png
deleted file mode 100644
index 4eb6521..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06cipHover.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06createProcessSetIcon.png b/core/org.eclipse.ptp.doc.user/html/images/06createProcessSetIcon.png
deleted file mode 100644
index 79c8afc..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06createProcessSetIcon.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06downArrowSelect.png b/core/org.eclipse.ptp.doc.user/html/images/06downArrowSelect.png
deleted file mode 100644
index e788b0d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06downArrowSelect.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06globalBreakpoint.png b/core/org.eclipse.ptp.doc.user/html/images/06globalBreakpoint.png
deleted file mode 100644
index 6a7e594..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06globalBreakpoint.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06ipMult.png b/core/org.eclipse.ptp.doc.user/html/images/06ipMult.png
deleted file mode 100644
index 4b23dd2..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06ipMult.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06ipReg.png b/core/org.eclipse.ptp.doc.user/html/images/06ipReg.png
deleted file mode 100644
index fbde720..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06ipReg.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06ipUnreg.png b/core/org.eclipse.ptp.doc.user/html/images/06ipUnreg.png
deleted file mode 100644
index f959eca..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06ipUnreg.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06launchConfig.png b/core/org.eclipse.ptp.doc.user/html/images/06launchConfig.png
deleted file mode 100644
index a6895c0..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06launchConfig.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06mip.png b/core/org.eclipse.ptp.doc.user/html/images/06mip.png
deleted file mode 100644
index f5a5d32..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06mip.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSetChange.png b/core/org.eclipse.ptp.doc.user/html/images/06pSetChange.png
deleted file mode 100644
index 1198c6a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSetChange.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSetChooseIcon.png b/core/org.eclipse.ptp.doc.user/html/images/06pSetChooseIcon.png
deleted file mode 100644
index 856a532..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSetChooseIcon.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSetDelete.png b/core/org.eclipse.ptp.doc.user/html/images/06pSetDelete.png
deleted file mode 100644
index 65f7bf2..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSetDelete.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSetRemove.png b/core/org.eclipse.ptp.doc.user/html/images/06pSetRemove.png
deleted file mode 100644
index a08c58b..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSetRemove.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSetSelect.png b/core/org.eclipse.ptp.doc.user/html/images/06pSetSelect.png
deleted file mode 100644
index 681df01..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSetSelect.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06pSets.png b/core/org.eclipse.ptp.doc.user/html/images/06pSets.png
deleted file mode 100644
index a4d0b2c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06pSets.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewCmds.png b/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewCmds.png
deleted file mode 100644
index 4faa53f..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewCmds.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewSets.png b/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewSets.png
deleted file mode 100644
index 1741eda..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06parallelDebugViewSets.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06ptpDebugPersp.png b/core/org.eclipse.ptp.doc.user/html/images/06ptpDebugPersp.png
deleted file mode 100644
index 6833b7d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06ptpDebugPersp.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06reg1.png b/core/org.eclipse.ptp.doc.user/html/images/06reg1.png
deleted file mode 100644
index e6e472b..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06reg1.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreate.png b/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreate.png
deleted file mode 100644
index acfde81..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreate.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreateAdd.png b/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreateAdd.png
deleted file mode 100644
index 1bebf2a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06selectProcessSetCreateAdd.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06setBreakpoint.png b/core/org.eclipse.ptp.doc.user/html/images/06setBreakpoint.png
deleted file mode 100644
index 1526500..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06setBreakpoint.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06terminate.png b/core/org.eclipse.ptp.doc.user/html/images/06terminate.png
deleted file mode 100644
index cefcfc8..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06terminate.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/06terminateAll.png b/core/org.eclipse.ptp.doc.user/html/images/06terminateAll.png
deleted file mode 100644
index 7328b02..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/06terminateAll.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsAll.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsAll.png
deleted file mode 100644
index fdfd1ba..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsAll.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsDebug.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsDebug.png
deleted file mode 100644
index 73fd705..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsDebug.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsDebugSDM.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsDebugSDM.png
deleted file mode 100644
index 796787d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsDebugSDM.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsExternal.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsExternal.png
deleted file mode 100644
index 19438fd..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsExternal.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsExternal2.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsExternal2.png
deleted file mode 100644
index 6c0fc2c..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsExternal2.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsExternal3.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsExternal3.png
deleted file mode 100644
index a036e15..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsExternal3.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsRM.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsRM.png
deleted file mode 100644
index 6420396..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsRM.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsServiceConfig.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsServiceConfig.png
deleted file mode 100644
index 3c6b9ad..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsServiceConfig.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/07prefsViewer.png b/core/org.eclipse.ptp.doc.user/html/images/07prefsViewer.png
deleted file mode 100644
index fb3762d..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/07prefsViewer.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/rm-new-project-provider.png b/core/org.eclipse.ptp.doc.user/html/images/rm-new-project-provider.png
deleted file mode 100644
index e5845fc..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/rm-new-project-provider.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-contextMenu.png b/core/org.eclipse.ptp.doc.user/html/images/sync-contextMenu.png
deleted file mode 100644
index db747b6..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-contextMenu.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-conversionWizard.png b/core/org.eclipse.ptp.doc.user/html/images/sync-conversionWizard.png
deleted file mode 100644
index 2f4413f..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-conversionWizard.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-newproj.png b/core/org.eclipse.ptp.doc.user/html/images/sync-newproj.png
deleted file mode 100644
index 9e34c27..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-newproj.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojConfigLocn.png b/core/org.eclipse.ptp.doc.user/html/images/sync-newprojConfigLocn.png
deleted file mode 100644
index e6cff19..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojConfigLocn.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojConnect.png b/core/org.eclipse.ptp.doc.user/html/images/sync-newprojConnect.png
deleted file mode 100644
index 4a988d9..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojConnect.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojConnection.png b/core/org.eclipse.ptp.doc.user/html/images/sync-newprojConnection.png
deleted file mode 100644
index d4cece1..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojConnection.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojContext.png b/core/org.eclipse.ptp.doc.user/html/images/sync-newprojContext.png
deleted file mode 100644
index b31bc78..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojContext.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojCreate.png b/core/org.eclipse.ptp.doc.user/html/images/sync-newprojCreate.png
deleted file mode 100644
index 1807a02..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojCreate.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojLocn.png b/core/org.eclipse.ptp.doc.user/html/images/sync-newprojLocn.png
deleted file mode 100644
index 0468fab..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojLocn.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojNewConnection.png b/core/org.eclipse.ptp.doc.user/html/images/sync-newprojNewConnection.png
deleted file mode 100644
index 29c153a..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-newprojNewConnection.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-projProperties.png b/core/org.eclipse.ptp.doc.user/html/images/sync-projProperties.png
deleted file mode 100644
index 588e836..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-projProperties.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-project-provider.png b/core/org.eclipse.ptp.doc.user/html/images/sync-project-provider.png
deleted file mode 100644
index 7a032a7..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-project-provider.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/sync-selectConversionWizard.png b/core/org.eclipse.ptp.doc.user/html/images/sync-selectConversionWizard.png
deleted file mode 100644
index b8a586b..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/sync-selectConversionWizard.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/images/toc_parallel_perspective_lg.png b/core/org.eclipse.ptp.doc.user/html/images/toc_parallel_perspective_lg.png
deleted file mode 100644
index 10c62a6..0000000
--- a/core/org.eclipse.ptp.doc.user/html/images/toc_parallel_perspective_lg.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/html/localVsRemote.html b/core/org.eclipse.ptp.doc.user/html/localVsRemote.html
deleted file mode 100644
index 0a64a52..0000000
--- a/core/org.eclipse.ptp.doc.user/html/localVsRemote.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<html>
-<head>
-<title>Local vs Remote Projects</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head> 
-<body>
-<h1>Local vs Remote Projects</h1>
-<p>Projects comprise the source code, build rules (e.g. makefiles),
-and build results (e.g. object files and executables) for a particular application. These projects can reside in a number of different
-locations, including on the user's local machine, on a remote system, or in a source code repository. The target systems on which these 
-applications run are also typically located at remote sites, though users may also want to run the applications on their local machines.
-<p>
-To cater to as many situations as possible, PTP supports a variety of project and target system configurations. In addition to normal
-Eclipse projects, PTP adds two new project types. With PTP installed, the user has the choice of the following project types:
-<dl>
-<dt><a href="#local">Local projects</a><dt>
-<dd>These projects exist on the local machine which is the same machine on which Eclipse is running.</dd>
-<dt><a href="#remote">Remote projects</a></dt>
-<dd>These projects consist of source code and other files that exist exclusively on a remote target machine.</dd>
-<dt><a href="#sync">Synchronized projects</a></dt>
-<dd>These projects are a hybrid of the two; source code is located on <i>both</i> the local system and on
-a remote target machine. These two copies are kept "in sync" by Eclipse.</dd>
-</dl>
-<p>
-In addition to the project location, there are two other activities that depend on the user's desired working environment and target system
-configuration. These include where the project will be built, and where the application will be launched (including where it will be launched in order to
-be debugged.) These activities tend to be interrelated, since, for example, launching an application requires access to the executable. But if the executable
-is built locally, and should be launched on a remote system, then it will need to be staged to the remote machine. Similarly, if the executable is
-to be built and launched remotely, the location of the executable must be known for it to be launched.
-
-<p>
-The projects and services provided by PTP can operate both locally and remotely. In order to determine how to access local and remote files and
-systems, PTP uses a number of <i>remote service providers</i>. There are three remote service providers that are available to PTP:
-</p>
-<dl>
-<dt>Local</dt>
-<dd>This service provider operates directly on the local machine (where Eclipse is running).</dd>
-<dt>Remote Tools</dt>
-<dd>This service provider is part of PTP and provides a light-weight wrapper around the ssh protocol. It provides features such as port forwarding (to avoid
-firewall problems). It is part of PTP and is the recommended remote service provider, since it is
-simpler to set up and contains all you need for PTP remote projects. 
-More information about Remote Tools as a remote service provider is in the section about
-<a href="02resMgrSetup.html#remote">remote Resource Managers</a>.</dd>
-<dt><a href="http://www.eclipse.org/dsdp/tm">Remote Systems Explorer</a> (RSE)</dt>
-<dd>This service provider is an optional component that provides support for a variety of protocols, including ssh, telnet, and ftp, as well as a custom
-DataStore protocol. It also provides a separate user interface for displaying and interacting with files on remote systems. The section on 
-<a href="PLUGINS_ROOT/org.eclipse.ptp.rdt.doc.user/html/toc.html">Remote Development Tools</a> 
-is written describing the use of RSE as the remote service provider.
-RSE may be used if your remote system does not use the ssh protocol for remote connections, 
-or you wish to use the additional functionality that RSE provides.</dd>
-</dl>
-
-<h2 id="local">Local Projects</h2>
-<p>Local projects are the default type for Eclipse projects.  All files reside on the local machine, which is the same machine
-on which Eclipse is running.  The section <a href="01buildMPIprog.html">Creating MPI Projects</a> 
-describes mostly this type of local project. These projects may have been checked
-out or cloned from a source repository, but the user is working on a local copy of the code. Updates to the repository must be controlled
-manually by the user.
-</p>
-<p>
-Local projects can only be built locally, but the executable can be run either locally or remotely. However, an executable built locally can
-be run remotely only if both the local and remote machines have the same architecture, or the executable was built using a cross compiler. 
-</p>
-
-<h2 id="remote">Remote Projects</h2>
-<p><a href="PLUGINS_ROOT/org.eclipse.ptp.rdt.doc.user/html/toc.html">Remote Development Tools</a> 
-(RDT) is part of PTP and provides the ability for C and C++ projects to be located and developed
-remotely. Fortran projects can also be developed using RDT, but certain functionality (such as content assist and searching) will not be available.
-In a remote project, the source code and other files are located on a remote system but appear to the user as if they
-are on the local machine. They are brought to the local machine only when opened in an editor.
-When the project is built, the build happens on the remote system and the resulting executable will be
-located on the remote system also. Launching the executable requires a <a href="02resMgrSetup.html#defn">resource manager</a> that has been configured to use
-the remote target system.
-</p>
-<p>
-When creating a remote project, the <b>New Remote C/C++ Project</b> wizard allows the user to choose which type of remote service
-provider to use, as shown below:
-</p>
-<img src="images/rm-new-project-provider.png">
-<p>
-Remote projects have a number of limitations. In order to work on the remote project, the user requires a constant network connection to the remote system,
-which precludes off-line development. Some Eclipse features are also not available on remote projects. Remote projects can only be checked out or cloned from
-a version control system on the remote system, and the user will have no access to the normal Team functionality through the Eclipse user interface.
-Remote projects do have the advantage that a copy of the source code is not required on the user's system, which may be a requirement in some environments.
-
-<h2 id="sync">Synchronized Projects (new for 5.0)</h2>
-<p>Synchronized projects maintain a copy of the source code and other project files on both the local system and the remote system.
-The user edits the local copy of a file, then each file is synchronized with the remote system when it is saved. Files that are created or deleted
-are also synchronized with the remote system. In addition, if files are changed on the remote system, these will be synchronized with the local system on a regular 
-basis. A single project can be synchronized with multiple remote systems. Projects that are checked out or cloned from a version control system can also 
-be synchronized, as Team operations are independent of the 
-synchronization process.
-</p>
-<p>
-Synchronized projects support multiple build configurations, so the build can happen either locally or on one or more remote systems. The user can select
-which system will be used to build the project. A launch configuration can then be created to to run the application on the target machine.
-</p>
-<p>
-When creating a synchronized project, the <b>New Synchronized Project</b> wizard provides a page to choose the service provider to use:
-</p>
-<img src="images/sync-project-provider.png">
-<p>
-Synchronized projects offer a number of advantages over remote projects. Keeping a local copy of the source code enables faster interaction during
-editing, and all the normal C, C++ and Fortran editor, content assist, and search features are available. Synchronized projects do not require a
-constant network connection, so development can continue off-line, then the project can be re-synchronized when a network is available. One disadvantage
-of synchronized projects is that a copy of the source code is kept on the user's local machine, which may not be permitted by some organizations.
-</p>
-<p>
-See the <a href="sync.html">Synchronized Projects</a> section for more information.
-</p>
-<p>&nbsp;<p>&nbsp;<p>&nbsp;
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-</body>
-
-</html>
diff --git a/core/org.eclipse.ptp.doc.user/html/sync.html b/core/org.eclipse.ptp.doc.user/html/sync.html
deleted file mode 100644
index 76ead6b..0000000
--- a/core/org.eclipse.ptp.doc.user/html/sync.html
+++ /dev/null
@@ -1,171 +0,0 @@
-<html>
-<head>
-<title>Synchronized Projects</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-<script type="text/javascript" src="thumb.js"> </script>
-</head> 
-<body>
-<h1 id="top">Synchronized Projects</h1>
-<p>
-<ul>
-<li><a href="#prereq">Requirements for Synchronized Projects</a>
-<li><a href="#create">Creating a new Synchronized Project</a>
-<li><a href="#work">Working with a Synchronized Project</a>
-<li><a href="#context-menu">Changing sync behavior with the Sync Context Menu</a>
-<li><a href="#conversion-wizard">Converting a project to a Synchronized Project</a>
-<li><a href="#props">Project Properties specific to Synchronized Projects</a>
-</ul>
-<p>Synchronized projects consist of files that are mirrored on the local system as well as on one or more remote systems.
-Editing occurs locally and each file is synchronized with the currently active remote system when it is changed, created, or deleted.  
-This enables faster interaction with the files
-and editor, more CDT editor features since the files are local, and continued interaction for editing etc. if the network
-connection is lost.
-<p>
-<h2 id=prereq>Requirements for Synchronized Projects</h2>
-<p>To host a synchronized project, the remote system must support the <a href="http://git-scm.com/">Git</a> distributed version control system.
-
-<h2 id=create>Creating a new Synchronized Project</h2>
-<p>To create a new Synchronized Project, use the following steps:</p>
-<ol>
-<li>
-Select <b>File > New > Other...</b>
-and in the wizard selection dialog, then select <b>Remote > Synchronized Project</b>.
-<p><br></p>
-<p><img src="images/sync-newproj.png">
-<p><br></p>
-<p>Or, from the context menu (right-mouse) in the Project Explorer,
-select <b>New > Synchronized Project</b>
-<p><br></p>
-<p><img src="images/sync-newprojContext.png">
-<p><br></p>
-</li>
-<li>
-Enter a name for the project
-<p><br></p>
-</li>
-<li>Choose <b>Makefile Project > Empty Project</b> for the <b>Project type</b>
-<p><br></p>
-<p><img src="images/sync-newprojCreate.png">
-<p><br></p>
-</li>
-<li>
-<p>Select <b>Next > </b> and then <b>Next > </b> again.</p>
-<p><br></p>
-</li>
-<li>
-On the "Configure Remote Synchronization" page, you should see the Git Synchronization Provider is already selected (different providers
-may be available in the future). Select an existing connection or create a new one. 
-<p><br></p>
-<p><img src="images/sync-newprojNewConnection.png">
-<p><br></p>
-<li>
-Select the <b>New...</b> button to create a new remote connection with the <b>Remote Tools</b> remote service provider.
-The Target Environment Configuration dialog is shown. Fill in host name, user, and password (or other authentication
-information).
-<p><br></p>
-<p><img src="images/sync-newprojConnection.png">
-<p><br></p>
-</li>
-<li>
-Select <b>Finish</b>.  The connection will be tested at this
-point before returning to the <b>Configure Remote Synchronization</b> page.
-<p><br></p>
-</li>
-<li>
-Specify a remote location by selecting <b>Browse...</b>
-<p><br></p>
-<p><img src="images/sync-newprojConfigLocn.png">
-<p><br></p>
-<li>
-A <b>Browse Directory</b> dialog appears in which you can navigate to find the directory
-in which your new project's files will be contained on the remote system. Hit <b>OK</b> to finish.
-The <b>Configure Remote Synchronization</b> page now contains the location of the remote files:
-<p><br></p>
-<p><img src="images/sync-newprojLocn.png">
-<p><br></p>
-</li>
-<li>
-Hit <b>Finish</b> to complete project creation. If the remote location does not exist, it is
-created. Otherwise, the files in that directory will be synchronized to the local workspace.
-</li>
-</ol>
-
-<h2 id="work">Working with a Synchronized Project</h2>
-<p>Edit the files as you would any local project.
-Each time you save a file, it will be synchronized with the remote system. If you create or delete files, the remote system will be updated appropriately.
-</p>
-<p>
-By default, a synchronized project is configured to build on the same remote host used for synchronization. To build the project (assuming you have already 
-created a makefile), make sure the project is selected in the <b>Project Explorer</b> view, then click on the build icon (the icon that looks like a hammer).
-A build configuration called "Workspace" is also available to build on the local machine if this is required.
-</p>
-<p>
-You can create configurations to synchronize and build on other remote systems using the <b>C/C++ Build > Synchronize</b> project properties.
-To bring up the Synchronize project properties, in the <b>Project Explorer</b> view, select the project and choose <b>Properties</b> from the context
-menu (right click).
-</p>
-<p><img src="images/sync-projProperties.png">
-<p>
-Synchronization is done between the local workspace and the active configuration. You can change the active configuration by using the 
-<b>Build Configurations > Set Active...</b> context menu on the project or via the <b>Manage Configurations</b> button on the <b>Synchronize</b>
-properties page. If "Workspace" is the active configuration, no synchronization is done.
-</p>
-
-<h2 id="context-menu">Changing sync behavior with the Sync Context Menu</h2>
-<p>
-The sync context menu lets you alter the sync behavior and can be accessed with a right click on a sync project. From this menu, you can turn off automatic sync'ing (sync after saving files and other resource changes) so that syncs only occur on request. This setting is applied to all projects in the workspace. The "Project Auto-Sync Settings" submenu allows you to alter the behavior of automatic sync'ing per project. Finally, the last two selections allow you to force an immediate sync of the current project. A "sync all" syncs all configurations of a project. Note that this can be quite slow if your project has several configurations. When a build is requested, a sync of the active configuration, and only the active configuration, is forced regardless of any settings.
-</p>
-<p><img src="images/sync-contextMenu.png">
-
-<h2 id="conversion-wizard">Converting a project to a Synchronized Project</h2>
-<p>
-The conversion wizard allows you to convert current C/C++ or Fortran projects to synchronized projects. Currently only local projects can be converted. To convert a project right-click in the workspace and select <b>New > Other...</b> In the wizard selection dialog, select <b> Remote > Convert C/C++ or Fortran Project to a Synchronized Project > Next</b>. From this dialog, you can select a project to convert and configure a remote site. See <a href="#create">Creating a new Synchronized Project</a> for details on configuring a remote site. This wizard will add a single new remote build configuration. Its settings are copied from the current active configuration. You can change these settings and add new configurations as with any other synchronization project. See <a href="#work">Working with a Synchronized Project</a> for details.
-</p>
-<table cellpadding="5" cellspacing="5" border="0">
-<tr>
-<td><img src="images/sync-selectConversionWizard.png"></td>
-<td><img src="images/sync-conversionWizard.png"></td>
-</tr>
-</table>
-
-<h2 id="includes">Remote Include Paths</h2>
-<p>At the time of the PTP 5.0 release (June 2011),
- the  mechanism for supporting remote includes in CDT  
- does not work automatically with synchronized projects yet, as it 
- requires some integration with the remote scanner discovery (which discovers what includes/defines 
- are set on the remote system). 
-
-<p>You can currently manually configure remote include files as follows:
-<ol>
-<li>Open the project properties
-<p><br></p></li>
-<li>Open the <b>C/C++ General > Paths and Symbols</b> page
-<p><br></p></li>
-<li>Choose the build configuration you want to use
-<p><br></p></li>
-<li>Click on <b>GNU C</b> and remove the existing paths
-<p><br></p>
-</li>
-<li>Add new paths to the remote include directories using 
- UNC notation <code>//connection_name/usr/include</code> where 'connnection_name' is the name of the connection you specified 
- for the Remote Tools service provider
- <p><br></p>
- For example, to add the include path <code>/usr/include</code> using the connection <code>lincoln.ncsa.uiuc.edu</code> that you
- previously configured, you would use the path <code>//lincoln.ncsa.uiuc.edu/usr/include</code>
- <p><br></p>
-</li>
-<li>Click OK then OK again. You may be asked if you want to rebuild the index. Click Yes.
-</li>
-</ol> 
-
-<p>See also 
-<a href="http://wiki.eclipse.org/PTP/sync-projects">Synchronized Projects usage info on the PTP Wiki page</a>
-for information available after PTP 5.0 release.
-
-<p>&nbsp;<p>&nbsp;<p>&nbsp;
-
-<p>See <a href="localVsRemote.html">Local Vs. Remote Projects</a> for more information on the different kinds of local and remote projects. <p>&nbsp;
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to Table of Contents</a>
-</body>
-
-</html>
diff --git a/core/org.eclipse.ptp.doc.user/html/thumb.js b/core/org.eclipse.ptp.doc.user/html/thumb.js
deleted file mode 100644
index 09c27ec..0000000
--- a/core/org.eclipse.ptp.doc.user/html/thumb.js
+++ /dev/null
@@ -1,16 +0,0 @@
-
-// Javascript to provide a convenient way to show a thumbnail of an image, with a link to the full-size image
-// Default height is 120 if the second arg is omitted
-//Note that IE uses the alt tag for hover but Firefox more correctly uses the title tag for hover text.
-//Usage: <script> thumb("images/foo.gif")</script>
-function thumb(url,height){
-   if (!height) {height=120;}
-   document.write ("<a href='"+url+"'><img src='"+url+"' height="+height+" title='Click for a full-size image' alt='Click for a full-size image'></a>");
-}
-// simple imbedding of image, in default full size, with break preceeding
-// (easy to replace the above with this one)
-//Usage: <script> full("images/foo.gif")</script>
-function full(url){
-   document.write ("<img src='"+url+"'>");
-}
-
diff --git a/core/org.eclipse.ptp.doc.user/html/thumb2.js b/core/org.eclipse.ptp.doc.user/html/thumb2.js
deleted file mode 100644
index 4c1dc90..0000000
--- a/core/org.eclipse.ptp.doc.user/html/thumb2.js
+++ /dev/null
@@ -1,33 +0,0 @@
-
-function newWin(url) {
-	window.open(url, 'install_ptp', 'menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');
-}
-// Javascript to provide a convenient way to show a thumbnail of an image, with a link to the full-size image
-// Default height is 120 if the second arg is omitted
-//Note that IE uses the alt tag for hover but Firefox more correctly uses the title tag for hover text.
-function thumb(url,height){
-   if (!height) {height=120;}
-   document.write ("<br><a href='"+url+"'><img src='"+url+"' height="+height+" title='Click for a full-size image' alt='Click for a full-size image'></a>");
-}
-// simple imbedding of image, in default full size, with break preceeding
-// (easy to replace the above with this one)
-function full(url){
-   document.write ("<br><img src='"+url+"'>");
-}
-//trying to abbreviate this: <a href="javascript:void(0)" onClick="newWin('images/foo.gif')">Click here</a>
-// with usage like this:  <script> thumbNewWin("foo.gif") </script>
-// this doesn't work.   Hmmmmm....
-// I think it has to do with the quotes. i need 3 nesting levels so just " and ' doesn't cut it.
-// I tried escaping but that doesn't seem to work either.  \"
-function thumbNewWin(url,height){
-   if (!height) {height=120;}
-   msg="Click here to see a full-size image in a new window";
-   //document.write ("<br><a href='javascript:void(0)' onClick='newWin(\""+url+"\")><img src='"+url+"' height="+height+" title='Click' alt='Click'></a>");
-   anchor="<a href='javascript:void(0)' onClick='newWin(\""+url+"\")>";
-   img="<img src='"+url+"' height="+height+" title='"+msg+"' alt='"+msg+"'>";
-   //alert("anchor="anchor);
-   //alert("img="+img);
-   document.write ("<br>"+anchor+img+"</a>");
-   
- }  
-
diff --git a/core/org.eclipse.ptp.doc.user/html/toc.html b/core/org.eclipse.ptp.doc.user/html/toc.html
deleted file mode 100755
index af96b04..0000000
--- a/core/org.eclipse.ptp.doc.user/html/toc.html
+++ /dev/null
@@ -1,91 +0,0 @@
-
-<html>
-<head>
-<title>Parallel Tools Platform User Guide</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-<body>
-<h1><img src="images/toc_parallel_perspective_lg.png">
-Parallel Tools Platform</h1>
-<p>Release 5.0</p>
-<p>The Parallel Tools Platform is designed to allow the Eclipse
-framework to be used for developing applications for parallel computer
-systems. PTP provides the following functionality:</p>
-<ul>
-	<li>tools for developing applications based on the Message Passing
-	Interface (MPI) standard (and other environments and APIs including OpenMP, UPC, etc.)</li>
-	<li>the ability to launch, control and monitor the execution of
-	parallel programs</li>
-	<li>the ability to monitor parallel system status information</li>
-	<li>an integrated parallel debugger</li>
-	<li>a framework for integrating exernal dynamic tools</li>
-</ul>
-<p>In addition, PTP provides a platform for parallel tool developers
-to integrate their tools within the Eclipse framework. New tools can
-take advantage of the user interface components and parallel services
-that are provided by PTP, without the need to develop and support this
-infrastructure across multiple platforms.</p>
-<p>More information and downloads are available at <a
-	href="http://eclipse.org/ptp">http://eclipse.org/ptp</a>.</p>
-<h2>Overview, Background, and Setup information</h2>
-<p></p>
-<ol>
-	<li><a href="00overview.html">PTP Overview</a> and architecture</li>
-	<li><a href="00prereqs.html">PTP Prerequisites</a></li>
-	<li><a href="00newNoteworthy.html">New and Noteworthy</a></li>
-</ol>
-<h2>Help Topics</h2>
-<ol>
-    <li><a href="localVsRemote.html">Local vs. Remote Projects</a></li>
-	<li><a href="01buildMPIprog.html">Creating MPI Projects</a></li>
-	<li><a href="sync.html">Synchronized Projects</a> (new in 5.0)</li>
-	<li><a href="02resMgrSetup.html">Configuring Resource Managers</a></li>
-	<li><a href="03pLaunchConfig.html">Running Parallel Programs</a></li>
-	<li><a href="05monitoring.html">Monitoring Jobs and Systems</a></li>
-	<li><a href="06parDebugging.html">Parallel Debugging</a></li>
-	<li><a href="07ptpPrefs.html">Preferences</a></li>
-</ol>
-<h2>Other PTP related topics</h2>
-<ul>
-	<li><a href="PLUGINS_ROOT/org.eclipse.ptp.pldt.doc.user/html/toc.html">Parallel
-	Language Development Tools (PLDT)</a></li>
-	<li>Resource Managers:
-	<ul>
-		<li><a
-			href="PLUGINS_ROOT/org.eclipse.ptp.rm.ibm.ll.help/html/IBMLLMainHelp.html">IBM
-		Loadleveler</a></li>
-		<li><a
-			href="PLUGINS_ROOT/org.eclipse.ptp.rm.ibm.pe.help/html/PEMainHelp.html">IBM
-		Parallel Environment</a></li>
-		<li><a
-			href="PLUGINS_ROOT/org.eclipse.ptp.rm.pbs.help/html/toc.html">PBS</a></li>
-		<li><a
-			href="PLUGINS_ROOT/org.eclipse.ptp.rm.slurm.help/html/toc.html">SLURM</a></li>
-		<li><a
-         href="PLUGINS_ROOT/org.eclipse.ptp.rm.jaxb.help/html/toc.html">Configurable (JAXB)</a></li>
-	</ul>
-	</li>
-	<li><a href="http://wiki.eclipse.org/PTP/PTFw/PTFw-Overview">External
-	Tools Framework (ETFw)</a></li>
-	<li><a
-		href="PLUGINS_ROOT/org.eclipse.ptp.etfw.feedback/html/toc.html">ETFw
-	Feedback View</a></li>
-	<li><a
-		href="PLUGINS_ROOT/org.eclipse.ptp.rdt.doc.user/html/toc.html">Remote
-	Development Tools</a></li>
-	<li><a href="PLUGINS_ROOT/org.eclipse.ptp.gem.help/html/toc.html">GEM:
-	Graphical Explorer of MPI Programs</a></li>
-	<li><a href="http://ppw.hcs.ufl.edu/">Parallel Performance
-	Wizard (PPW)</a></li>
-	<!--  link to *something* in photran help.  top.html doesn't work any more. -->
-	<li><a
-		href="PLUGINS_ROOT/org.eclipse.photran.doc.user/html/basic/InstallingPhotran.html">Photran User's Guide (Fortran)</a></li>
-</ul>
-
-
-<p>&nbsp;
-<p>&nbsp;
-<p><a href="#top">Back to Top</a> | <a href="toc.html">Back to
-Table of Contents</a>
-</body>
-</html>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.user/intro/css/graphics/ptp_logo_intro.png b/core/org.eclipse.ptp.doc.user/intro/css/graphics/ptp_logo_intro.png
deleted file mode 100644
index a5d4346..0000000
--- a/core/org.eclipse.ptp.doc.user/intro/css/graphics/ptp_logo_intro.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/intro/css/graphics/ptp_logo_intro_hov.png b/core/org.eclipse.ptp.doc.user/intro/css/graphics/ptp_logo_intro_hov.png
deleted file mode 100644
index 080ad90..0000000
--- a/core/org.eclipse.ptp.doc.user/intro/css/graphics/ptp_logo_intro_hov.png
+++ /dev/null
Binary files differ
diff --git a/core/org.eclipse.ptp.doc.user/intro/css/sample.css b/core/org.eclipse.ptp.doc.user/intro/css/sample.css
deleted file mode 100644
index 97a4fe5..0000000
--- a/core/org.eclipse.ptp.doc.user/intro/css/sample.css
+++ /dev/null
@@ -1,3 +0,0 @@
-
-a#orgeclipseptphelp-introLink img { background-image : url(graphics/ptp_logo_intro.png); }
-a#orgeclipseptphelp-introLink:hover img { background-image : url(graphics/ptp_logo_intro_hov.png); }
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.user/intro/ptpOverview.xml b/core/org.eclipse.ptp.doc.user/intro/ptpOverview.xml
deleted file mode 100644
index 1bee948..0000000
--- a/core/org.eclipse.ptp.doc.user/intro/ptpOverview.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-  	<extensionContent id="orgeclipseptphelp-introExtension" style="css/sample.css" 
-  	name="PTP overview intro Extension" path="overview/@">
-		<group style-id="content-group" id="orgeclipseptphelp-introLink-group">
-       		<link label="Parallel Tools Platform"  id="orgeclipseptphelp-introLink" style-id="content-link"
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.ptp.doc.user/html/toc.html">
-          		<text>Learn more about PTP, the Parallel Tools Platform.</text>
-       		</link>
-       	</group>
-  	</extensionContent>
-</introContent>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.user/intro/ptpTutorial.xml b/core/org.eclipse.ptp.doc.user/intro/ptpTutorial.xml
deleted file mode 100644
index a6b1c21..0000000
--- a/core/org.eclipse.ptp.doc.user/intro/ptpTutorial.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-  	<extensionContent id="orgeclipseptphelp-introExtension" style="css/sample.css" name="PTP tutorial intro Extension" path="tutorials/@">
-		<group style-id="content-group" id="orgeclipseptphelp-introLink-group">
-       		<link label="Parallel Tools Platform"  
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.ptp.doc.user/html/01buildMPIprog.html"
-       		id="orgeclipseptphelp-introLink" style-id="content-link">
-          		<text>Learn how to create, run, and debug a Parallel Project with MPI.
-          		</text>
-		</link>
-       	</group>
-  	</extensionContent>
-</introContent>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.user/intro/ptpWhatsnew.xml b/core/org.eclipse.ptp.doc.user/intro/ptpWhatsnew.xml
deleted file mode 100644
index 9531d80..0000000
--- a/core/org.eclipse.ptp.doc.user/intro/ptpWhatsnew.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<introContent>
-  	<extensionContent id="orgeclipseptphelp-introExtension" style="css/sample.css" name="PTP whatsnew intro Extension" path="whatsnew/@">
-		<group style-id="content-group" id="orgeclipseptphelp-introLink-group">
-       		<link label="Parallel Tools Platform" 
-       		url="http://org.eclipse.ui.intro/showHelpTopic?id=/org.eclipse.ptp.doc.user/html/00newNoteworthy.html" id="orgeclipseptphelp-introLink" style-id="content-link">
-          		<text>Find out the new features in PTP.</text>
-       		</link>
-       	</group>
-  	</extensionContent>
-</introContent>
\ No newline at end of file
diff --git a/core/org.eclipse.ptp.doc.user/plugin.properties b/core/org.eclipse.ptp.doc.user/plugin.properties
deleted file mode 100644
index 79c6e42..0000000
--- a/core/org.eclipse.ptp.doc.user/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 User Guide
-pluginProvider=Eclipse.org
diff --git a/core/org.eclipse.ptp.doc.user/plugin.xml b/core/org.eclipse.ptp.doc.user/plugin.xml
deleted file mode 100755
index db88f16..0000000
--- a/core/org.eclipse.ptp.doc.user/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-     <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true"/>
-   </extension>
-   <extension
-         point="org.eclipse.ui.intro.configExtension">
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="intro/ptpOverview.xml">
-      </configExtension>
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="intro/ptpWhatsnew.xml">
-      </configExtension>
-      <configExtension
-            configId="org.eclipse.ui.intro.universalConfig"
-            content="intro/ptpTutorial.xml">
-      </configExtension>
-
-   </extension>
-
-</plugin>
diff --git a/core/org.eclipse.ptp.doc.user/pom.xml b/core/org.eclipse.ptp.doc.user/pom.xml
deleted file mode 100644
index 9bc0894..0000000
--- a/core/org.eclipse.ptp.doc.user/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse.ptp</groupId>
-    <artifactId>ptp-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.ptp.doc.user</artifactId>
-  <version>5.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/core/org.eclipse.ptp.doc.user/toc.xml b/core/org.eclipse.ptp.doc.user/toc.xml
deleted file mode 100755
index 62cbd40..0000000
--- a/core/org.eclipse.ptp.doc.user/toc.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?NLS TYPE="org.eclipse.help.toc"?>

-

-<toc label="Parallel Tools Platform (PTP) User Guide">

-      <topic label="Contents" href="html/toc.html"/>

-      <topic label="Overview"  href="html/00overview.html"/> 

-      <topic label="PTP Prerequisites" href="html/00prereqs.html"/>

-      <topic label="Local vs. Remote Projects"  href="html/localVsRemote.html"/>

-      <topic label="Creating an MPI Project" href="html/01buildMPIprog.html"/> 

-      <topic label="Synchronized Projects" href="html/sync.html"/>

-      <topic label="Resource Managers">

-      	<topic label="Configuring Resource Managers" href="html/02resMgrSetup.html"/>

-      	<topic label="Running IBM LoadLeveler Batch Jobs">

-       		<anchor id="ptpLL"/>

-     	</topic>

-      	<topic label="Running IBM Parallel Environment Jobs">

-       		<anchor id="ptpPE"/>

-     	</topic>

-      	<topic label="Running PBS Jobs">

-       		<anchor id="ptpPBS"/>

-        </topic>

-      	<topic label="Running SLURM Jobs">

-       		<anchor id="ptpSLURM"/>

-     	</topic>

-      </topic>

-      <topic label="Running Parallel Programs"  href="html/03pLaunchConfig.html"/> 

-      <topic label="Monitoring Jobs and Systems" href="html/05monitoring.html"/>

-      <topic label="Parallel Debugging"  href="html/06parDebugging.html"/>

-      <topic label="PTP Preferences" href="html/07ptpPrefs.html"/>

-       <topic label="Parallel Language Development Tools (PLDT)">

-      	<anchor id="ptpPLDT"/>

-      </topic>

-      <topic label="External Tools Framework (ETFw)">

-      	<anchor id="ptpETFw"/>

-      </topic>

-      <topic label="Graphical Explorer of MPI Programs (GEM)">

-      	<anchor id="ptpGEM"/>

-      </topic>
-      <topic label="New and Noteworthy"  href="html/00newNoteworthy.html"/> 

-   

-</toc>

diff --git a/core/org.eclipse.ptp.remote.core.tests/.classpath b/core/org.eclipse.ptp.remote.core.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/core/org.eclipse.ptp.remote.core.tests/.project b/core/org.eclipse.ptp.remote.core.tests/.project
deleted file mode 100644
index 9f0f2fe..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.remote.core.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/core/org.eclipse.ptp.remote.core.tests/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.remote.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d830758..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,74 +0,0 @@
-#Sat Nov 07 12:58:41 EST 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.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=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=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-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=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-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
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.ptp.remote.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.remote.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 3a46d05..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.remote.core.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.ptp.remote.core;bundle-version="3.0.0",
- org.eclipse.ptp.remote.ui;bundle-version="3.0.0",
- com.jcraft.jsch;bundle-version="0.1.41",
- org.eclipse.core.filesystem;bundle-version="1.2.0",
- org.eclipse.ptp.remotetools.core;bundle-version="2.1.9",
- org.eclipse.ptp.remote.remotetools.core;bundle-version="3.0.0",
- org.eclipse.ptp.remotetools.environment.core;bundle-version="1.3.3",
- org.eclipse.ptp.remotetools.environment.generichost;bundle-version="1.4.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/org.eclipse.ptp.remote.core.tests/build.properties b/core/org.eclipse.ptp.remote.core.tests/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/core/org.eclipse.ptp.remote.core.tests/plugin.properties b/core/org.eclipse.ptp.remote.core.tests/plugin.properties
deleted file mode 100755
index c8959a9..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-
-pluginName=PTP Remote Core Tests
-pluginProvider=Eclipse PTP
diff --git a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/FileStoreTests.java b/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/FileStoreTests.java
deleted file mode 100644
index 10fbdf6..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/FileStoreTests.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.eclipse.ptp.core.tests;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.URI;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-
-public class FileStoreTests extends TestCase {
-	private static final String CONNECTION_NAME = "test_connection";
-	private static final String USERNAME = "user";
-	private static final String PASSWORD = "password";
-	private static final String HOST = "localhost";
-	private static final String PATH1 = "/home/user/sftp_test";
-	private static final String PATH2 = PATH1 + "/.file1";
-	private static final String TEST_STRING = "a string containing fairly *()(*&^$%## random text";
-
-	private IRemoteServices fRemoteServices;
-	private IRemoteConnection fRemoteConnection;
-	private IRemoteFileManager fRemoteFileManager;
-
-	public void testFileStore() {
-		URI path1Uri = fRemoteFileManager.toURI(PATH1);
-		URI path2Uri = fRemoteFileManager.toURI(PATH2);
-		assertNotNull(path1Uri);
-		assertNotNull(path2Uri);
-
-		IFileStore store1 = null;
-		IFileStore store2 = null;
-
-		try {
-			store1 = EFS.getStore(path1Uri);
-			store2 = EFS.getStore(path2Uri);
-		} catch (Exception e) {
-			fail(e.getLocalizedMessage());
-		}
-
-		for (int i = 0; i < 5; i++) {
-			assertFalse(store1.fetchInfo().exists());
-			try {
-				store1.mkdir(EFS.NONE, null);
-			} catch (CoreException e) {
-				e.getLocalizedMessage();
-			}
-			assertTrue(store1.fetchInfo().exists());
-
-			assertFalse(store2.fetchInfo().exists());
-			try {
-				OutputStream stream = store2.openOutputStream(EFS.NONE, null);
-				assertNotNull(stream);
-				BufferedWriter buf = new BufferedWriter(new OutputStreamWriter(stream));
-				buf.write(TEST_STRING);
-				buf.close();
-			} catch (Exception e) {
-				e.getLocalizedMessage();
-			}
-			assertTrue(store2.fetchInfo().exists());
-
-			try {
-				InputStream stream = store2.openInputStream(EFS.NONE, null);
-				assertNotNull(stream);
-				BufferedReader buf = new BufferedReader(new InputStreamReader(stream));
-				String line = buf.readLine().trim();
-				assertTrue(line.equals(TEST_STRING));
-				buf.close();
-			} catch (Exception e) {
-				e.getLocalizedMessage();
-			}
-
-			try {
-				store2.delete(EFS.NONE, null);
-			} catch (CoreException e) {
-				e.getLocalizedMessage();
-			}
-			assertFalse(store2.fetchInfo().exists());
-
-			try {
-				store1.delete(EFS.NONE, null);
-			} catch (CoreException e) {
-				e.getLocalizedMessage();
-			}
-			assertFalse(store1.fetchInfo().exists());
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		fRemoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices("org.eclipse.ptp.remote.RemoteTools");
-		assertNotNull(fRemoteServices);
-
-		IRemoteConnectionManager connMgr = fRemoteServices.getConnectionManager();
-		assertNotNull(connMgr);
-
-		try {
-			fRemoteConnection = connMgr.newConnection(CONNECTION_NAME);
-		} catch (RemoteConnectionException e) {
-			fail(e.getLocalizedMessage());
-		}
-		assertNotNull(fRemoteConnection);
-		fRemoteConnection.setAddress(HOST);
-		fRemoteConnection.setUsername(USERNAME);
-		fRemoteConnection.setPassword(PASSWORD);
-
-		fRemoteFileManager = fRemoteServices.getFileManager(fRemoteConnection);
-		assertNotNull(fRemoteFileManager);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		fRemoteConnection.close();
-		IRemoteConnectionManager connMgr = fRemoteServices.getConnectionManager();
-		assertNotNull(connMgr);
-		connMgr.removeConnection(fRemoteConnection);
-	}
-
-}
diff --git a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteConnectionTests.java b/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteConnectionTests.java
deleted file mode 100644
index fbc530b..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteConnectionTests.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.eclipse.ptp.core.tests;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.IFileSystem;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteProcess;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-
-public class RemoteConnectionTests extends TestCase {
-	private static final String USERNAME = "greg"; //$NON-NLS-1$
-	private static final String PASSWORD = ""; //$NON-NLS-1$
-	private static final String HOST = "localhost"; //$NON-NLS-1$
-
-	private IRemoteServices fRemoteServices;
-	private IRemoteConnection fRemoteConnection;
-
-	public void testEnv() {
-		String var = fRemoteConnection.getEnv("SHELL"); //$NON-NLS-1$
-		assertNotNull(var);
-
-		var = fRemoteConnection.getEnv("FOO_VAR_SHOULD_NOT_BE_DEFINED"); //$NON-NLS-1$
-		assertNull(var);
-
-		assertNotNull(fRemoteConnection.getProperty("os.name")); //$NON-NLS-1$
-		assertNotNull(fRemoteConnection.getProperty("os.arch")); //$NON-NLS-1$
-		assertNotNull(fRemoteConnection.getProperty("os.version")); //$NON-NLS-1$
-		assertNotNull(fRemoteConnection.getProperty("file.separator")); //$NON-NLS-1$
-		assertNotNull(fRemoteConnection.getProperty("path.separator")); //$NON-NLS-1$
-		assertNotNull(fRemoteConnection.getProperty("line.separator")); //$NON-NLS-1$
-
-		IRemoteProcessBuilder builder = fRemoteServices.getProcessBuilder(fRemoteConnection, "env"); //$NON-NLS-1$
-		builder.environment().put("FOO", "BAR"); //$NON-NLS-1$ //$NON-NLS-2$
-		builder.environment().put("USER", "FOO"); //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-			IRemoteProcess proc = builder.start();
-			BufferedReader stdout = new BufferedReader(new InputStreamReader(proc.getInputStream()));
-			String line;
-			while ((line = stdout.readLine()) != null) {
-				String[] kv = line.trim().split("="); //$NON-NLS-1$
-				if (kv.length == 2) {
-					if (kv[0].equals("FOO")) {
-						assertTrue(kv[1].equals("BAR")); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-					if (kv[0].equals("USER")) {
-						assertTrue(kv[1].equals("FOO")); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		}
-	}
-
-	public void testCopy() {
-		final IRemoteFileManager fileManager = fRemoteServices.getFileManager(fRemoteConnection);
-
-		final IFileSystem fileSystem = EFS.getLocalFileSystem();
-		final IFileStore srcFileStore = fileSystem.getStore(new Path("/tmp/log_src.txt"));
-		final IFileStore dstFileStore = fileManager.getResource("/tmp").getChild("log_dst.txt");
-		try {
-			srcFileStore.delete(EFS.NONE, new NullProgressMonitor());
-			dstFileStore.delete(EFS.NONE, new NullProgressMonitor());
-			OutputStream stream = srcFileStore.openOutputStream(EFS.NONE, new NullProgressMonitor());
-			stream.write(new byte[] { 'f', 'o', 'o', '\n' });
-			stream.close();
-			srcFileStore.copy(dstFileStore, EFS.NONE, new NullProgressMonitor());
-		} catch (CoreException e) {
-			fail(e.getLocalizedMessage());
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		}
-		IFileInfo srcInfo = srcFileStore.fetchInfo();
-		IFileInfo dstInfo = dstFileStore.fetchInfo();
-		assertTrue(dstInfo.exists());
-		assertTrue(srcInfo.getLength() == dstInfo.getLength());
-		try {
-			InputStream stream = dstFileStore.openInputStream(EFS.NONE, new NullProgressMonitor());
-			byte[] b = new byte[4];
-			stream.read(b);
-			stream.close();
-			assertTrue(b[0] == 'f');
-			assertTrue(b[1] == 'o');
-			assertTrue(b[2] == 'o');
-			assertTrue(b[3] == '\n');
-		} catch (CoreException e) {
-			fail(e.getLocalizedMessage());
-		} catch (IOException e) {
-			fail(e.getLocalizedMessage());
-		}
-
-		// try {
-		// srcFileStore.delete(EFS.NONE, new NullProgressMonitor());
-		// dstFileStore.delete(EFS.NONE, new NullProgressMonitor());
-		// } catch (CoreException e) {
-		// fail();
-		// }
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		fRemoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices("org.eclipse.ptp.remote.RemoteTools"); //$NON-NLS-1$
-		assertNotNull(fRemoteServices);
-
-		IRemoteConnectionManager connMgr = fRemoteServices.getConnectionManager();
-		assertNotNull(connMgr);
-
-		try {
-			fRemoteConnection = connMgr.newConnection("test_connection"); //$NON-NLS-1$
-		} catch (RemoteConnectionException e) {
-			fail(e.getLocalizedMessage());
-		}
-		assertNotNull(fRemoteConnection);
-		fRemoteConnection.setAddress(HOST);
-		fRemoteConnection.setUsername(USERNAME);
-		fRemoteConnection.setPassword(PASSWORD);
-
-		try {
-			fRemoteConnection.open(new NullProgressMonitor());
-		} catch (RemoteConnectionException e) {
-			fail(e.getLocalizedMessage());
-		}
-		assertTrue(fRemoteConnection.isOpen());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		fRemoteConnection.close();
-		IRemoteConnectionManager connMgr = fRemoteServices.getConnectionManager();
-		assertNotNull(connMgr);
-		connMgr.removeConnection(fRemoteConnection);
-	}
-
-}
diff --git a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteProcessTests.java b/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteProcessTests.java
deleted file mode 100644
index 49960d4..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteProcessTests.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.eclipse.ptp.core.tests;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteProcess;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-
-public class RemoteProcessTests extends TestCase {
-	private static final String USERNAME = "username"; //$NON-NLS-1$
-	private static final String PASSWORD = ""; //$NON-NLS-1$
-	private static final String HOST = "localhost"; //$NON-NLS-1$
-	private static int NUM_THREADS = 15;
-
-	private IRemoteServices fRemoteServices;
-	private IRemoteConnection fRemoteConnection;
-
-	public void testProcess() {
-		Thread[] threads = new Thread[NUM_THREADS];
-
-		for (int t = 0; t < NUM_THREADS; t++) {
-			System.out.println("creating thread...");
-			Thread thread = new Thread("test thread " + t) {
-				@Override
-				public void run() {
-					System.out.println("Thread " + getId() + " starting...");
-
-					IRemoteProcessBuilder builder = fRemoteServices.getProcessBuilder(fRemoteConnection, "perl", "-V:version"); //$NON-NLS-1$
-					builder.redirectErrorStream(true);
-					for (int i = 0; i < 100; i++) {
-						System.out.println("Testing process " + i + " (of 10)..." + getId());
-						try {
-							IRemoteProcess proc = builder.start();
-							System.out.println("start proc (" + getId() + ")");
-							BufferedReader stdout = new BufferedReader(new InputStreamReader(proc.getInputStream()));
-							String line;
-							while ((line = stdout.readLine()) != null) {
-								System.out.println("read (" + getId() + ") " + line);
-							}
-							try {
-								System.out.println("about to wait (" + getId() + ")");
-								proc.waitFor();
-							} catch (InterruptedException e) {
-								e.printStackTrace();
-							}
-						} catch (IOException e) {
-							e.printStackTrace();
-							fail(e.getLocalizedMessage());
-						}
-						// try {
-						// Thread.sleep(500);
-						// } catch (InterruptedException e) {
-						// e.printStackTrace();
-						// }
-					}
-				}
-
-			};
-			thread.start();
-			threads[t] = thread;
-		}
-		for (Thread t : threads) {
-			try {
-				t.join();
-			} catch (InterruptedException e) {
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		fRemoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices("org.eclipse.ptp.remote.RemoteTools"); //$NON-NLS-1$
-		assertNotNull(fRemoteServices);
-
-		IRemoteConnectionManager connMgr = fRemoteServices.getConnectionManager();
-		assertNotNull(connMgr);
-
-		try {
-			fRemoteConnection = connMgr.newConnection("test_connection"); //$NON-NLS-1$
-		} catch (RemoteConnectionException e) {
-			fail(e.getLocalizedMessage());
-		}
-		assertNotNull(fRemoteConnection);
-		fRemoteConnection.setAddress(HOST);
-		fRemoteConnection.setUsername(USERNAME);
-		fRemoteConnection.setPassword(PASSWORD);
-
-		try {
-			fRemoteConnection.open(new NullProgressMonitor());
-		} catch (RemoteConnectionException e) {
-			fail(e.getLocalizedMessage());
-		}
-		assertTrue(fRemoteConnection.isOpen());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		fRemoteConnection.close();
-		IRemoteConnectionManager connMgr = fRemoteServices.getConnectionManager();
-		assertNotNull(connMgr);
-		connMgr.removeConnection(fRemoteConnection);
-	}
-
-}
diff --git a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteToolsTests.java b/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteToolsTests.java
deleted file mode 100644
index b6e76bb..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/RemoteToolsTests.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.eclipse.ptp.core.tests;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.remote.remotetools.core.RemoteToolsServices;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionManager;
-import org.eclipse.ptp.remotetools.core.IRemoteExecutionTools;
-import org.eclipse.ptp.remotetools.core.IRemoteFileTools;
-import org.eclipse.ptp.remotetools.core.IRemoteItem;
-import org.eclipse.ptp.remotetools.core.IRemoteScript;
-import org.eclipse.ptp.remotetools.core.RemoteProcess;
-import org.eclipse.ptp.remotetools.environment.EnvironmentPlugin;
-import org.eclipse.ptp.remotetools.environment.control.ITargetConfig;
-import org.eclipse.ptp.remotetools.environment.control.ITargetControl;
-import org.eclipse.ptp.remotetools.environment.core.TargetElement;
-import org.eclipse.ptp.remotetools.environment.core.TargetTypeElement;
-import org.eclipse.ptp.remotetools.environment.generichost.core.ConfigFactory;
-import org.eclipse.ptp.remotetools.exception.CancelException;
-import org.eclipse.ptp.remotetools.exception.RemoteConnectionException;
-import org.eclipse.ptp.remotetools.exception.RemoteExecutionException;
-import org.eclipse.ptp.remotetools.exception.RemoteOperationException;
-
-public class RemoteToolsTests extends TestCase {
-	private static final String USERNAME = "greg"; //$NON-NLS-1$
-	private static final String HOST = "localhost"; //$NON-NLS-1$
-
-	private ITargetControl fTargetControl;
-	private IRemoteExecutionManager fExecutionManager;
-	private IRemoteExecutionTools fExecutionTools;
-	private TargetTypeElement fTarget;
-	private TargetElement fElement;
-
-	public void testScriptExecute() {
-		for (int i = 0; i < 10; i++) {
-			IRemoteScript script = fExecutionTools.createScript();
-			script.setScript("echo hi there");
-			RemoteProcess p = null;
-			try {
-				p = fExecutionTools.executeProcess(script);
-			} catch (RemoteExecutionException e) {
-				fail();
-			} catch (RemoteConnectionException e) {
-				fail();
-			} catch (CancelException e) {
-				fail();
-			}
-			assertNotNull(p);
-			BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
-			try {
-				String line;
-				while ((line = br.readLine()) != null) {
-					System.out.println("read \"" + line + "\"");
-					assertTrue(line.startsWith("hi there"));
-				}
-			} catch (IOException e) {
-				fail();
-			}
-			try {
-				p.waitFor();
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-
-	public void testScriptIO() {
-
-		IRemoteScript script = fExecutionTools.createScript();
-		script.setScript("cat > /tmp/xxx.script");
-		RemoteProcess p = null;
-		try {
-			p = fExecutionTools.executeProcess(script);
-		} catch (RemoteExecutionException e) {
-			fail();
-		} catch (RemoteConnectionException e) {
-			fail();
-		} catch (CancelException e) {
-			fail();
-		}
-		assertNotNull(p);
-		BufferedWriter b = new BufferedWriter(new OutputStreamWriter(p.getOutputStream()));
-		try {
-			b.write("this is a test\n");
-			b.write("this is a test2\n");
-			b.close();
-		} catch (IOException e) {
-			fail();
-		}
-		try {
-			p.waitFor();
-		} catch (InterruptedException e) {
-		}
-
-		script = fExecutionTools.createScript();
-		script.setScript("cat >> /tmp/xxx.script");
-		p = null;
-		try {
-			p = fExecutionTools.executeProcess(script);
-		} catch (RemoteExecutionException e) {
-			fail();
-		} catch (RemoteConnectionException e) {
-			fail();
-		} catch (CancelException e) {
-			fail();
-		}
-		assertNotNull(p);
-		b = new BufferedWriter(new OutputStreamWriter(p.getOutputStream()));
-		try {
-			b.write("this is a test4\n");
-			b.write("this is a test5\n");
-			b.close();
-		} catch (IOException e) {
-			fail();
-		}
-		try {
-			p.waitFor();
-		} catch (InterruptedException e) {
-		}
-
-		script = fExecutionTools.createScript();
-		script.setScript("cat < /tmp/xxx.script");
-		p = null;
-		try {
-			p = fExecutionTools.executeProcess(script);
-		} catch (RemoteExecutionException e) {
-			fail();
-		} catch (RemoteConnectionException e) {
-			fail();
-		} catch (CancelException e) {
-			fail();
-		}
-		assertNotNull(p);
-		BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
-		try {
-			String line;
-			int count = 0;
-			while ((line = br.readLine()) != null) {
-				System.out.println("read \"" + line + "\"");
-				count++;
-			}
-			assertTrue(count == 4);
-		} catch (IOException e) {
-			fail();
-		}
-		try {
-			p.waitFor();
-		} catch (InterruptedException e) {
-		}
-
-	}
-
-	public void testScriptCancel() {
-
-		IRemoteScript script = fExecutionTools.createScript();
-		script.setScript("while true; do sleep 1; done");
-		RemoteProcess p = null;
-		try {
-			p = fExecutionTools.executeProcess(script);
-		} catch (RemoteExecutionException e) {
-			fail(e.getLocalizedMessage());
-		} catch (RemoteConnectionException e) {
-			fail(e.getLocalizedMessage());
-		} catch (CancelException e) {
-			fail(e.getLocalizedMessage());
-		}
-		assertNotNull(p);
-		/*
-		 * Give script time to start
-		 */
-		try {
-			Thread.sleep(2000);
-		} catch (InterruptedException e1) {
-		}
-		p.destroy();
-		try {
-			p.waitFor();
-		} catch (InterruptedException e) {
-		}
-	}
-
-	public void testBug300435() {
-		IRemoteFileTools fileTools;
-		String DIR_NAME = "/tmp/my path";
-		try {
-			fileTools = fExecutionManager.getRemoteFileTools();
-			fileTools.createDirectory(DIR_NAME, new NullProgressMonitor());
-			IRemoteItem[] items = fileTools.listItems("/tmp", new NullProgressMonitor());
-			boolean found = false;
-			for (IRemoteItem item : items) {
-				if (item.getPath().equals(DIR_NAME)) {
-					found = true;
-					break;
-				}
-			}
-			assertTrue(found);
-			fileTools.removeDirectory(DIR_NAME, new NullProgressMonitor());
-			fileTools.createFile(DIR_NAME, new NullProgressMonitor());
-			fileTools.removeFile(DIR_NAME, new NullProgressMonitor());
-		} catch (RemoteOperationException e) {
-			fail(e.getLocalizedMessage());
-		} catch (RemoteConnectionException e) {
-			fail(e.getLocalizedMessage());
-		} catch (CancelException e) {
-			fail(e.getLocalizedMessage());
-			// } catch (IOException e) {
-			// fail(e.getLocalizedMessage());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		ConfigFactory factory = new ConfigFactory();
-		ITargetConfig config = factory.createTargetConfig();
-		config.setConnectionAddress(HOST);
-		config.setLoginUsername(USERNAME);
-		config.setPasswordAuth(true);
-
-		fTarget = RemoteToolsServices.getTargetTypeElement();
-		String id = EnvironmentPlugin.getDefault().getEnvironmentUniqueID();
-		TargetElement element = new TargetElement(fTarget, HOST, factory.getAttributes(), id);
-		fTarget.addElement(element);
-		fTargetControl = element.getControl();
-		fTargetControl.create(new NullProgressMonitor());
-		fExecutionManager = fTargetControl.createExecutionManager();
-		fExecutionTools = fExecutionManager.getExecutionTools();
-		assertNotNull(fExecutionTools);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		fExecutionManager.close();
-		fTarget.removeElement(fElement);
-	}
-
-}
diff --git a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/SFTPTests.java b/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/SFTPTests.java
deleted file mode 100644
index 07e04f7..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/core/tests/SFTPTests.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package org.eclipse.ptp.core.tests;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-
-import junit.framework.TestCase;
-
-import com.jcraft.jsch.ChannelSftp;
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.Session;
-import com.jcraft.jsch.SftpATTRS;
-import com.jcraft.jsch.SftpException;
-import com.jcraft.jsch.UIKeyboardInteractive;
-import com.jcraft.jsch.UserInfo;
-
-public class SFTPTests extends TestCase {
-	private static final String USERNAME = "user"; //$NON-NLS-1$
-	private static final String PASSWORD = "password"; //$NON-NLS-1$
-	private static final String HOST = "localhost"; //$NON-NLS-1$
-	private static final String PATH1 = "/home/user/sftp_test"; //$NON-NLS-1$
-	private static final String PATH2 = PATH1 + "/.file1"; //$NON-NLS-1$
-	private static final String TEST_STRING = "a string containing fairly *()(*&^$%## random text"; //$NON-NLS-1$
-	
-	
-	private class SSHUserInfo implements UserInfo, UIKeyboardInteractive {
-		private SSHUserInfo() { }
-
-		public String getPassword() {
-			return PASSWORD;
-		}
-		
-		public void setPassword(String password) {
-		}
-
-		public boolean promptYesNo(String str) {
-			return true;
-		}
-
-		public String getPassphrase() {
-			return "";
-		}
-		
-		public void setPassphrase(String passphrase) {
-		}
-
-		public boolean promptPassphrase(String message) {
-			return false;
-		}
-
-		public boolean promptPassword(String message) {
-			return true;
-		}
-		
-		public void setUsePassword(boolean usePassword) {
-		}
-
-		public void showMessage(String message) {
-		}
-
-		public String[] promptKeyboardInteractive(final String destination,
-				final String name, final String instruction,
-				final String[] prompt, final boolean[] echo) {
-			if (prompt.length != 1
-					|| echo[0] != false) {
-				return null;
-			}
-			String[] response = new String[1];
-			response[0] = PASSWORD;
-			return response;
-		}
-	}
-	
-	private JSch jsch;
-	private Session session;
-	private ChannelSftp sftp;
-	
-	public void testSftp() {
-		for (int i = 0; i < 5; i++) {
-			System.out.print("starting test... ");
-			
-			// stat
-			SftpATTRS attrs = null;
-			try {
-				attrs = sftp.stat(PATH1);
-			} catch (SftpException e) {
-				assertTrue(e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE);
-			} catch (Exception e) {
-				fail(e.getLocalizedMessage());
-			}
-			assertNull(attrs);
-			
-			// mkdir
-			
-			try {
-				sftp.mkdir(PATH1);
-			} catch (Exception e) {
-				fail(e.getLocalizedMessage());
-			}
-			attrs = null;
-			try {
-				attrs = sftp.stat(PATH1);
-			} catch (Exception e) {
-				fail(e.getLocalizedMessage());
-			}
-			assertNotNull(attrs);
-			assertTrue(attrs.isDir());
-			
-			// test write
-			attrs = null;
-			try {
-				attrs = sftp.stat(PATH2);
-			} catch (SftpException e) {
-				assertTrue(e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE);
-			} catch (Exception e) {
-				fail(e.getLocalizedMessage());
-			}
-			assertNull(attrs);
-			
-			try {
-				OutputStream stream = sftp.put(PATH2);
-				assertNotNull(stream);
-				BufferedWriter buf = new BufferedWriter(new OutputStreamWriter(stream));
-				buf.write(TEST_STRING);
-				buf.close();
-			} catch (Exception e) {
-				fail(e.getLocalizedMessage());
-			}
-			
-			attrs = null;
-			try {
-				attrs = sftp.stat(PATH2);
-			} catch (Exception e) {
-				fail(e.getLocalizedMessage());
-			}
-			assertNotNull(attrs);
-	
-			// read
-			try {
-				InputStream stream = sftp.get(PATH2);
-				assertNotNull(stream);
-				BufferedReader buf = new BufferedReader(new InputStreamReader(stream));
-				String line = buf.readLine().trim();
-				assertTrue(line.equals(TEST_STRING));
-				buf.close();
-			} catch (Exception e) {
-				fail(e.getLocalizedMessage());
-			}
-			
-			try {
-				sftp.rm(PATH2);
-			} catch (SftpException e) {
-				fail(e.getLocalizedMessage());
-			}
-			
-			try {
-				sftp.rmdir(PATH1);
-			} catch (SftpException e) {
-				fail(e.getLocalizedMessage());
-			}
-			
-			System.out.println("completed");
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#setUp()
-	 */
-	@Override
-	protected void setUp() throws Exception {
-		jsch = new JSch();
-		session = jsch.getSession(USERNAME, HOST);
-		session.setUserInfo(new SSHUserInfo());
-		session.connect();
-		sftp = (ChannelSftp) session.openChannel("sftp");
-		sftp.connect();
-	}
-
-	/* (non-Javadoc)
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	@Override
-	protected void tearDown() throws Exception {
-		sftp.disconnect();
-		session.disconnect();
-	}
-	
-}
diff --git a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/remote/core/tests/suite/RemoteCoreTestSuite.java b/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/remote/core/tests/suite/RemoteCoreTestSuite.java
deleted file mode 100644
index ba33661..0000000
--- a/core/org.eclipse.ptp.remote.core.tests/src/org/eclipse/ptp/remote/core/tests/suite/RemoteCoreTestSuite.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.eclipse.ptp.remote.core.tests.suite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ptp.core.tests.FileStoreTests;
-import org.eclipse.ptp.core.tests.RemoteConnectionTests;
-import org.eclipse.ptp.core.tests.SFTPTests;
-
-public class RemoteCoreTestSuite {
-	public static Test suite() {
-		TestSuite suite = new TestSuite(RemoteCoreTestSuite.class.getName());
-		
-		suite.addTestSuite(FileStoreTests.class);
-		suite.addTestSuite(RemoteConnectionTests.class);
-		suite.addTestSuite(SFTPTests.class);
-		return suite;
-	}
-
-}
diff --git a/core/org.eclipse.ptp.utils.core.tests/.classpath b/core/org.eclipse.ptp.utils.core.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/core/org.eclipse.ptp.utils.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/core/org.eclipse.ptp.utils.core.tests/.project b/core/org.eclipse.ptp.utils.core.tests/.project
deleted file mode 100644
index 8a5e69f..0000000
--- a/core/org.eclipse.ptp.utils.core.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.utils.core.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/core/org.eclipse.ptp.utils.core.tests/.settings/org.eclipse.jdt.core.prefs b/core/org.eclipse.ptp.utils.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d830758..0000000
--- a/core/org.eclipse.ptp.utils.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,74 +0,0 @@
-#Sat Nov 07 12:58:41 EST 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.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=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=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-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=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-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
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.eclipse.ptp.utils.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.ptp.utils.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index fea9f4d..0000000
--- a/core/org.eclipse.ptp.utils.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.utils.core.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.ptp.utils.core;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/core/org.eclipse.ptp.utils.core.tests/build.properties b/core/org.eclipse.ptp.utils.core.tests/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/core/org.eclipse.ptp.utils.core.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/core/org.eclipse.ptp.utils.core.tests/plugin.properties b/core/org.eclipse.ptp.utils.core.tests/plugin.properties
deleted file mode 100644
index c8959a9..0000000
--- a/core/org.eclipse.ptp.utils.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-
-pluginName=PTP Remote Core Tests
-pluginProvider=Eclipse PTP
diff --git a/core/org.eclipse.ptp.utils.core.tests/src/org/eclipse/ptp/utils/core/tests/ArgumentParserTests.java b/core/org.eclipse.ptp.utils.core.tests/src/org/eclipse/ptp/utils/core/tests/ArgumentParserTests.java
deleted file mode 100644
index 188def4..0000000
--- a/core/org.eclipse.ptp.utils.core.tests/src/org/eclipse/ptp/utils/core/tests/ArgumentParserTests.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.utils.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.ptp.utils.core.ArgumentParser;
-
-public class ArgumentParserTests extends TestCase {
-	
-	public void testFileStore() {
-		ArgumentParser parser = new ArgumentParser("foobar", new String[] {"arg1", "arg2", "arg\\3", "arg\"4", "arg'5", "more arguments"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
-		assertEquals("foobar arg1 arg2 arg\\3 arg\"4 arg'5 more\\ arguments", parser.getCommandLine(false));
-		assertEquals("foobar arg1 arg2 arg\\\\3 arg\\\"4 arg\\'5 more\\ arguments", parser.getCommandLine(true));
-		
-		parser = new ArgumentParser(" foo");
-		assertEquals("foo", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo ");
-		assertEquals("foo", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo");
-		assertEquals("foo", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a");
-		assertEquals("foo a", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo  a");
-		assertEquals("foo a", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a ");
-		assertEquals("foo a", parser.getCommandLine(true));
-		parser = new ArgumentParser(" foo a");
-		assertEquals("foo a", parser.getCommandLine(true));
-		parser = new ArgumentParser(" foo a ");
-		assertEquals("foo a", parser.getCommandLine(true));
-		parser = new ArgumentParser(" foo   a ");
-		assertEquals("foo a", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo	a");
-		assertEquals("foo a", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a	");
-		assertEquals("foo a", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo	a	");
-		assertEquals("foo a", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a b");
-		assertEquals("foo a b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a b ");
-		assertEquals("foo a b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a b c ");
-		assertEquals("foo a b c", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo\\ a b");
-		assertEquals("foo\\ a b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo \\ab");
-		assertEquals("foo ab", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a\\ b\\ c ");
-		assertEquals("foo a\\ b\\ c", parser.getCommandLine(true));
-		parser = new ArgumentParser("\\foo a b c ");
-		assertEquals("foo a b c", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a b c\\");
-		assertEquals("foo a b c", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \\b c");
-		assertEquals("foo a b c", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a\\'c b");
-		assertEquals("foo a\\'c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a\\\"c b");
-		assertEquals("foo a\\\"c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \\'c b");
-		assertEquals("foo a \\'c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \\\"c b");
-		assertEquals("foo a \\\"c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a\\' c b");
-		assertEquals("foo a\\' c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a\\\" c b");
-		assertEquals("foo a\\\" c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \\' c b");
-		assertEquals("foo a \\' c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \\\" c b");
-		assertEquals("foo a \\\" c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a c b\\'");
-		assertEquals("foo a c b\\'", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a c b\\\"");
-		assertEquals("foo a c b\\\"", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a c b \\'");
-		assertEquals("foo a c b \\\'", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a c b \\\"");
-		assertEquals("foo a c b \\\"", parser.getCommandLine(true));
-		parser = new ArgumentParser("\\'foo a c b");
-		assertEquals("\\\'foo a c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("\\\"foo a c b");
-		assertEquals("\\\"foo a c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("\\' foo a c b");
-		assertEquals("\\\' foo a c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("\\\" foo a c b");		
-		assertEquals("\\\" foo a c b", parser.getCommandLine(true));
-		parser = new ArgumentParser("'foo a' b c d");
-		assertEquals("foo\\ a b c d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a b 'c d'");
-		assertEquals("foo a b c\\ d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a 'b c' d");
-		assertEquals("foo a b\\ c d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a 'b\\e' d");
-		assertEquals("foo a b\\\\e d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \"b\\e\" d");
-		assertEquals("foo a b\\\\e d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a 'b c d");
-		assertEquals("foo a b\\ c\\ d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \"b c d");
-		assertEquals("foo a b\\ c\\ d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \"b c\" d");
-		assertEquals("foo a b\\ c d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \"b c\"d");
-		assertEquals("foo a b\\ cd", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a 'b c' d");
-		assertEquals("foo a b\\ c d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a 'b c'd");
-		assertEquals("foo a b\\ cd", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a 'b \" c' d");
-		assertEquals("foo a b\\ \\\"\\ c d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \"b ' c\" d");
-		assertEquals("foo a b\\ \\'\\ c d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a 'b \\\" c' d");
-		assertEquals("foo a b\\ \\\\\\\"\\ c d", parser.getCommandLine(true));
-		parser = new ArgumentParser("foo a \"b \' c\" d");		
-		assertEquals("foo a b\\ \\'\\ c d", parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {});
-		assertEquals("", parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {"a"});
-		assertEquals("a", parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {"av"});
-		assertEquals("av", parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {"a d"});
-		assertEquals("a\\ d", parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {"a", "a"});
-		assertEquals("a a", parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {"av", "a"});
-		assertEquals("av a", parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {"a d", "a"});
-		assertEquals("a\\ d a", parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {"a", "b b"});
-		assertEquals("a b\\ b", parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {"av", "b b"});
-		assertEquals("av b\\ b", parser.getCommandLine(true));
-		parser = new ArgumentParser(new String[] {"a d", "b b"});
-		assertEquals("a\\ d b\\ b", parser.getCommandLine(true));
-	}
-}
diff --git a/core/org.eclipse.ptp.utils.core.tests/src/org/eclipse/ptp/utils/core/tests/suite/UtilsCoreTestSuite.java b/core/org.eclipse.ptp.utils.core.tests/src/org/eclipse/ptp/utils/core/tests/suite/UtilsCoreTestSuite.java
deleted file mode 100644
index f2ce2a5..0000000
--- a/core/org.eclipse.ptp.utils.core.tests/src/org/eclipse/ptp/utils/core/tests/suite/UtilsCoreTestSuite.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.utils.core.tests.suite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ptp.utils.core.tests.ArgumentParserTests;
-
-public class UtilsCoreTestSuite {
-	public static Test suite() {
-		TestSuite suite = new TestSuite(UtilsCoreTestSuite.class.getName());
-		
-		suite.addTestSuite(ArgumentParserTests.class);
-		return suite;
-	}
-
-}
diff --git a/debug/org.eclipse.ptp.debug.core.tests/.classpath b/debug/org.eclipse.ptp.debug.core.tests/.classpath
deleted file mode 100644
index 16d067f..0000000
--- a/debug/org.eclipse.ptp.debug.core.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/debug/org.eclipse.ptp.debug.core.tests/.project b/debug/org.eclipse.ptp.debug.core.tests/.project
deleted file mode 100644
index 9034eb0..0000000
--- a/debug/org.eclipse.ptp.debug.core.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.debug.core.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/debug/org.eclipse.ptp.debug.core.tests/.settings/org.eclipse.jdt.core.prefs b/debug/org.eclipse.ptp.debug.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d830758..0000000
--- a/debug/org.eclipse.ptp.debug.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,74 +0,0 @@
-#Sat Nov 07 12:58:41 EST 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.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=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=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-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=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-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
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/debug/org.eclipse.ptp.debug.core.tests/META-INF/MANIFEST.MF b/debug/org.eclipse.ptp.debug.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index fa60f30..0000000
--- a/debug/org.eclipse.ptp.debug.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.debug.core.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.ptp.core,
- org.eclipse.ptp.debug.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.ptp.debug.core
diff --git a/debug/org.eclipse.ptp.debug.core.tests/build.properties b/debug/org.eclipse.ptp.debug.core.tests/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/debug/org.eclipse.ptp.debug.core.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/debug/org.eclipse.ptp.debug.core.tests/plugin.properties b/debug/org.eclipse.ptp.debug.core.tests/plugin.properties
deleted file mode 100644
index b3cca65..0000000
--- a/debug/org.eclipse.ptp.debug.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 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=PTP Core Tests
-pluginProvider=Eclipse PTP
diff --git a/debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/AIFTests.java b/debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/AIFTests.java
deleted file mode 100644
index df81d4a..0000000
--- a/debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/AIFTests.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFactory;
-import org.eclipse.ptp.debug.core.pdi.model.aif.AIFFormatException;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFType;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeAddress;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeAggregate;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeArray;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeBool;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeChar;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeCharPointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeEnum;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeFloat;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeFunction;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeInt;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeNamed;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypePointer;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeRange;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeReference;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeString;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeUnion;
-import org.eclipse.ptp.debug.core.pdi.model.aif.IAIFTypeVoid;
-
-public class AIFTests extends TestCase {
-	public void testTypes() {
-		IAIFType t;
-		try {
-			t = AIFFactory.getAIFType("a8"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeAddress);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("{|;;;}"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeAggregate);
-			t = AIFFactory.getAIFType("{a|x=is4,y=f4;;v=pa4;}"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeAggregate);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("[r0,2is4][r-1,3is4][r10,4is4][r-10,5is4][r0,6is4]is4"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeArray);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("b1"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeBool);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("c"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeChar);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("pa4"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeCharPointer);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("<|>is4"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeEnum);
-			t = AIFFactory.getAIFType("<a|x=-1,y=0,z=1>is4"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeEnum);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("f4"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeFloat);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("&is4,f8/f8"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeFunction);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("iu8"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeInt);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("%1/^a4{s1|a=is4,b=>1/;;;}"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeNamed);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("^a4{s1|a=is4,b=f4,c=c;;;}"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypePointer);
-			t = AIFFactory.getAIFType("^a4^a4c"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypePointer);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("r-4,10is4"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeRange);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("r-4,10is4"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeRange);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType(">3/"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeReference);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("s"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeString);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("(|)"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeUnion);
-			t = AIFFactory.getAIFType("(u|a=is4,b=f8)"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeUnion);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-		try {
-			t = AIFFactory.getAIFType("v0"); //$NON-NLS-1$
-			assertTrue(t instanceof IAIFTypeVoid);
-		} catch (AIFFormatException e) {
-			fail(e.getMessage());
-		}
-	}
-}
diff --git a/debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/TaskSetTests.java b/debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/TaskSetTests.java
deleted file mode 100644
index a68b91b..0000000
--- a/debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/TaskSetTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.ptp.debug.core.TaskSet;
-
-public class TaskSetTests extends TestCase {
-	public void testToString() {
-		TaskSet b = new TaskSet();
-		b.set(3, 13);
-		b.set(15, 22);
-		String str = b.toHexString().toUpperCase();
-
-		assertEquals(str, "00000000003F9FF8"); //$NON-NLS-1$
-
-		assertEquals(b.toString(), "{3-12,15-21}"); //$NON-NLS-1$
-	}
-
-	public void testFromString() {
-		String str = "06411eda"; //$NON-NLS-1$
-		TaskSet b = new TaskSet(28, str);
-
-		String res = b.toHexString();
-
-		assertEquals(str, res);
-
-		str = "07"; //$NON-NLS-1$
-		b = new TaskSet(3, str);
-		res = b.toHexString();
-
-		assertEquals(str, res);
-	}
-}
diff --git a/debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/suite/DebugCoreTestSuite.java b/debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/suite/DebugCoreTestSuite.java
deleted file mode 100644
index 6e52cf8..0000000
--- a/debug/org.eclipse.ptp.debug.core.tests/src/org/eclipse/ptp/debug/core/tests/suite/DebugCoreTestSuite.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * 	IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.ptp.debug.core.tests.suite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.ptp.debug.core.tests.AIFTests;
-import org.eclipse.ptp.debug.core.tests.TaskSetTests;
-
-public class DebugCoreTestSuite {
-	public static Test suite() {
-		TestSuite suite = new TestSuite(DebugCoreTestSuite.class.getName());
-
-		suite.addTestSuite(TaskSetTests.class);
-		suite.addTestSuite(AIFTests.class);
-		return suite;
-	}
-
-}
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 8d0f5be..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<prerequisites>
-		<maven>3.0</maven>
-	</prerequisites>
-
-	<groupId>org.eclipse.ptp</groupId>
-	<artifactId>ptp-parent</artifactId>
-	<version>6.0.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>PTP Parent</name>
-
-	<properties>
-		<tycho-version>0.13.0-SNAPSHOT</tycho-version>
-		<platform-version>3.7</platform-version>
-		<platform-site>http://download.eclipse.org/eclipse/updates/${platform-version}</platform-site>
-		<orbit-version>R20110523182458</orbit-version>
-		<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/${orbit-version}/repository</orbit-site>
-		<tm-version>3.3</tm-version>
-		<tm-site>http://download.eclipse.org/tm/updates/${tm-version}</tm-site>
-	</properties>
-
-	<licenses>
-		<license>
-			<name>Eclipse Public License v1.0</name>
-			<comments>
-       All rights reserved.
-
-       This program and the accompanying materials are made
-       available under the terms of the Eclipse Public License v1.0
-       which accompanies this distribution, and is available at
-       http://www.eclipse.org/legal/epl-v10.htm
-      </comments>
-		</license>
-	</licenses>
-
-	<modules>
-		<module>core/org.eclipse.ptp.core</module>
-		<module>core/org.eclipse.ptp.launch</module>
-		<module>core/org.eclipse.ptp.proxy</module>
-		<module>core/org.eclipse.ptp.proxy.protocol</module>
-		<module>core/org.eclipse.ptp.remote.core</module>
-		<module>core/org.eclipse.ptp.remote.remotetools.core</module>
-		<module>core/org.eclipse.ptp.remote.remotetools.ui</module>
-		<module>core/org.eclipse.ptp.remote.rse.core</module>
-		<module>core/org.eclipse.ptp.remote.rse.ui</module>
-		<module>core/org.eclipse.ptp.remote.ui</module>
-		<module>core/org.eclipse.ptp.services.core</module>
-		<module>core/org.eclipse.ptp.services.ui</module>
-		<module>core/org.eclipse.ptp.ui</module>
-		<module>core/org.eclipse.ptp.utils</module>
-		<module>core/org.eclipse.ptp.utils.core</module>
-		<module>core/org.eclipse.ptp.utils.extensionpoints.core</module>
-		<module>core/org.eclipse.ptp.utils.file.core</module>
-		<module>core/org.eclipse.ptp.utils.ui</module>
-		<module>debug/org.eclipse.ptp.debug.core</module>
-		<module>debug/org.eclipse.ptp.debug.sdm</module>
-		<module>debug/org.eclipse.ptp.debug.sdm.core</module>
-		<module>debug/org.eclipse.ptp.debug.sdm.ui</module>
-		<module>debug/org.eclipse.ptp.debug.ui</module>
-		<module>doc/org.eclipse.ptp.doc.user</module>
-		<module>doc/org.eclipse.ptp.doc.isv</module>
-		<module>photran/org.eclipse.photran.cdtinterface</module>
-		<module>photran/org.eclipse.photran.cdtinterface.vpg</module>
-		<module>photran/org.eclipse.photran.core</module>
-		<module>photran/org.eclipse.photran.core.intel</module>
-		<module>photran/org.eclipse.photran.core.vpg</module>
-		<module>photran/org.eclipse.photran.doc.user</module>
-		<module>photran/org.eclipse.photran.errorparsers.xlf</module>
-		<module>photran/org.eclipse.photran-feature</module>
-		<module>photran/org.eclipse.photran.intel-feature</module>
-		<module>photran/org.eclipse.photran.managedbuilder.core</module>
-		<module>photran/org.eclipse.photran.managedbuilder.gnu.ui</module>
-		<module>photran/org.eclipse.photran.managedbuilder.intel.ui</module>
-		<module>photran/org.eclipse.photran.managedbuilder.ui</module>
-		<module>photran/org.eclipse.photran.managedbuilder.xlf.ui</module>
-		<module>photran/org.eclipse.photran.ui</module>
-		<module>photran/org.eclipse.photran.ui.vpg</module>
-		<module>photran/org.eclipse.photran.xlf-feature</module>
-		<module>photran/org.eclipse.rephraserengine.core</module>
-		<module>photran/org.eclipse.rephraserengine.core.refactoring</module>
-		<module>photran/org.eclipse.rephraserengine.core.vpg</module>
-		<module>photran/org.eclipse.rephraserengine-feature</module>
-		<module>photran/org.eclipse.rephraserengine.ui</module>
-		<module>photran/org.eclipse.rephraserengine.ui.refactoring</module>
-		<module>photran/org.eclipse.rephraserengine.ui.vpg</module>
-		<module>rdt/org.eclipse.ptp.rdt.core</module>
-		<module>rdt/org.eclipse.ptp.rdt.core.remotejars</module>
-		<module>rdt/org.eclipse.ptp.rdt.core.stubs</module>
-		<module>rdt/org.eclipse.ptp.rdt.doc.user</module>
-		<module>rdt/org.eclipse.ptp.rdt.make.ui</module>
-		<module>rdt/org.eclipse.ptp.rdt.managedbuilder.gnu.ui</module>
-		<module>rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui</module>
-		<module>rdt/org.eclipse.ptp.rdt.managedbuilder.xlupc.ui</module>
-		<module>rdt/org.eclipse.ptp.rdt.server.dstore</module>
-		<module>rdt/org.eclipse.ptp.rdt.sync.core</module>
-		<module>rdt/org.eclipse.ptp.rdt.sync.git.core</module>
-		<module>rdt/org.eclipse.ptp.rdt.sync.git.ui</module>
-		<module>rdt/org.eclipse.ptp.rdt.sync.ui</module>
-		<module>rdt/org.eclipse.ptp.rdt.sync.ui.fortran</module>
-		<module>rdt/org.eclipse.ptp.rdt.ui</module>
-		<module>rdt/org.eclipse.ptp.rdt.xlc</module>
-		<module>releng/org.eclipse.ptp</module>
-		<module>releng/org.eclipse.ptp.aix.ppc</module>
-		<module>releng/org.eclipse.ptp.core-feature</module>
-		<module>releng/org.eclipse.ptp.etfw-feature</module>
-		<module>releng/org.eclipse.ptp.etfw.ppw-feature</module>
-		<module>releng/org.eclipse.ptp.etfw.tau-feature</module>
-		<module>releng/org.eclipse.ptp.etfw.tau.fortran-feature</module>
-		<module>releng/org.eclipse.ptp.external-feature</module>
-		<module>releng/org.eclipse.ptp-feature</module>
-		<module>releng/org.eclipse.ptp.gem-feature</module>
-		<module>releng/org.eclipse.ptp.linux.ppc</module>
-		<module>releng/org.eclipse.ptp.linux.x86</module>
-		<module>releng/org.eclipse.ptp.linux.x86_64</module>
-		<module>releng/org.eclipse.ptp.macosx.ppc</module>
-		<module>releng/org.eclipse.ptp.macosx.x86</module>
-		<module>releng/org.eclipse.ptp.pldt-feature</module>
-		<module>releng/org.eclipse.ptp.pldt.fortran-feature</module>
-		<module>releng/org.eclipse.ptp.pldt.lapi-feature</module>
-		<module>releng/org.eclipse.ptp.pldt.upc-feature</module>
-		<module>releng/org.eclipse.ptp.rdt-feature</module>
-		<module>releng/org.eclipse.ptp.rdt.remotejars-feature</module>
-		<module>releng/org.eclipse.ptp.rdt.remotetools-feature</module>
-		<module>releng/org.eclipse.ptp.rdt.sync-feature</module>
-		<module>releng/org.eclipse.ptp.rdt.sync.fortran-feature</module>
-		<module>releng/org.eclipse.ptp.rdt.xlc-feature</module>
-		<module>releng/org.eclipse.ptp.remote-feature</module>
-		<module>releng/org.eclipse.ptp.remote.remotetools-feature</module>
-		<module>releng/org.eclipse.ptp.remote.rse-feature</module>
-		<module>releng/org.eclipse.ptp.remotetools-feature</module>
-		<module>releng/org.eclipse.ptp.rm.ibm.ll-feature</module>
-		<module>releng/org.eclipse.ptp.rm.ibm.pe-feature</module>
-		<module>releng/org.eclipse.ptp.rm.jaxb-feature</module>
-		<module>releng/org.eclipse.ptp.rm.jaxb.pbs-feature</module>
-		<module>releng/org.eclipse.ptp.rm.lml-feature</module>
-		<module>releng/org.eclipse.ptp.rm.lml_jaxb-feature</module>
-		<module>releng/org.eclipse.ptp.rm.mpich2-feature</module>
-		<module>releng/org.eclipse.ptp.rm.openmpi-feature</module>
-		<module>releng/org.eclipse.ptp.rm.slurm-feature</module>
-		<module>releng/org.eclipse.ptp.sci-feature</module>
-		<module>releng/org.eclipse.ptp.sdk-feature</module>
-		<module>releng/org.eclipse.ptp.sdm-feature</module>
-		<module>releng/org.eclipse.ptp.services-feature</module>
-		<module>releng/org.eclipse.ptp.utils-feature</module>
-		<module>rms/org.eclipse.ptp.rm.core</module>
-		<module>rms/org.eclipse.ptp.rm.generic.core</module>
-		<module>rms/org.eclipse.ptp.rm.generic.ui</module>
-		<module>rms/org.eclipse.ptp.rm.ibm.ll.core</module>
-		<module>rms/org.eclipse.ptp.rm.ibm.ll.help</module>
-		<module>rms/org.eclipse.ptp.rm.ibm.ll.proxy</module>
-		<module>rms/org.eclipse.ptp.rm.ibm.ll.ui</module>
-		<module>rms/org.eclipse.ptp.rm.ibm.pe.core</module>
-		<module>rms/org.eclipse.ptp.rm.ibm.pe.help</module>
-		<module>rms/org.eclipse.ptp.rm.ibm.pe.proxy</module>
-		<module>rms/org.eclipse.ptp.rm.ibm.pe.ui</module>
-		<module>rms/org.eclipse.ptp.rm.jaxb.control.core</module>
-		<module>rms/org.eclipse.ptp.rm.jaxb.control.ui</module>
-		<module>rms/org.eclipse.ptp.rm.jaxb.core</module>
-		<module>rms/org.eclipse.ptp.rm.jaxb.help</module>
-		<module>rms/org.eclipse.ptp.rm.jaxb.pbs</module>
-		<module>rms/org.eclipse.ptp.rm.jaxb.pbs.doc.user</module>
-		<module>rms/org.eclipse.ptp.rm.jaxb.ui</module>
-		<module>rms/org.eclipse.ptp.rm.lml.core</module>
-		<module>rms/org.eclipse.ptp.rm.lml.da</module>
-		<module>rms/org.eclipse.ptp.rm.lml.da.server</module>
-		<module>rms/org.eclipse.ptp.rm.lml_jaxb</module>
-		<module>rms/org.eclipse.ptp.rm.lml.monitor.core</module>
-		<module>rms/org.eclipse.ptp.rm.lml.monitor.ui</module>
-		<module>rms/org.eclipse.ptp.rm.lml.ui</module>
-		<module>rms/org.eclipse.ptp.rm.mpi.mpich2.core</module>
-		<module>rms/org.eclipse.ptp.rm.mpi.mpich2.ui</module>
-		<module>rms/org.eclipse.ptp.rm.mpi.openmpi.core</module>
-		<module>rms/org.eclipse.ptp.rm.mpi.openmpi.ui</module>
-		<module>rms/org.eclipse.ptp.rm.proxy.core</module>
-		<module>rms/org.eclipse.ptp.rm.slurm.core</module>
-		<module>rms/org.eclipse.ptp.rm.slurm.help</module>
-		<module>rms/org.eclipse.ptp.rm.slurm.proxy</module>
-		<module>rms/org.eclipse.ptp.rm.slurm.ui</module>
-		<module>rms/org.eclipse.ptp.rm.ui</module>
-		<module>tools/etfw/org.eclipse.ptp.etfw</module>
-		<module>tools/etfw/org.eclipse.ptp.etfw.doc.user</module>
-		<module>tools/etfw/org.eclipse.ptp.etfw.feedback</module>
-		<module>tools/etfw/org.eclipse.ptp.etfw.parallel</module>
-		<module>tools/etfw/org.eclipse.ptp.etfw.tau</module>
-		<module>tools/etfw/org.eclipse.ptp.etfw.tau.papiselect</module>
-		<module>tools/etfw/org.eclipse.ptp.etfw.tau.perfdmf</module>
-		<module>tools/etfw/org.eclipse.ptp.etfw.tau.selinst</module>
-		<module>tools/etfw/org.eclipse.ptp.etfw.tau.selinstfort</module>
-		<module>tools/etfw/org.eclipse.ptp.etfw.toolopts</module>
-		<module>tools/gem/org.eclipse.ptp.gem</module>
-		<module>tools/gem/org.eclipse.ptp.gem.help</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.common</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.doc.user</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.lapi</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.mpi.analysis</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.mpi.core</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.mpi.fortran</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.openmp.analysis</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.openmp.core</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.openmp.fortran</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.upc</module>
-		<module>tools/pldt/org.eclipse.ptp.pldt.wizards</module>
-		<module>tools/ppw/org.eclipse.ptp.etfw.ppw</module>
-		<module>tools/remotetools/org.eclipse.ptp.remotetools.core</module>
-		<module>tools/remotetools/org.eclipse.ptp.remotetools.environment.core</module>
-		<module>tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost</module>
-		<module>tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher</module>
-		<module>tools/remotetools/org.eclipse.ptp.remotetools.environment.ui</module>
-		<module>tools/remotetools/org.eclipse.ptp.remotetools.preferences</module>
-		<module>tools/remotetools/org.eclipse.ptp.remotetools.utils</module>
-		<module>tools/sci/org.eclipse.ptp.sci</module>
-		<module>releng/org.eclipse.ptp.repo</module>
-	</modules>
-
-	<repositories>
-		<repository>
-			<id>platform-${platform-version}</id>
-			<url>${platform-site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>orbit-${orbit-version}</id>
-			<url>${orbit-site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>tm-${tm-version}</id>
-			<url>${tm-site}</url>
-			<layout>p2</layout>
-		</repository>
-		<repository>
-			<id>indigo</id>
-			<url>http://download.eclipse.org/releases/indigo</url>
-			<layout>p2</layout>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>sonatype</id>
-			<url>https://repository.sonatype.org/content/repositories/public</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-		</pluginRepository>
-		<pluginRepository>
-			<id>maven.eclipse.org</id>
-			<url>http://maven.eclipse.org/nexus/content/repositories/nightly-indigo</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-maven-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<extensions>true</extensions>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>target-platform-configuration</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<resolver>p2</resolver>
-					<pomDependencies>consider</pomDependencies>
-					<environments>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>linux</os>
-							<ws>gtk</ws>
-							<arch>ppc64</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>win32</os>
-							<ws>win32</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86</arch>
-						</environment>
-						<environment>
-							<os>macosx</os>
-							<ws>cocoa</ws>
-							<arch>x86_64</arch>
-						</environment>
-						<environment>
-							<os>aix</os>
-							<ws>gtk</ws>
-							<arch>ppc</arch>
-						</environment>
-						<environment>
-							<os>solaris</os>
-							<ws>gtk</ws>
-							<arch>sparc</arch>
-						</environment>
-					</environments>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<encoding>UTF-8</encoding>
-				</configuration>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-		<pluginManagement>
-			<plugins>
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-compiler-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<configuration>
-						<encoding>UTF-8</encoding>
-					</configuration>
-				</plugin>
-				<!-- enable source bundle generation -->
-				<plugin>
-					<groupId>org.eclipse.tycho</groupId>
-					<artifactId>tycho-source-plugin</artifactId>
-					<version>${tycho-version}</version>
-					<executions>
-						<execution>
-							<id>plugin-source</id>
-							<goals>
-								<goal>plugin-source</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-resources-plugin</artifactId>
-					<version>2.4.1</version>
-					<configuration>
-						<encoding>ISO-8859-1</encoding>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.3</version>
-				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>findbugs-maven-plugin</artifactId>
-					<version>2.3.2</version>
-					<configuration>
-						<findbugsXmlOutput>true</findbugsXmlOutput>
-						<failOnError>false</failOnError>
-					</configuration>
-					<executions>
-						<execution>
-							<goals>
-								<goal>check</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-pmd-plugin</artifactId>
-					<version>2.5</version>
-					<configuration>
-						<sourceEncoding>utf-8</sourceEncoding>
-						<minimumTokens>100</minimumTokens>
-						<targetJdk>1.5</targetJdk>
-						<format>xml</format>
-						<failOnViolation>false</failOnViolation>
-					</configuration>
-					<executions>
-						<execution>
-							<goals>
-								<goal>cpd-check</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-	</build>
-</project>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core.tests/.classpath b/rdt/org.eclipse.ptp.rdt.sync.core.tests/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.core.tests/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core.tests/.project b/rdt/org.eclipse.ptp.rdt.sync.core.tests/.project
deleted file mode 100644
index e2fd2ef..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rdt.sync.core.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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core.tests/.settings/org.eclipse.jdt.core.prefs b/rdt/org.eclipse.ptp.rdt.sync.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9a6a1d2..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Sat Aug 06 11:19:19 EDT 2011
-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.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-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.sync.core.tests/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.sync.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 6a3d82c..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests
-Bundle-SymbolicName: org.eclipse.ptp.rdt.sync.core.tests
-Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.ptp.remote.core;bundle-version="5.0.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.core.filesystem,
- org.junit4;bundle-version="4.8.1",
- org.eclipse.ptp.rdt.sync.git.core;bundle-version="1.0.0",
- org.eclipse.ptp.remotetools.environment.generichost;bundle-version="1.4.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core.tests/about.html b/rdt/org.eclipse.ptp.rdt.sync.core.tests/about.html
deleted file mode 100644
index 248e48c..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.core.tests/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html lang="en">
-<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>June 12, 2008</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core.tests/build.properties b/rdt/org.eclipse.ptp.rdt.sync.core.tests/build.properties
deleted file mode 100644
index b107977..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.core.tests/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-source.. = src/
-bin.includes = META-INF/,\
-               .
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/BasicGitSyncTests.java b/rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/BasicGitSyncTests.java
deleted file mode 100644
index 5cdb120..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/BasicGitSyncTests.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Tennessee 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:
- *     Roland Schulz - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rdt.sync.core.tests;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.rdt.sync.git.core.CommandRunner;
-import org.eclipse.ptp.rdt.sync.git.core.CommandRunner.CommandResults;
-import org.eclipse.ptp.rdt.sync.git.core.RemoteSyncException;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@SuppressWarnings("restriction")
-@RunWith(Parameterized.class)
-public class BasicGitSyncTests {
-	String host;
-	String username;
-	String password;
-	String remoteBaseDir;
-	String privatekey;
-	
-	
-	public BasicGitSyncTests(String host, String username, String password,	String remoteBaseDir, String privatekey) {
-		this.host = host;
-		this.username = username;
-		this.password = password;
-		this.remoteBaseDir = remoteBaseDir;
-		this.privatekey = privatekey;
-	}
-	
-	 @Parameters
-	 public static Collection<Object[]> generateData() throws IOException {
-		/* read in property-file */
-		Properties prop = new Properties();
-		InputStream in = BasicGitSyncTests.class.getResourceAsStream("remotehost.properties");
-		prop.load(in);
-		in.close();
-		
-		String configurations = prop.getProperty("configurations");
-		
-		List<Object[]> data = new ArrayList<Object[]>();
-		for (String  conf : configurations.split(" ")) {
-			String host = prop.getProperty(conf+".host");
-			String username = prop.getProperty(conf+".username");
-			String password = prop.getProperty(conf+".password");
-			String remoteBaseDir = prop.getProperty(conf+".remoteBaseDir");
-			String privatekey = prop.getProperty(conf+".privatekey");
-			
-			/* check all properties are available */
-			assertTrue(host!=null && username!=null && password != null && remoteBaseDir != null); /*missing fields in property file*/ 
-	
-			/* set default values if value is empty - we still require the property to be available - should we?*/
-			if (username.equals("")) username=System.getProperty("user.name");
-			if (remoteBaseDir.equals("")) remoteBaseDir="/tmp";
-			data.add(new Object[] {host, username, password, remoteBaseDir, privatekey});
-		}
-		return data;
-	 }
-
-/* Ideas for further tests:
- * 
- * - committing modified files (currently only adding empty files) 
- * - files with odd filenames
- */
-	
-	
-	/* The rule objects are created before each test and than deleted again */
-	@Rule
-	public TemporaryGitRemoteSyncConnection tempGitConn = 
-								new TemporaryGitRemoteSyncConnection(this);
-	
-	@Test
-	public void testCommandRunner() throws RemoteSyncException, IOException, InterruptedException, RemoteConnectionException {
-		CommandResults results = CommandRunner.executeRemoteCommand(tempGitConn.getRemoteConn(), "echo -n hi", "", null);
-		assertEquals(results.getStdout(),"hi");
-	}
-	
-	@Test 
-	public void testSyncLocalToRemoteEmpty() throws RemoteSyncException {
-		tempGitConn.getGITConn().syncLocalToRemote(null);
-	}
-	
-	@Test 
-	public void testSyncRemoteToLocalEmpty() throws RemoteSyncException {
-		tempGitConn.getGITConn().syncRemoteToLocal(null, false);
-	}
-	
-	/* next two test sync empty file in one direction and than a change in the other
-	 * (doesn't follow simple test recommendation but 2nd step requires first so no use in breaking apart
-	 */
-	@Test 
-	public void testSyncLocalToRemoteToLocal() throws IOException, CoreException {
-		//sync empty file
-		tempGitConn.getLocalFolder().newFile("testFile");
-		tempGitConn.getGITConn().syncLocalToRemote(null);
-
-		//check file was synced
-		assertArrayEquals(tempGitConn.getFileManager().getResource(tempGitConn.getRemoteFolder()+"/testFile").childNames(EFS.NONE, null),
-				 new String[]{"testFile"});
-		
-		//TODO: change file and sync in other direction 
-		
-	}
-	
-	@Test 
-	public void testSyncRemoteToLocalToRemote() throws CoreException, IOException {
-		//sync empty file
-		IFileStore remoteTestFile = tempGitConn.getFileManager().getResource(tempGitConn.getRemoteFolder()+"/testFile");
-		remoteTestFile.openOutputStream(EFS.NONE, null).close();
-		tempGitConn.getGITConn().syncRemoteToLocal(null, true);
-		
-		//check file was synced
-		File localRoot = tempGitConn.getLocalFolder().getRoot();
-		assertArrayEquals(localRoot.list(new FilenameFilter() {
-			public boolean accept(File dir, String name) {
-				return !name.equals(".ptp-sync");
-			}
-		}), new String[]{"testFile"});
-		
-		//now sync change in other directions, first write data
-		OutputStream out = new FileOutputStream(new File(localRoot.getAbsoluteFile(),"testFile"));
-		byte data[] = "some data".getBytes();
-		out.write(data);
-		out.close();
-		
-		//sync
-		tempGitConn.getGITConn().syncLocalToRemote(null);
-		
-		//read data and compare
-		byte buf[] = new byte[data.length];
-		InputStream in = remoteTestFile.openInputStream(EFS.NONE, null);
-		in.read(buf);
-		in.close();
-		assertArrayEquals(data, buf);
-	}
-}
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/TemporaryGitRemoteSyncConnection.java b/rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/TemporaryGitRemoteSyncConnection.java
deleted file mode 100644
index b0a1fb6..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/TemporaryGitRemoteSyncConnection.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Tennessee 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:
- *     Roland Schulz - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.rdt.sync.core.tests;
-
-import static org.junit.Assert.*;
-
-import java.util.Random;
-
-import org.eclipse.ptp.rdt.sync.git.core.GitRemoteSyncConnection;
-import org.eclipse.ptp.rdt.sync.git.core.SyncFileFilter;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remotetools.environment.generichost.core.ConfigFactory;
-import org.junit.rules.ExternalResource;
-import org.junit.rules.TemporaryFolder;
-
-import org.eclipse.core.filesystem.EFS;
-
-@SuppressWarnings("restriction")
-public class TemporaryGitRemoteSyncConnection extends ExternalResource {
-	private GitRemoteSyncConnection fGITConn;
-	private IRemoteConnection fRemoteConnection;
-	private TemporaryFolder localFolder;
-	private static Random random = new Random();
-	private IRemoteFileManager fileManager;
-	private BasicGitSyncTests test;
-	private String remoteFolder;
-	private IRemoteConnectionManager connMgr;
-	
-	public TemporaryGitRemoteSyncConnection(BasicGitSyncTests basicGitSyncTests) {
-		test = basicGitSyncTests;
-	}
-
-	@Override
-	protected void before() throws Throwable {
-		create();
-	}
-
-	@Override
-	protected void after() {
-		delete();
-	}
-	
-	public GitRemoteSyncConnection getGITConn() {
-		return fGITConn;
-	}
-	
-	public TemporaryFolder getLocalFolder() {
-		return localFolder;
-	}
-	
-	public String getRemoteFolder() {
-		return remoteFolder;
-	}
-
-	public IRemoteFileManager getFileManager() {
-		return fileManager;
-	}
-
-	private void create() throws Exception {
-		long n = random.nextInt(1000000);
-		remoteFolder = test.remoteBaseDir + "/junit" + n;
-		
-		/* setup remote connection */
-		IRemoteServices fRemoteServices;
-		
-		fRemoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(
-				"org.eclipse.ptp.remote.RemoteTools"); //$NON-NLS-1$
-		assertNotNull(fRemoteServices);
-
-		connMgr = fRemoteServices.getConnectionManager();
-		assertNotNull(connMgr);
-
-		//TODO: understand why it is causes problem when all connections are called the same. Should be fine because 
-		// connections are deleted. There seems to be a problem in RemoteTools with creating a new connection with the same name
-		fRemoteConnection = connMgr.newConnection("test_connection"+n); //$NON-NLS-1$  
-
-		assertNotNull(fRemoteConnection);
-		fRemoteConnection.setAddress(test.host);
-		fRemoteConnection.setUsername(test.username);
-		if (test.privatekey == null) {
-			fRemoteConnection.setPassword(test.password);
-		} else {
-			fRemoteConnection.setAttribute(ConfigFactory.ATTR_KEY_PATH, test.privatekey);
-			fRemoteConnection.setAttribute(ConfigFactory.ATTR_KEY_PASSPHRASE, test.password);
-			fRemoteConnection.setAttribute(ConfigFactory.ATTR_IS_PASSWORD_AUTH, Boolean.toString(false));
-		}
-		
-		if (!fRemoteConnection.isOpen()) {
-			fRemoteConnection.open(null);
-		}
-		
-		fileManager = fRemoteConnection.getRemoteServices().getFileManager(fRemoteConnection);
-		
-		/*local folder*/
-		localFolder = new TemporaryFolder();
-		localFolder.create();
-		
-		/*remote folder (just delete - is created by GitRemoteSyncConnection)*/
-		fileManager.getResource(remoteFolder).delete(EFS.NONE, null);
-		
-		fGITConn = new GitRemoteSyncConnection(fRemoteConnection,
-				localFolder.getRoot().getPath(), remoteFolder,
-				new SyncFileFilter() {
-					public boolean shouldIgnore(String fileName) {
-						if (fileName.startsWith(GitRemoteSyncConnection.gitDir)) {
-							return true;
-						}
-						return false;
-					}
-				}, null);
-	}
-
-	private void delete()  {
-		String failMessage="";
-		
-		fGITConn.close();
-		localFolder.delete();
-		
-		try {
-			fileManager.getResource(remoteFolder).delete(EFS.NONE, null);
-		} catch (Exception e){
-			e.printStackTrace();
-			failMessage += e.getMessage(); //don't fail yet - try to clean up as much as possible
-		}
-		
-		fRemoteConnection.close();
-		try {
-			connMgr.removeConnection(fRemoteConnection);
-		} catch (Exception e){
-			e.printStackTrace();
-			failMessage += e.getMessage(); //don't fail yet - try to clean up as much as possible
-		}
-		
-		if (!failMessage.equals("")) {
-			fail(failMessage);
-		}
-	}
-
-	public IRemoteConnection getRemoteConn() {
-		return fRemoteConnection;
-	}
-}
diff --git a/rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/remotehost.properties.sample b/rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/remotehost.properties.sample
deleted file mode 100644
index 45b620b..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.core.tests/src/org/eclipse/ptp/rdt/sync/core/tests/remotehost.properties.sample
+++ /dev/null
@@ -1,12 +0,0 @@
-configurations=conf1 conf2
-
-conf1.host=localhost
-conf1.username=
-conf1.password=thePassWord
-conf1.remoteBaseDir=
-
-conf2.host=localhost
-conf2.username=
-conf2.password=privateKeyPassphrase
-conf2.privatekey=/path/to/key
-conf2.remoteBaseDir=
\ No newline at end of file
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/.classpath b/rdt/org.eclipse.ptp.rdt.sync.rsync.core/.classpath
deleted file mode 100644
index 5e4c1fe..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/.project b/rdt/org.eclipse.ptp.rdt.sync.rsync.core/.project
deleted file mode 100644
index 86c8246..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rdt.sync.rsync.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/rdt/org.eclipse.ptp.rdt.sync.rsync.core/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.sync.rsync.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 1f9eca2..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.ptp.rdt.sync.rsync.core;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rdt.sync.rsync.core.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ptp.rdt.sync.core;bundle-version="1.0.0",
- org.eclipse.ptp.rdt.sync.ui;bundle-version="1.0.0",
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui,
- org.eclipse.ptp.services.core
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.ptp.rdt.sync.rsync.core
-Bundle-Vendor: %plugin.provider
-Bundle-Localization: plugin
-Import-Package: org.eclipse.ptp.rdt.core.serviceproviders
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/build.properties b/rdt/org.eclipse.ptp.rdt.sync.rsync.core/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/plugin.properties b/rdt/org.eclipse.ptp.rdt.sync.rsync.core/plugin.properties
deleted file mode 100644
index 4ea0c9e..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/plugin.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 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
-###############################################################################
-plugin.name = RDT RSync Core
-plugin.provider = Eclipse.org
-
-RSyncServiceProvider.name = RSync Synchronization Service
-
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/plugin.xml b/rdt/org.eclipse.ptp.rdt.sync.rsync.core/plugin.xml
deleted file mode 100644
index f3b886f..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.services.core.providers">
-      <provider
-            class="org.eclipse.ptp.rdt.sync.rsync.core.RSyncServiceProvider"
-            id="org.eclipse.ptp.rdt.sync.rsync.core.RSyncServiceProvider"
-            name="%RSyncServiceProvider.name"
-            serviceId="org.eclipse.ptp.rdt.sync.core.SyncService">
-      </provider>
-   </extension>
-
-</plugin>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/src/org/eclipse/ptp/rdt/sync/rsync/core/Activator.java b/rdt/org.eclipse.ptp.rdt.sync.rsync.core/src/org/eclipse/ptp/rdt/sync/rsync/core/Activator.java
deleted file mode 100644
index a0b3ca8..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/src/org/eclipse/ptp/rdt/sync/rsync/core/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.ptp.rdt.sync.rsync.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.rdt.sync.rsync.core"; //$NON-NLS-1$
-
-	// 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.sync.rsync.core/src/org/eclipse/ptp/rdt/sync/rsync/core/RSyncServiceProvider.java b/rdt/org.eclipse.ptp.rdt.sync.rsync.core/src/org/eclipse/ptp/rdt/sync/rsync/core/RSyncServiceProvider.java
deleted file mode 100644
index 16c46e0..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.core/src/org/eclipse/ptp/rdt/sync/rsync/core/RSyncServiceProvider.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.sync.rsync.core;
-
-import java.util.EnumSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.rdt.sync.core.SyncFlag;
-import org.eclipse.ptp.rdt.sync.core.serviceproviders.ISyncServiceProvider;
-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.services.core.ServiceProvider;
-
-public class RSyncServiceProvider extends ServiceProvider implements ISyncServiceProvider {
-	public static final String ID = "org.eclipse.ptp.rdt.sync.rsync.core.RSyncServiceProvider"; //$NON-NLS-1$
-
-	private static final String RSYNC_LOCATION = "location"; //$NON-NLS-1$
-
-	private static final String RSYNC_CONNECTION_NAME = "connectionName"; //$NON-NLS-1$
-	private static final String RSYNC_SERVICES_ID = "servicesId"; //$NON-NLS-1$
-	private static final String RSYNC_PROJECT_NAME = "projectName"; //$NON-NLS-1$
-	private IProject fProject = null;
-
-	private String fLocation = null;
-	private IRemoteConnection fConnection = null;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rdt.sync.core.serviceproviders.ISyncServiceProvider#
-	 * synchronize(org.eclipse.core.resources.IResourceDelta,
-	 * org.eclipse.core.runtime.IProgressMonitor, boolean)
-	 */
-	public void synchronize(IResourceDelta delta, IProgressMonitor monitor, EnumSet<SyncFlag> syncFlags) throws CoreException {
-		switch (delta.getKind()) {
-		case IResourceDelta.ADDED:
-			System.out.println("ensureSync kind=ADDED");
-			break;
-		case IResourceDelta.REMOVED:
-			System.out.println("ensureSync kind=REMOVED");
-			break;
-		case IResourceDelta.CHANGED:
-			System.out.println("ensureSync kind=CHANGED");
-			break;
-		default:
-			System.out.println("ensureSync kind=OTHER");
-		}
-		for (IResourceDelta child : delta.getAffectedChildren()) {
-			IResource resource = child.getResource();
-			if (resource instanceof IProject) {
-				System.out.println("ensureSync project=" + child.getResource().getName());
-				synchronize(child, monitor, syncFlags);
-			} else if (resource instanceof IFolder) {
-				System.out.println("ensureSync folder=" + child.getResource().getName());
-				synchronize(child, monitor, syncFlags);
-			} else if (resource instanceof IFile) {
-				System.out.println("ensureSync file=" + child.getResource().getName());
-			}
-		}
-	}
-
-	/**
-	 * Get the remote directory that will be used for synchronization
-	 * 
-	 * @return path
-	 */
-	public String getLocation() {
-		if (fLocation == null) {
-			fLocation = getString(RSYNC_LOCATION, null);
-		}
-		return fLocation;
-	}
-
-	/**
-	 * Get the project to be synchronized
-	 * 
-	 * @return project
-	 */
-	public IProject getProject() {
-		if (fProject == null) {
-			String name = getString(RSYNC_PROJECT_NAME, null);
-			if (name != null) {
-				fProject = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
-			}
-		}
-		return fProject;
-	}
-
-	/**
-	 * Get the remote connection used for synchronization
-	 * 
-	 * @return remote connection
-	 */
-	public IRemoteConnection getRemoteConnection() {
-		if (fConnection == null) {
-			String name = getString(RSYNC_CONNECTION_NAME, null);
-			if (name != null) {
-				IRemoteServices services = getRemoteServices();
-				if (services != null) {
-					fConnection = services.getConnectionManager().getConnection(name);
-				}
-			}
-		}
-		return fConnection;
-	}
-
-	/**
-	 * Get the remote services used for the connection
-	 * 
-	 * @return remote services
-	 */
-	public IRemoteServices getRemoteServices() {
-		String id = getString(RSYNC_SERVICES_ID, null);
-		if (id != null) {
-			return PTPRemoteCorePlugin.getDefault().getRemoteServices(id);
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#isConfigured()
-	 */
-	public boolean isConfigured() {
-		return getLocation() != null && getRemoteConnection() != null && getProject() != null;
-	}
-
-	/**
-	 * Set the remote directory that will be used for synchronization
-	 * 
-	 * @param location
-	 *            directory path
-	 */
-	public void setLocation(String location) {
-		fLocation = location;
-		putString(RSYNC_LOCATION, location);
-	}
-
-	/**
-	 * Set the project that will be synchronized
-	 * 
-	 * @param project
-	 *            project to synchronize
-	 */
-	public void setProject(IProject project) {
-		fProject = project;
-		putString(RSYNC_PROJECT_NAME, project.getName());
-	}
-
-	/**
-	 * set the remote connection used for synchronization
-	 * 
-	 * @param conn
-	 *            remote connection
-	 */
-	public void setRemoteConnection(IRemoteConnection conn) {
-		fConnection = conn;
-		putString(RSYNC_CONNECTION_NAME, conn.getName());
-	}
-
-	/**
-	 * Set the remote services used for the connection
-	 * 
-	 * @param services
-	 *            remote services
-	 */
-	public void setRemoteServices(IRemoteServices services) {
-		putString(RSYNC_SERVICES_ID, services.getId());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rdt.core.serviceproviders.IRemoteExecutionServiceProvider#getConnection()
-	 */
-	public IRemoteConnection getConnection() {
-		return fConnection;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rdt.core.serviceproviders.IRemoteExecutionServiceProvider#getConfigLocation()
-	 */
-	public String getConfigLocation() {
-		return fLocation;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rdt.core.serviceproviders.IRemoteExecutionServiceProvider#setRemoteToolsConnection()
-	 */
-	public void setRemoteToolsConnection(IRemoteConnection connection) {
-		fConnection = connection;
-		putString(RSYNC_CONNECTION_NAME, connection.getName());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rdt.core.serviceproviders.IRemoteExecutionServiceProvider#setConfigLocation()
-	 */
-	public void setConfigLocation(String configLocation) {
-		fLocation = configLocation;
-		putString(RSYNC_LOCATION, configLocation);
-	}
-}
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/.classpath b/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/.classpath
deleted file mode 100644
index 5e4c1fe..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/.project b/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/.project
deleted file mode 100644
index 63e5f21..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rdt.sync.rsync.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.sync.rsync.ui/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 05d7476..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.ptp.rdt.sync.rsync.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rdt.sync.rsync.ui.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ptp.rdt.sync.core;bundle-version="1.0.0",
- org.eclipse.ptp.rdt.sync.ui;bundle-version="1.0.0",
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui,
- org.eclipse.ptp.rdt.sync.rsync.core,
- org.eclipse.ptp.services.core,
- org.eclipse.cdt.ui;bundle-version="5.3.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %plugin.provider
-Bundle-Localization: plugin
-Import-Package: org.eclipse.ptp.rdt.core.serviceproviders
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/build.properties b/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/plugin.properties b/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/plugin.properties
deleted file mode 100644
index b2409a7..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 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
-###############################################################################
-plugin.name = RDT RSync UI
-plugin.provider = Eclipse.org
-
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/plugin.xml b/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/plugin.xml
deleted file mode 100644
index c036cdb..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-<!-- the rsync provider is currently not functional - thus we don't register the participant
-   <extension
-         point="org.eclipse.ptp.rdt.sync.ui.synchronizeParticipants">
-      <synchronizeParticipant
-            class="org.eclipse.ptp.rdt.sync.rsync.ui.RSyncParticipant"
-            id="org.eclipse.ptp.rdt.sync.rsync.ui.rsyncParticipant"
-            name="Rsync">
-      </synchronizeParticipant>
-   </extension>
--->
-</plugin>
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/Activator.java b/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/Activator.java
deleted file mode 100644
index 3d9a824..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.ptp.rdt.sync.rsync.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.sync.rsync.ui"; //$NON-NLS-1$
-
-	// 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.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/RSyncParticipant.java b/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/RSyncParticipant.java
deleted file mode 100644
index 1c1dc81..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/RSyncParticipant.java
+++ /dev/null
@@ -1,653 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.sync.rsync.ui;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.cdt.internal.ui.CPluginImages;
-import org.eclipse.cdt.ui.newui.CDTPrefUtil;
-import org.eclipse.cdt.ui.newui.PageLayout;
-import org.eclipse.cdt.ui.newui.UIMessages;
-import org.eclipse.cdt.ui.wizards.CNewWizard;
-import org.eclipse.cdt.ui.wizards.CWizardHandler;
-import org.eclipse.cdt.ui.wizards.EntryDescriptor;
-import org.eclipse.cdt.ui.wizards.IWizardItemsListListener;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.osgi.util.TextProcessor;
-import org.eclipse.ptp.rdt.sync.core.serviceproviders.ISyncServiceProvider;
-import org.eclipse.ptp.rdt.sync.core.services.IRemoteSyncServiceConstants;
-import org.eclipse.ptp.rdt.sync.rsync.core.RSyncServiceProvider;
-import org.eclipse.ptp.rdt.sync.rsync.ui.messages.Messages;
-import org.eclipse.ptp.rdt.sync.ui.ISynchronizeParticipant;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.ui.IRemoteUIConnectionManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIConstants;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;
-import org.eclipse.ptp.services.core.IService;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-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.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-/**
- * Launches a dialog that configures a remote sync target with OK and Cancel
- * buttons. Also has a text field to allow the name of the configuration to be
- * changed.
- */
-public class RSyncParticipant implements ISynchronizeParticipant {
-	private static final String FILE_SCHEME = "file"; //$NON-NLS-1$
-
-	// private IServiceConfiguration fConfig;
-	private IRemoteConnection fSelectedConnection;
-	private IRemoteServices fSelectedProvider;
-	// private final IRunnableContext fContext;
-	private String fProjectName = ""; //$NON-NLS-1$
-
-	private final Map<Integer, IRemoteServices> fComboIndexToRemoteServicesProviderMap = new HashMap<Integer, IRemoteServices>();
-	private final Map<Integer, IRemoteConnection> fComboIndexToRemoteConnectionMap = new HashMap<Integer, IRemoteConnection>();
-
-	private Control fDialogControl;
-	private Point fDialogSize;
-	private Text fNameText;
-	private Button fBrowseButton;
-	private Button fNewConnectionButton;
-	private Combo fProviderCombo;
-	private Combo fConnectionCombo;
-	private Text fLocationText;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rdt.sync.ui.ISynchronizeParticipant#createConfigurationArea
-	 * (org.eclipse.swt.widgets.Composite,
-	 * org.eclipse.jface.operation.IRunnableContext)
-	 */
-	public void createConfigurationArea(Composite parent, IRunnableContext context) {
-		final Composite configArea = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		configArea.setLayout(layout);
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-		configArea.setLayoutData(gd);
-
-		// Label for "Provider:"
-		Label providerLabel = new Label(configArea, SWT.LEFT);
-		providerLabel.setText(Messages.RSyncParticipant_remoteProvider);
-
-		// combo for providers
-		fProviderCombo = new Combo(configArea, SWT.DROP_DOWN | SWT.READ_ONLY);
-		gd = new GridData(SWT.BEGINNING, SWT.BEGINNING, false, false);
-		gd.horizontalSpan = 2;
-		fProviderCombo.setLayoutData(gd);
-		fProviderCombo.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleServicesSelected();
-			}
-		});
-
-		// attempt to restore settings from saved state
-		// IRemoteServices providerSelected = fProvider.getRemoteServices();
-
-		// populate the combo with a list of providers
-		IRemoteServices[] providers = PTPRemoteUIPlugin.getDefault().getRemoteServices(context);
-		int toSelect = 0;
-
-		for (int k = 0; k < providers.length; k++) {
-			fProviderCombo.add(providers[k].getName(), k);
-			fComboIndexToRemoteServicesProviderMap.put(k, providers[k]);
-		}
-
-		// set selected host to be the first one if we're not restoring from
-		// settings
-		fProviderCombo.select(toSelect);
-		fSelectedProvider = fComboIndexToRemoteServicesProviderMap.get(toSelect);
-
-		// connection combo
-		// Label for "Connection:"
-		Label connectionLabel = new Label(configArea, SWT.LEFT);
-		connectionLabel.setText(Messages.RSyncParticipant_connection);
-
-		// combo for providers
-		fConnectionCombo = new Combo(configArea, SWT.DROP_DOWN | SWT.READ_ONLY);
-		// set layout to grab horizontal space
-		fConnectionCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		fConnectionCombo.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleConnectionSelected();
-			}
-		});
-
-		// populate the combo with a list of providers
-		populateConnectionCombo(fConnectionCombo);
-
-		// new connection button
-		fNewConnectionButton = new Button(configArea, SWT.PUSH);
-		fNewConnectionButton.setText(Messages.RSyncParticipant_new);
-		updateNewConnectionButtonEnabled(fNewConnectionButton);
-		fNewConnectionButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				IRemoteUIConnectionManager connectionManager = getUIConnectionManager();
-				if (connectionManager != null) {
-					connectionManager.newConnection(fNewConnectionButton.getShell());
-				}
-				// refresh list of connections
-				populateConnectionCombo(fConnectionCombo);
-			}
-		});
-
-		Label locationLabel = new Label(configArea, SWT.LEFT);
-		locationLabel.setText(Messages.RSyncParticipant_location);
-
-		fLocationText = new Text(configArea, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 1;
-		gd.grabExcessHorizontalSpace = true;
-		gd.widthHint = 250;
-		fLocationText.setLayoutData(gd);
-		fLocationText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				// MBSCustomPageManager.addPageProperty(REMOTE_SYNC_WIZARD_PAGE_ID,
-				// PATH_PROPERTY, fLocationText.getText());
-			}
-		});
-
-		// new connection button
-		fBrowseButton = new Button(configArea, SWT.PUSH);
-		fBrowseButton.setText(Messages.RSyncParticipant_browse);
-		fBrowseButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (fSelectedConnection != null) {
-					checkConnection();
-					if (fSelectedConnection.isOpen()) {
-						IRemoteUIServices remoteUIServices = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(fSelectedProvider);
-						if (remoteUIServices != null) {
-							IRemoteUIFileManager fileMgr = remoteUIServices.getUIFileManager();
-							if (fileMgr != null) {
-								fileMgr.setConnection(fSelectedConnection);
-								String correctPath = fLocationText.getText();
-								String selectedPath = fileMgr.browseDirectory(
-										fLocationText.getShell(),
-										"Project Location (" + fSelectedConnection.getName() + ")", correctPath, IRemoteUIConstants.NONE); //$NON-NLS-1$ //$NON-NLS-2$
-								if (selectedPath != null) {
-									fLocationText.setText(selectedPath);
-								}
-							}
-						}
-					}
-				}
-			}
-		});
-
-		createDynamicGroup(configArea);
-		// switchTo(updateData(tree, right, show_sup, RemoteMainWizardPage.this,
-		// getWizard()), getDescriptor(tree));
-	}
-
-	private Tree tree;
-	private Composite right;
-	private Button show_sup;
-	private Label right_label;
-	public CWizardHandler h_selected = null;
-	private Label categorySelectedLabel;
-	public static final String DESC = "EntryDescriptor"; //$NON-NLS-1$ 
-	private static final Image IMG_CATEGORY = CPluginImages.get(CPluginImages.IMG_OBJS_SEARCHFOLDER);
-	private static final Image IMG_ITEM = CPluginImages.get(CPluginImages.IMG_OBJS_VARIABLE);
-	private static final String EXTENSION_POINT_ID = "org.eclipse.cdt.ui.CDTWizard"; //$NON-NLS-1$
-	private static final String ELEMENT_NAME = "wizard"; //$NON-NLS-1$
-	private static final String CLASS_NAME = "class"; //$NON-NLS-1$
-
-	private void createDynamicGroup(Composite parent) {
-		Composite c = new Composite(parent, SWT.NONE);
-		c.setLayoutData(new GridData(GridData.FILL_BOTH));
-		c.setLayout(new GridLayout(2, true));
-
-		Label l1 = new Label(c, SWT.NONE);
-		l1.setText("Project type:");
-		l1.setFont(parent.getFont());
-		l1.setLayoutData(new GridData(GridData.BEGINNING));
-
-		right_label = new Label(c, SWT.NONE);
-		right_label.setFont(parent.getFont());
-		right_label.setLayoutData(new GridData(GridData.BEGINNING));
-
-		tree = new Tree(c, SWT.SINGLE | SWT.BORDER);
-		tree.setLayoutData(new GridData(GridData.FILL_BOTH));
-		tree.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				TreeItem[] tis = tree.getSelection();
-				if (tis == null || tis.length == 0) {
-					return;
-				}
-				switchTo((CWizardHandler) tis[0].getData(), (EntryDescriptor) tis[0].getData(DESC));
-				// setPageComplete(validatePage());
-			}
-		});
-		tree.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			@Override
-			public void getName(AccessibleEvent e) {
-				for (int i = 0; i < tree.getItemCount(); i++) {
-					if (tree.getItem(i).getText().compareTo(e.result) == 0) {
-						return;
-					}
-				}
-				e.result = "Project type:";
-			}
-		});
-		right = new Composite(c, SWT.NONE);
-		right.setLayoutData(new GridData(GridData.FILL_BOTH));
-		right.setLayout(new PageLayout());
-
-		show_sup = new Button(c, SWT.CHECK);
-		show_sup.setText(UIMessages.getString("CMainWizardPage.1")); //$NON-NLS-1$
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		show_sup.setLayoutData(gd);
-		show_sup.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (h_selected != null) {
-					h_selected.setSupportedOnly(show_sup.getSelection());
-				}
-				// switchTo(updateData(tree, right, show_sup,
-				// RemoteMainWizardPage.this, getWizard()),
-				// getDescriptor(tree));
-			}
-		});
-
-		// restore settings from preferences
-		show_sup.setSelection(!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOSUPP));
-	}
-
-	private void switchTo(CWizardHandler h, EntryDescriptor ed) {
-		if (h == null) {
-			h = ed.getHandler();
-		}
-		if (ed.isCategory()) {
-			h = null;
-		}
-		try {
-			if (h != null) {
-				h.initialize(ed);
-			}
-		} catch (CoreException e) {
-			h = null;
-		}
-		if (h_selected != null) {
-			h_selected.handleUnSelection();
-		}
-		h_selected = h;
-		if (h == null) {
-			if (ed.isCategory()) {
-				if (categorySelectedLabel == null) {
-					categorySelectedLabel = new Label(right, SWT.WRAP);
-					categorySelectedLabel
-							.setText("Project category is selected. Expand the category and select a concrete project type.");
-					right.layout();
-				}
-				categorySelectedLabel.setVisible(true);
-			}
-			return;
-		}
-		right_label.setText(h_selected.getHeader());
-		if (categorySelectedLabel != null) {
-			categorySelectedLabel.setVisible(false);
-		}
-		h_selected.handleSelection();
-		h_selected.setSupportedOnly(show_sup.getSelection());
-	}
-
-	public static CWizardHandler updateData(Tree tree, Composite right, Button show_sup, IWizardItemsListListener ls, IWizard wizard) {
-		// remember selected item
-		TreeItem[] sel = tree.getSelection();
-		String savedStr = (sel.length > 0) ? sel[0].getText() : null;
-
-		tree.removeAll();
-		IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT_ID);
-		if (extensionPoint == null) {
-			return null;
-		}
-		IExtension[] extensions = extensionPoint.getExtensions();
-		if (extensions == null) {
-			return null;
-		}
-
-		List<EntryDescriptor> items = new ArrayList<EntryDescriptor>();
-		for (int i = 0; i < extensions.length; ++i) {
-			IConfigurationElement[] elements = extensions[i].getConfigurationElements();
-			for (IConfigurationElement element : elements) {
-				if (element.getName().equals(ELEMENT_NAME)) {
-					CNewWizard w = null;
-					try {
-						w = (CNewWizard) element.createExecutableExtension(CLASS_NAME);
-					} catch (CoreException e) {
-						System.out.println(UIMessages.getString("CMainWizardPage.5") + e.getLocalizedMessage()); //$NON-NLS-1$
-						return null;
-					}
-					if (w == null) {
-						return null;
-					}
-					w.setDependentControl(right, ls);
-					for (EntryDescriptor ed : w.createItems(show_sup.getSelection(), wizard)) {
-						items.add(ed);
-					}
-				}
-			}
-		}
-		// If there is a EntryDescriptor which is default for category, make
-		// sure it
-		// is in the front of the list.
-		for (int i = 0; i < items.size(); ++i) {
-			EntryDescriptor ed = items.get(i);
-			if (ed.isDefaultForCategory()) {
-				items.remove(i);
-				items.add(0, ed);
-				break;
-			}
-		}
-
-		// bug # 211935 : allow items filtering.
-		if (ls != null) {
-			items = ls.filterItems(items);
-		}
-		addItemsToTree(tree, items);
-
-		if (tree.getItemCount() > 0) {
-			TreeItem target = null;
-			// try to search item which was selected before
-			if (savedStr != null) {
-				TreeItem[] all = tree.getItems();
-				for (TreeItem element : all) {
-					if (savedStr.equals(element.getText())) {
-						target = element;
-						break;
-					}
-				}
-			}
-			if (target == null) {
-				target = tree.getItem(0);
-				if (target.getItemCount() != 0) {
-					target = target.getItem(0);
-				}
-			}
-			tree.setSelection(target);
-			return (CWizardHandler) target.getData();
-		}
-		return null;
-	}
-
-	private static void addItemsToTree(Tree tree, List<EntryDescriptor> items) {
-		// Sorting is disabled because of users requests
-		// Collections.sort(items, CDTListComparator.getInstance());
-
-		ArrayList<TreeItem> placedTreeItemsList = new ArrayList<TreeItem>(items.size());
-		ArrayList<EntryDescriptor> placedEntryDescriptorsList = new ArrayList<EntryDescriptor>(items.size());
-		for (EntryDescriptor wd : items) {
-			if (wd.getParentId() == null) {
-				wd.setPath(wd.getId());
-				TreeItem ti = new TreeItem(tree, SWT.NONE);
-				ti.setText(TextProcessor.process(wd.getName()));
-				ti.setData(wd.getHandler());
-				ti.setData(DESC, wd);
-				ti.setImage(calcImage(wd));
-				placedTreeItemsList.add(ti);
-				placedEntryDescriptorsList.add(wd);
-			}
-		}
-		while (true) {
-			boolean found = false;
-			Iterator<EntryDescriptor> it2 = items.iterator();
-			while (it2.hasNext()) {
-				EntryDescriptor wd1 = it2.next();
-				if (wd1.getParentId() == null) {
-					continue;
-				}
-				for (int i = 0; i < placedEntryDescriptorsList.size(); i++) {
-					EntryDescriptor wd2 = placedEntryDescriptorsList.get(i);
-					if (wd2.getId().equals(wd1.getParentId())) {
-						found = true;
-						wd1.setParentId(null);
-						CWizardHandler h = wd2.getHandler();
-						/*
-						 * If neither wd1 itself, nor its parent (wd2) have a
-						 * handler associated with them, and the item is not a
-						 * category, then skip it. If it's category, then it's
-						 * possible that children will have a handler associated
-						 * with them.
-						 */
-						if (h == null && wd1.getHandler() == null && !wd1.isCategory()) {
-							break;
-						}
-
-						wd1.setPath(wd2.getPath() + "/" + wd1.getId()); //$NON-NLS-1$
-						wd1.setParent(wd2);
-						if (h != null) {
-							if (wd1.getHandler() == null && !wd1.isCategory()) {
-								wd1.setHandler((CWizardHandler) h.clone());
-							}
-							if (!h.isApplicable(wd1)) {
-								break;
-							}
-						}
-
-						TreeItem p = placedTreeItemsList.get(i);
-						TreeItem ti = new TreeItem(p, SWT.NONE);
-						ti.setText(wd1.getName());
-						ti.setData(wd1.getHandler());
-						ti.setData(DESC, wd1);
-						ti.setImage(calcImage(wd1));
-						placedTreeItemsList.add(ti);
-						placedEntryDescriptorsList.add(wd1);
-						break;
-					}
-				}
-			}
-			// repeat iterations until all items are placed.
-			if (!found) {
-				break;
-			}
-		}
-		// orphan elements (with not-existing parentId) are ignored
-	}
-
-	private static Image calcImage(EntryDescriptor ed) {
-		if (ed.getImage() != null) {
-			return ed.getImage();
-		}
-		if (ed.isCategory()) {
-			return IMG_CATEGORY;
-		}
-		return IMG_ITEM;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rdt.sync.ui.ISynchronizeParticipant#getProvider(org.eclipse
-	 * .core.resources.IProject)
-	 */
-	public ISyncServiceProvider getProvider(IProject project) {
-		ServiceModelManager smm = ServiceModelManager.getInstance();
-		IService syncService = smm.getService(IRemoteSyncServiceConstants.SERVICE_SYNC);
-		RSyncServiceProvider provider = (RSyncServiceProvider) smm.getServiceProvider(syncService
-				.getProviderDescriptor(RSyncServiceProvider.ID));
-		provider.setLocation(fLocationText.getText());
-		provider.setRemoteConnection(fSelectedConnection);
-		provider.setRemoteServices(fSelectedProvider);
-		provider.setProject(project);
-		return provider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rdt.sync.ui.ISynchronizeParticipant#isConfigComplete()
-	 */
-	public boolean isConfigComplete() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/**
-	 * Attempt to open a connection.
-	 */
-	private void checkConnection() {
-		IRemoteUIConnectionManager mgr = getUIConnectionManager();
-		if (mgr != null) {
-			mgr.openConnectionWithProgress(fConnectionCombo.getShell(), null, fSelectedConnection);
-		}
-	}
-
-	/**
-	 * Return the path we are going to display. If it is a file URI then remove
-	 * the file prefix.
-	 * 
-	 * Only do this if the connection is open. Otherwise we will attempt to
-	 * connect to the first machine in the list, which is annoying.
-	 * 
-	 * @return String
-	 */
-	private String getDefaultPathDisplayString() {
-		String projectName = ""; //$NON-NLS-1$
-		// IWizardPage page = getWizard().getStartingPage();
-		// if (page instanceof CDTMainWizardPage) {
-		// projectName = ((CDTMainWizardPage) page).getProjectName();
-		// }
-		if (fSelectedConnection != null && fSelectedConnection.isOpen()) {
-			IRemoteFileManager fileMgr = fSelectedProvider.getFileManager(fSelectedConnection);
-			URI defaultURI = fileMgr.toURI(fSelectedConnection.getWorkingDirectory());
-
-			// Handle files specially. Assume a file if there is no project to
-			// query
-			if (defaultURI != null && defaultURI.getScheme().equals(FILE_SCHEME)) {
-				return Platform.getLocation().append(fProjectName).toOSString();
-			}
-			if (defaultURI == null) {
-				return ""; //$NON-NLS-1$
-			}
-			return new Path(defaultURI.getPath()).append(fProjectName).toOSString();
-		}
-		return ""; //$NON-NLS-1$
-	}
-	
-	/** 
-	 * @see ISynchronizeParticipant#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		return null;
-	}
-
-	/**
-	 * @return
-	 */
-	private IRemoteUIConnectionManager getUIConnectionManager() {
-		IRemoteUIConnectionManager connectionManager = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(fSelectedProvider)
-				.getUIConnectionManager();
-		return connectionManager;
-	}
-
-	/**
-	 * Handle new connection selected
-	 */
-	private void handleConnectionSelected() {
-		int selectionIndex = fConnectionCombo.getSelectionIndex();
-		fSelectedConnection = fComboIndexToRemoteConnectionMap.get(selectionIndex);
-		updateNewConnectionButtonEnabled(fNewConnectionButton);
-		fLocationText.setText(getDefaultPathDisplayString());
-	}
-
-	/**
-	 * Handle new remote services selected
-	 */
-	private void handleServicesSelected() {
-		int selectionIndex = fProviderCombo.getSelectionIndex();
-		fSelectedProvider = fComboIndexToRemoteServicesProviderMap.get(selectionIndex);
-		populateConnectionCombo(fConnectionCombo);
-		updateNewConnectionButtonEnabled(fNewConnectionButton);
-		handleConnectionSelected();
-	}
-
-	/**
-	 * @param connectionCombo
-	 */
-	private void populateConnectionCombo(final Combo connectionCombo) {
-		connectionCombo.removeAll();
-
-		IRemoteConnection[] connections = fSelectedProvider.getConnectionManager().getConnections();
-
-		for (int k = 0; k < connections.length; k++) {
-			connectionCombo.add(connections[k].getName(), k);
-			fComboIndexToRemoteConnectionMap.put(k, connections[k]);
-		}
-
-		connectionCombo.select(0);
-		fSelectedConnection = fComboIndexToRemoteConnectionMap.get(0);
-	}
-
-	/**
-	 * @param button
-	 */
-	private void updateNewConnectionButtonEnabled(Button button) {
-		IRemoteUIConnectionManager connectionManager = getUIConnectionManager();
-		button.setEnabled(connectionManager != null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rdt.sync.ui.ISynchronizeParticipant#setProjectName(String projectName)
-	 */
-	public void setProjectName(String projectName) {
-		fProjectName = projectName;
-		fLocationText.setText(getDefaultPathDisplayString());
-	}
-}
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/messages/Messages.java b/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/messages/Messages.java
deleted file mode 100644
index f0a3467..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/messages/Messages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.sync.rsync.ui.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rdt.sync.rsync.ui.messages.messages"; //$NON-NLS-1$
-	public static String RSyncParticipant_browse;
-	public static String RSyncParticipant_connection;
-	public static String RSyncParticipant_location;
-	public static String RSyncParticipant_new;
-	public static String RSyncParticipant_remoteProvider;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/messages/messages.properties b/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/messages/messages.properties
deleted file mode 100644
index 219e52a..0000000
--- a/rdt/org.eclipse.ptp.rdt.sync.rsync.ui/src/org/eclipse/ptp/rdt/sync/rsync/ui/messages/messages.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-RSyncParticipant_browse=Browse...
-RSyncParticipant_connection=Connection:
-RSyncParticipant_location=Location:
-RSyncParticipant_new=New...
-RSyncParticipant_remoteProvider=Remote Provider:
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath b/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath
deleted file mode 100644
index 3aaeea8..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="src" path="suite"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.project b/rdt/org.eclipse.ptp.rdt.ui.tests/.project
deleted file mode 100644
index f21926c..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rdt.ui.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs b/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f9482f2..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Nov 19 13:50:59 EST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF b/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index d75a279..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests Plug-in
-Bundle-SymbolicName: org.eclipse.ptp.rdt.ui.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ptp.rdt.core;bundle-version="1.0.0",
- org.eclipse.ptp.rdt.core.tests;bundle-version="1.0.0",
- org.eclipse.ptp.rdt.ui;bundle-version="1.0.0",
- org.eclipse.cdt.ui.tests;bundle-version="5.0.2",
- org.eclipse.cdt.ui;bundle-version="5.0.2",
- org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.cdt.core;bundle-version="5.0.2",
- org.eclipse.cdt.core.tests;bundle-version="5.0.1",
- org.junit;bundle-version="3.8.2",
- org.eclipse.ui;bundle-version="3.4.0",
- org.eclipse.core.resources;bundle-version="3.4.0",
- org.eclipse.jface.text;bundle-version="3.4.0",
- org.eclipse.ui.editors;bundle-version="3.4.0",
- org.eclipse.ptp.services.core;bundle-version="1.0.0"
-Export-Package: org.eclipse.ptp.rdt.ui.tests.navigation,
- org.eclipse.ptp.rdt.ui.tests.suite
-Bundle-Activator: org.eclipse.ptp.rdt.ui.tests.RDTUITestPlugin
-Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.ui.part
diff --git a/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties b/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties
deleted file mode 100644
index e98e699..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2010 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.. = 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 cb40be5..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/suite/org/eclipse/ptp/rdt/ui/tests/RDTUITestPlugin.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 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;
-
-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 9682617..0000000
--- a/rdt/org.eclipse.ptp.rdt.ui.tests/test/org/eclipse/ptp/rdt/ui/tests/navigation/NavigationTests.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2010 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.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.testplugin.EditorTestHelper;
-import org.eclipse.cdt.ui.tests.text.selection.CPPSelectionTestsAnyIndexer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ptp.internal.rdt.core.index.RemoteFastIndexer;
-import org.eclipse.ptp.internal.rdt.ui.search.actions.OpenDeclarationsAction;
-import org.eclipse.ptp.rdt.core.tests.ConnectionManager;
-import org.eclipse.ptp.rdt.core.tests.RemoteTestProject;
-import org.eclipse.ptp.services.core.ServiceModelManager;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
-
-
-@SuppressWarnings("restriction")
-
-public class NavigationTests extends CPPSelectionTestsAnyIndexer {
-
-	private static final int MAX_WAIT_TIME = 120000;
-
-	/* I think a lot of the tests that fail do so because of two reasons:
-	 * - Headers are not being skipped as they should be, 
-	 *  
-	 */
-	private static final String[] TESTS_TO_RUN = {
-		"testBug93281",
-		"testBug207320",
-		"testTemplateClassMethod_207320",
-		//"testBasicDefinition", // FAIL cannot reproduce failure
-		"testBasicTemplateInstance_207320",
-		"testBug86829A",
-		//"testCPPSpecDeclsDefs", // FAIL cannot reproduce failure
-		"testBug168533",
-		"testBug95225",
-		//"testBug95202", // FAIL, should not fail when headers are skipped properly
-		"testBug101287",
-		"testBug102258",
-		"testBug103323",
-		"testBug78354",
-		//"testBug103697", // FAIL trying to use local path which fails
-		//"testBug108202", // FAIL
-		//"testCNavigationInCppProject_bug183973", // FAIL
-		//"testFuncWithTypedefForAnonymousStruct_190730", // FAIL
-		//"testFuncWithTypedefForAnonymousEnum_190730", // FAIL
-		"testMacroNavigation",
-		"testMacroNavigation_Bug208300",
-		"testIncludeNavigation",
-		//"testNavigationCppCallsC", // FAIL
-		//"testNavigationCCallsCpp", // FAIL
-		"testNavigationInDefinedExpression_215906",
-	};
-	
-	public static Test suite() {
-		//return suite(NavigationTests.class);
-		TestSuite suite = new TestSuite();
-		for(String testName : TESTS_TO_RUN)
-			suite.addTest(new NavigationTests(testName));
-		return suite;
-	}
-	
-	
-	private static final String PROJECT_NAME = "navigation_test_project";
-	
-	@Override
-	protected String getEditorID() {
-		return "org.eclipse.ptp.rdt.ui.editor.CEditor";
-	}
-
-	@Override
-	protected void waitUntilFileIsIndexed(IIndex index, IFile file, int maxmillis) throws Exception {
-		Thread.sleep(10000);
-        CCorePlugin.getIndexManager().joinIndexer(MAX_WAIT_TIME, new NullProgressMonitor());
-	}
-
-	public NavigationTests(String name) {
-		super(name, RemoteFastIndexer.ID);
-	}
-	
-	@Override
-	protected IASTNode testF3(IFile file, int offset, int length) throws ParserException, CoreException {
-		if (offset < 0)
-			throw new ParserException("offset can not be less than 0 and was " + offset); //$NON-NLS-1$
-		
-        IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-        IEditorPart part = null;
-        try {
-            part = page.openEditor(new FileEditorInput(file), getEditorID(), true); //$NON-NLS-1$
-        } catch (PartInitException e) {
-            assertFalse(true);
-        }
-        
-        if (part instanceof CEditor) {
-        	CEditor editor= (CEditor) part;
-    		EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 100, 500, 10);
-            ((AbstractTextEditor)part).getSelectionProvider().setSelection(new TextSelection(offset,length));
-            
-            final OpenDeclarationsAction action = (OpenDeclarationsAction) editor.getAction("OpenDeclarations"); //$NON-NLS-1$
-            action.runSync();
-			
-        	// update the file/part to point to the newly opened IFile/IEditorPart
-            part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); 
-            assertTrue (part instanceof CEditor);
-            editor= (CEditor) part;
-    		EditorTestHelper.joinReconciler(EditorTestHelper.getSourceViewer(editor), 100, 500, 10);
-
-    		// the action above should highlight the declaration, so now retrieve it and use that selection to get the IASTName selected on the TU
-            ISelection sel= editor.getSelectionProvider().getSelection();
-            
-            final IASTName[] result= {null};
-            if (sel instanceof ITextSelection) {
-            	final ITextSelection textSel = (ITextSelection)sel;
-            	ITranslationUnit tu = (ITranslationUnit)editor.getInputCElement();
-        		IStatus ok= ASTProvider.getASTProvider().runOnAST(tu, ASTProvider.WAIT_IF_OPEN, new NullProgressMonitor(), new ASTRunnable() {
-        			public IStatus runOnAST(ILanguage language, IASTTranslationUnit ast) throws CoreException {
-        				result[0]= ast.getNodeSelector(null).findName(textSel.getOffset(), textSel.getLength());
-        				return Status.OK_STATUS;
-        			}
-        		});
-        		assertTrue(ok.isOK());
-				return result[0];
-            }
-        }
-        
-        return null;
-    }
-	
-
-	protected void setUp() throws Exception {
-		//super.setUp();
-		
-		IWorkbenchPage page= PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		IViewReference[] refs= page.getViewReferences();
-		for (int i = 0; i < refs.length; i++) {
-			IViewReference viewReference = refs[i];
-			page.setPartState(viewReference, IWorkbenchPage.STATE_RESTORED);
-		}
-		
-		URI projectRootURI = ConnectionManager.getInstance().getWorkspaceURI(PROJECT_NAME);
-		RemoteTestProject remoteProject = new RemoteTestProject(PROJECT_NAME, projectRootURI);
-		
-		ConnectionManager.getInstance().resetServiceModel(remoteProject.getName());
-		ServiceModelManager.getInstance().printServiceModel();
-		
-		fCProject = remoteProject.getCProject();
-	
-		CCorePlugin.getIndexManager().setIndexerId(fCProject, RemoteFastIndexer.ID);
-	}
-	
-	
-	protected void tearDown() throws Exception {
-		super.tearDown(); 
-	}
-
-}
diff --git a/releng/.cvsignore b/releng/.cvsignore
deleted file mode 100644
index 3a4edf6..0000000
--- a/releng/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.project
diff --git a/releng/org.eclipse.ptp.pldt.fortran-feature/.project b/releng/org.eclipse.ptp.pldt.fortran-feature/.project
deleted file mode 100644
index ad5c943..0000000
--- a/releng/org.eclipse.ptp.pldt.fortran-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.fortran-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.fortran-feature/build.properties b/releng/org.eclipse.ptp.pldt.fortran-feature/build.properties
deleted file mode 100644
index b3a611b..0000000
--- a/releng/org.eclipse.ptp.pldt.fortran-feature/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/releng/org.eclipse.ptp.pldt.fortran-feature/feature.properties b/releng/org.eclipse.ptp.pldt.fortran-feature/feature.properties
deleted file mode 100644
index 97a41ce..0000000
--- a/releng/org.eclipse.ptp.pldt.fortran-feature/feature.properties
+++ /dev/null
@@ -1,27 +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 Fortran Support
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse PTP
-
-# "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 for Fortran.
-
-# 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\
diff --git a/releng/org.eclipse.ptp.pldt.fortran-feature/feature.xml b/releng/org.eclipse.ptp.pldt.fortran-feature/feature.xml
deleted file mode 100644
index 4a51cf0..0000000
--- a/releng/org.eclipse.ptp.pldt.fortran-feature/feature.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.pldt.fortran"
-      label="%featureName"
-      version="6.0.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.ptp.pldt.common"
-      license-feature="org.eclipse.ptp.license"
-      license-feature-version="1.0.0.qualifier">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license>
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/updates/indigo"/>
-   </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.ptp.pldt.common"/>
-      <import plugin="org.eclipse.photran.cdtinterface" version="7.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.photran.core.vpg" version="7.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.mpi.fortran"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.pldt.openmp.fortran"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.pldt.fortran-feature/pom.xml b/releng/org.eclipse.ptp.pldt.fortran-feature/pom.xml
deleted file mode 100644
index b470234..0000000
--- a/releng/org.eclipse.ptp.pldt.fortran-feature/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse.ptp</groupId>
-    <artifactId>ptp-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.ptp.pldt.fortran</artifactId>
-  <version>6.0.0-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-  <groupId>org.eclipse.ptp.features</groupId>
-</project>
diff --git a/releng/org.eclipse.ptp.rdt.sdk-feature/.project b/releng/org.eclipse.ptp.rdt.sdk-feature/.project
deleted file mode 100644
index 2bc8ae3..0000000
--- a/releng/org.eclipse.ptp.rdt.sdk-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rdt.sdk-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.rdt.sdk-feature/build.properties b/releng/org.eclipse.ptp.rdt.sdk-feature/build.properties
deleted file mode 100644
index 19b89d1..0000000
--- a/releng/org.eclipse.ptp.rdt.sdk-feature/build.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 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
-###############################################################################
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
-
-generate.feature@org.eclipse.ptp.rdt.source=org.eclipse.ptp.rdt,\
-  exclude@org.eclipse.ptp.rdt.doc.user
diff --git a/releng/org.eclipse.ptp.rdt.sdk-feature/epl-v10.html b/releng/org.eclipse.ptp.rdt.sdk-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rdt.sdk-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rdt.sdk-feature/feature.properties b/releng/org.eclipse.ptp.rdt.sdk-feature/feature.properties
deleted file mode 100644
index 10a5104..0000000
--- a/releng/org.eclipse.ptp.rdt.sdk-feature/feature.properties
+++ /dev/null
@@ -1,162 +0,0 @@
-#################################################################################
-# Copyright (c) 2010 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - Initial Implementation
-#
-#################################################################################
-
-# "featureName" property - name of the feature
-featureName=PTP Remote Development Tools SDK
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=PTP components for supporting Remote Development Tools SDK
-
-# copyright
-copyright=\
-Copyright (c) 2008, 2010 IBM Corporation.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\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\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 Foundation source code\n\
-repository ("Repository") in software 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(TM) 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\
-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\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update 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" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - 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\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\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, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rdt.sdk-feature/feature.xml b/releng/org.eclipse.ptp.rdt.sdk-feature/feature.xml
deleted file mode 100644
index a2d7448..0000000
--- a/releng/org.eclipse.ptp.rdt.sdk-feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rdt.sdk"
-      label="%featureName"
-      version="4.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/galileo"/>
-   </url>
-
-   <includes
-         id="org.eclipse.ptp.rdt.source"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.ptp.rdt"/>
-   </requires>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rdt.sdk-feature/license.html b/releng/org.eclipse.ptp.rdt.sdk-feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/releng/org.eclipse.ptp.rdt.sdk-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>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>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<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>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg b/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/epl-v10.html b/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/feature.properties b/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index cf23664..0000000
--- a/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,162 +0,0 @@
-#################################################################################
-# Copyright (c) 2010 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - Initial Implementation
-#
-#################################################################################
-
-# "featureName" property - name of the feature
-featureName=PTP Remote Development Tools source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=PTP components for supporting Remote Development Tools source code
-
-# copyright
-copyright=\
-Copyright (c) 2008 IBM Corporation.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\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\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 Foundation source code\n\
-repository ("Repository") in software 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(TM) 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\
-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\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update 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" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - 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\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\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, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/license.html b/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/releng/org.eclipse.ptp.rdt.sdk-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>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>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<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>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/.project b/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/.project
deleted file mode 100644
index bb70207..0000000
--- a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rdt.xlc.sdk-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.rdt.xlc.sdk-feature/build.properties b/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/build.properties
deleted file mode 100644
index 41852f1..0000000
--- a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 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
-###############################################################################
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
-
-generate.feature@org.eclipse.ptp.rdt.xlc.source=org.eclipse.ptp.rdt.xlc
diff --git a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/epl-v10.html b/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/feature.properties b/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/feature.properties
deleted file mode 100644
index 36ce45f..0000000
--- a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/feature.properties
+++ /dev/null
@@ -1,162 +0,0 @@
-#################################################################################
-# Copyright (c) 2010 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - Initial Implementation
-#
-#################################################################################
-
-# "featureName" property - name of the feature
-featureName=PTP Remote Development Tools XL C/C++ Compiler Support SDK
-
-# "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=Remote support for the IBM XL C/C++ compilers (SDK).
-
-# copyright
-copyright=\
-Copyright (c) 2008, 2010 IBM Corporation.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\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\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 Foundation source code\n\
-repository ("Repository") in software 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(TM) 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\
-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\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update 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" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - 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\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\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, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/feature.xml b/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/feature.xml
deleted file mode 100644
index 6728c27..0000000
--- a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/feature.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rdt.xlc.sdk"
-      label="%featureName"
-      version="4.0.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/tools/ptp/releases/galileo"/>
-   </url>
-
-   <includes
-         id="org.eclipse.ptp.rdt.xlc.source"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.ptp.rdt.xlc"/>
-   </requires>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/license.html b/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>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>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<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>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg b/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/epl-v10.html b/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/feature.properties b/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 0ae2960..0000000
--- a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,162 +0,0 @@
-#################################################################################
-# Copyright (c) 2010 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - Initial Implementation
-#
-#################################################################################
-
-# "featureName" property - name of the feature
-featureName=PTP Remote Development Tools XL C/C++ Compiler Support Source
-
-# "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=Remote support for the IBM XL C/C++ compilers (SDK) source code.
-
-# copyright
-copyright=\
-Copyright (c) 2008 IBM Corporation.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\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\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this 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 Foundation source code\n\
-repository ("Repository") in software 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(TM) 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\
-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\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update 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" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your 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\
-       - 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\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\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, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/license.html b/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/license.html
deleted file mode 100644
index c184ca3..0000000
--- a/releng/org.eclipse.ptp.rdt.xlc.sdk-feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
-   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-       <li>The top-level (root) directory</li>
-       <li>Plug-in and Fragment directories</li>
-       <li>Inside Plug-ins and Fragments packaged as JARs</li>
-       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-       <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-       <li>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>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
-   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
-   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
-   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
-       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-   (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
-   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
-   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
-   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
-       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
-       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
-       product.</li>
-       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
-       accessed and copied to the Target Machine.</li>
-       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
-       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
-       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
-       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
-       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<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>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</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/addDownloadStats.xsl b/releng/org.eclipse.ptp.releng/addDownloadStats.xsl
deleted file mode 100644
index 8381dc1..0000000
--- a/releng/org.eclipse.ptp.releng/addDownloadStats.xsl
+++ /dev/null
@@ -1,57 +0,0 @@
-<!--

-Copyright (c) 2010 Mia-Software

-All rights reserved. This program and the accompanying materials

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

-which accompanies this distribution, and is available at

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

-

-Contributors:

-Gregoire Dupe

--->

-<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform'

-	version="1.0">

-	<xsl:output encoding="UTF-8" method="xml" indent="yes" />

-	<xsl:strip-space elements="*" />

-

-	<xsl:template match="/">

-		<xsl:processing-instruction name="artifactRepository">version='1.1.0'</xsl:processing-instruction>

-

-		<xsl:apply-templates />

-	</xsl:template>

-

-	<xsl:template match="repository/properties">

-		<properties size='{@size+1}'>

-			<xsl:copy-of select="property" />

-			<property name='p2.statsURI' value='http://download.eclipse.org/stats/ptp' />

-		</properties>

-	</xsl:template>

-

-	<xsl:template match="artifact[@classifier='org.eclipse.update.feature' and @id='org.eclipse.ptp.core']/properties">

-		<xsl:call-template name="artifact_properties"/>

-	</xsl:template>

-	

-	<xsl:template match="artifact[@classifier='org.eclipse.update.feature' and @id='org.eclipse.ptp.rdt']/properties">

-		<xsl:call-template name="artifact_properties"/>

-	</xsl:template>

-

-	<xsl:template match="artifact[@classifier='org.eclipse.update.feature' and @id='org.eclipse.photran']/properties">

-		<xsl:call-template name="artifact_properties"/>

-	</xsl:template>

- 

- 	<xsl:template name="artifact_properties">

- 		<properties size='{@size+1}'>

-			<xsl:copy-of select="property" />

-			<property name='download.stats' value='{../@id}_{substring(../@version, 1, string-length(../@version)-15)}' />

-		</properties>

-	</xsl:template>

-

-	<xsl:template match="*">

-		<xsl:copy>

-			<xsl:for-each select="@*">

-				<xsl:copy-of select="." />

-			</xsl:for-each>

-			<xsl:apply-templates />

-		</xsl:copy>

-	</xsl:template>

-

-</xsl:stylesheet>

diff --git a/releng/org.eclipse.ptp.releng/build.sh b/releng/org.eclipse.ptp.releng/build.sh
deleted file mode 100644
index 40ec39e..0000000
--- a/releng/org.eclipse.ptp.releng/build.sh
+++ /dev/null
@@ -1,35 +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
-JVM_1_5=/shared/common/jdk-1.5.0_16
-export PATH=$JVM_1_5/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 /cvsroot/eclipse checkout -r v20110223 org.eclipse.releng.basebuilder
-cd ..
-
-# Let's go!
-java -jar tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar \
-	-Djvm1.5=$JVM_1_5/bin/java \
-	-ws gtk -arch x86_64 -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 8d3bfb1..0000000
--- a/releng/org.eclipse.ptp.releng/build.xml
+++ /dev/null
@@ -1,1127 +0,0 @@
-<project name="PTP" default="nightly">
-	<target name="hi">
-		<echo message="${eclipse.home}"/>
-	</target>
-	
-	<target name="build" depends="zips,p2,test"/>
-	<target name="nightly" depends="tag,zips,sign,p2,test,copy,update,check"/>
-	<target name="testbuild" depends="zips,test,copy"/>
-	<target name="buildcopy" depends="zips,copy"/>
-	
-	<target name="init">
-		<touch file="${user.home}/.cvspass" />
-		<tstamp/>
-		<!-- Update for new simultaneous release -->
-		<property name="eclipseRelease" value="juno"/>
-		<!-- Update for new PTP branch -->
-		<property name="ptpBranchVersion" value="6.0.0"/>
-		<property name="photranBranchVersion" value="8.0.0"/>
-		<!-- The following properties need to be updated to reflect the version we are building against. -->
-		<!-- NOTE: changing any of these will require corresponding changes in org.eclipse.ptp.rdt.core.remotejars/build.xml -->
-		<!-- Update for new Eclipse version -->
-		<property name="eclipseDist" value="/home/data/httpd/download.eclipse.org/eclipse/downloads/drops/S-3.7RC4-201106030909/eclipse-SDK-3.7RC4-linux-gtk.tar.gz"/>
-		<!-- Update for new CDT version -->
-		<property name="cdtDist" value="/home/data/httpd/download.eclipse.org/tools/cdt/builds/8.0.0/I.I201106081058/cdt-master-8.0.0-I201106081058.zip"/>
-		<!-- Update for new RSE version -->
-		<property name="rseDist" value="/home/data/httpd/download.eclipse.org/tm/downloads/drops/R-3.3-201106080935/RSE-SDK-3.3.zip"/>
-		<!-- Update for new jgit version -->
-		<property name="jgitDist" value="/home/data/httpd/download.eclipse.org/egit/staging/v1.0.0.201106090707-r/plugins/org.eclipse.jgit_1.0.0.201106090707-r.jar"/>
-		<!-- Properties below here shouldn't need to be changed -->
-		<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
-		<property name="buildType" value="I" />
-		<property name="buildId" value="${buildType}${timestamp}"/>
-		<property name="forceContextQualifier" value="${timestamp}"/>
-		<property name="buildingOSGi" value="true"/>
-		<property name="buildDirectory" value="${basedir}/results"/>
-		<property name="buildsDir" value="/home/data/httpd/download.eclipse.org/tools/ptp/builds/${ptpBranchVersion}"/>
-		<property name="copyToDir" value="${buildsDir}/${buildType}.${buildId}"/>
-		<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="zipsdir" value="${buildDirectory}/${buildType}.${buildId}"/>
-		<property name="masterFile" value="ptp-master-${ptpBranchVersion}-${buildId}.zip"/>
-		<property name="masterFeature" value="org.eclipse.ptp.master_${ptpBranchVersion}.${timestamp}.jar"/>
-		<property name="proxyFile" value="ptp-proxy-${ptpBranchVersion}-${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="ptpTagBranch" value=""/>
-		<property name="photranTagBranch" value=""/>
-		<property name="tagname" value="v${timestamp}"/>
-		<property name="testReports" value="${zipsdir}/testReports"/>
-		<property name="junit-report-output" value="${testReports}"/>
-		<property name="jvm1.5" value="java"/>
-		<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"/-->
-		<copy file="${jgitDist}" todir="${buildDirectory}/eclipse/plugins"/>
-	</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="**/*@dot.log"/>
-		</concat>
-		<loadfile property="compileLog" srcFile="${zipsdir}/compilelog.txt"/>
-		<condition property="hasErrors">
-			<contains string="${compileLog}" substring=" ERROR"/>
-		</condition>
-		<copy file="buildindex.html" tofile="${zipsdir}/index.html"/>
-		<replace file="${zipsdir}/index.html">
-			<replacefilter token="@eclipseRelease@" value="${eclipseRelease}"/>
-			<replacefilter token="@branchVersion@" value="${ptpBranchVersion}"/>
-			<replacefilter token="@buildId@" value="${buildId}"/>
-		</replace>
-		<move file="${zipsdir}/${masterFile}" todir="${buildDirectory}"/>
-		<unzip src="${buildDirectory}/${masterFile}" dest="${buildDirectory}/site"/>
-		<copy file="${buildDirectory}/eclipse/epl-v10.html" todir="${buildDirectory}/site/eclipse"/>
-		<copy file="${buildDirectory}/eclipse/notice.html" todir="${buildDirectory}/site/eclipse"/>
-		<copy file="index.html" todir="${buildDirectory}/site/eclipse"/>
-		<mkdir dir="${buildDirectory}/site/eclipse/web"/>
-		<copy todir="${buildDirectory}/site/eclipse/web">
-			<fileset dir="web"/>
-		</copy>
-		<copy file="buildsite.xml" tofile="${buildDirectory}/site/eclipse/site.xml"/>
-		<replace file="${buildDirectory}/site/eclipse/site.xml">
-			<replacefilter token="@ptpBranchVersion@" value="${ptpBranchVersion}"/>
-			<replacefilter token="@photranBranchVersion@" value="${photranBranchVersion}"/>
-			<replacefilter token="@timeStamp@" value="${timestamp}"/>
-		</replace>
-		<copy file="pack.properties" todir="${buildDirectory}/site/eclipse"/>
-
-		<!-- for some reason Orbit bundles aren't getting picked up-->		
-		<copy file="${buildDirectory}/plugins/javax.xml_1.3.4.v201005080400.jar"
-			todir="${buildDirectory}/site/eclipse/plugins"/>
-		<copy file="${buildDirectory}/plugins/javax.xml.stream_1.0.1.v201004272200.jar"
-			todir="${buildDirectory}/site/eclipse/plugins"/>
-		<copy file="${buildDirectory}/plugins/javax.xml.bind_2.1.9.v201005080401.jar"
-			todir="${buildDirectory}/site/eclipse/plugins"/>
-		<copy file="${buildDirectory}/plugins/com.sun.xml.bind_2.1.9.v200905260854.jar"
-			todir="${buildDirectory}/site/eclipse/plugins"/>
-
-		<!-- remove the master feature from the update site -->
-		<delete verbose="true" file="${buildDirectory}/site/eclipse/features/${masterFeature}"/>
-
-		<zip destfile="${zipsdir}/${masterFile}"
-			basedir="${buildDirectory}/site/eclipse"/>
-		
-		<!-- generate proxy zip -->
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.aix.ppc_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.aix.ppc"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.linux.ppc_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.linux.ppc"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.linux.x86_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.linux.x86"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.linux.x86_64_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.linux.x86_64"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.macosx.ppc_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.macosx.ppc"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.macosx.x86_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.macosx.x86"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.debug.sdm_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.debug.sdm"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.proxy_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.proxy"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.utils_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.utils"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.rm.ibm.ll.proxy_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.rm.ibm.ll.proxy"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.rm.ibm.pe.proxy_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.rm.ibm.pe.proxy"/>
-		</copy>
-		<copy todir="${buildDirectory}/proxy/org.eclipse.ptp.rm.slurm.proxy_${ptpBranchVersion}.${timestamp}">
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.ptp.rm.slurm.proxy"/>
-		</copy>
-		<zip destfile="${zipsdir}/${proxyFile}">
-			<fileset dir="${buildDirectory}">
-				<include name="proxy/**/*"/>
-			</fileset>
-		</zip>
-	</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="60" 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="check" depends="init" if="hasErrors">
-		<echo>BUILD FAILED</echo>
-		<echo>Errors were detected in the build output.</echo>
-	</target>
-		
-	<target name="copy" depends="init" unless="hasErrors">
-		<mkdir dir="${copyToDir}"/>
-		<copy todir="${copyToDir}">
-			<fileset dir="${buildDirectory}/${buildType}.${buildId}"/>
-		</copy>
-		<chmod perm="g+w" dir="${copyToDir}">
-			<dirset dir="${copyToDir}"/>
-		</chmod>
-		<!-- Create symlink to latest build -->
-		<!-- NOTE: the symlink task is broken for ant versions < 1.8.1. It should be possible to -->
-		<!-- just use overwrite="true", but this fails for dangling links. Also, the symlink "delete" -->
-		<!-- action fails with a java.io.FileNotFoundException and the delete task will not remove -->
-		<!-- symbolic links. The only option currenly is to exec the "rm" command. -->
-		<exec executable="rm">
-			<arg value="-f"/>
-			<arg value="${buildsDir}/latest"/>
-		</exec>
-		<symlink link="${buildsDir}/latest" resource="${copyToDir}" overwrite="true" failonerror="false"/>
-		<exec executable="rm">
-			<arg value="-f"/>
-			<arg value="${buildsDir}/ptp-master-${ptpBranchVersion}-latest.zip"/>
-		</exec>
-		<symlink link="${buildsDir}/ptp-master-${ptpBranchVersion}-latest.zip" resource="${copyToDir}/${masterFile}" overwrite="true" failonerror="false"/>
-		<exec executable="rm">
-			<arg value="-f"/>
-			<arg value="${buildsDir}/rdt-server-unix-${ptpBranchVersion}-latest.tar"/>
-		</exec>
-		<symlink link="${buildsDir}/rdt-server-unix-${ptpBranchVersion}-latest.tar" resource="${copyToDir}/rdt-server-unix-${ptpBranchVersion}.tar" overwrite="true" failonerror="false"/>
-		<exec executable="rm">
-			<arg value="-f"/>
-			<arg value="${buildsDir}/rdt-server-aix-${ptpBranchVersion}-latest.tar"/>
-		</exec>
-		<symlink link="${buildsDir}/rdt-server-aix-${ptpBranchVersion}-latest.tar" resource="${copyToDir}/rdt-server-aix-${ptpBranchVersion}.tar" overwrite="true" failonerror="false"/>
-	</target>
-	
-	<target name="p2" depends="init" unless="hasErrors">
-		<!-- unzip the signed master site -->
-		<property name="p2dir" value="${zipsdir}/p2"/>
-		<property name="destination" value="${zipsdir}/${masterFile}"/>
-		
-		<unzip src="${destination}" dest="${p2dir}"/>
-		
-		<!-- generate p2 metadata -->
-		<antcall target="p2.metadata.generator">
-			<param name="p2site" value="${p2dir}"/>
-		</antcall>
-		
-		<!-- add download stats -->
-		<antcall target="download.stats">
-			<param name="p2site" value="${p2dir}"/>
-		</antcall>
-		
-		<!-- fix artifacts -->
-		<p2.process.artifacts repositoryPath="file:/${p2dir}"/>
-
-		<!-- clean up some unnecessary files -->
-		<delete failonerror="false" quiet="true">
-			<fileset dir="${p2dir}" includes="artifacts.jar.pack.gz, content.jar.pack.gz"/>
-		</delete>
-
-		<!-- zip everything back up -->
-		<zip destfile="${destination}"
-			basedir="${p2dir}"/>
-		<delete dir="${p2dir}"/>
-	</target>
-		
-    <target name="p2.metadata.generator">
-    	<echo message="Generate p2 Metadata" />
-    	<property name="p2site" value="${zipsdir}/p2"/>
-    	<property name="launcher" value="${basedir}/tools/org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar"/>
-    	<java jar="${launcher}" fork="true" timeout="10800000" jvm="${jvm1.5}" failonerror="true" maxmemory="768m" dir="${buildDirectory}/eclipse">
-            <arg line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" />
-            <arg line="-updateSite ${p2site}"/>
-        	<arg line="-site file:${p2site}/site.xml"/>
-        	<arg line="-metadataRepository file:${p2site}"/>
-        	<arg line="-metadataRepositoryName PTP Update Site"/>
-        	<arg line="-artifactRepository file:${p2site}"/>
-        	<arg line="-artifactRepositoryName PTP Artifacts"/>
-        	<arg line="-compress"/>
-        	<arg line="-reusePack200Files"/>
-        	<arg line="-noDefaultIUs"/>
-        	<arg line="-vmargs -Xmx256M"/>
-        </java>
-	</target>
-	
-	<target name = "download.stats">
-		<echo message="Adding download stats"/>
-		<unzip src="${p2dir}/artifacts.jar" dest="${p2dir}"/>
-		<move file="${p2dir}/artifacts.xml" tofile="${p2dir}/artifacts.xml_tmp"/>
-		<xslt style="${basedir}/addDownloadStats.xsl" in="${p2dir}/artifacts.xml_tmp" out="${p2dir}/artifacts.xml" />
-		<zip destfile="${p2dir}/artifacts.jar" basedir="${p2dir}" includes="artifacts.xml"/>
-		<delete file="${p2dir}/artifacts.xml"/>
-		<delete file="${p2dir}/artifacts.xml_tmp"/>
-	</target>
-	
-	<target name="update" depends="init" unless="hasErrors">
-		<replace file="${buildsDir}/index.html">
-			<replacetoken><![CDATA[  <!-- add here -->]]></replacetoken>
-			<replacevalue><![CDATA[  <!-- add here -->
-<li><a href="@buildType@.@buildId@/index.html">@buildId@</a></li>]]></replacevalue>
-		</replace>
-		<replace file="${buildsDir}/index.html">
-			<replacefilter token="@buildType@" value="${buildType}"/>
-			<replacefilter token="@buildId@" value="${buildId}"/>
-			<replacefilter token="@ptpBranchVersion@" value="${ptpBranchVersion}"/>
-		</replace>
-		<chmod file="${buildsDir}/index.html" perm="664"/>
-	</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"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		
-		<!--Features-->
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.utils-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.core-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote.remotetools-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remote.rse-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.remotetools-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.ll-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.ibm.pe-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.jaxb-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.jaxb.pbs-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.lml_jaxb-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.lml-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.mpich2-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.openmpi-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rm.slurm-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.external-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.sdm-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.pldt-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.pldt.fortran-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.pldt.lapi-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.pldt.upc-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.etfw-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.etfw.tau-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.etfw.ppw-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.etfw.tau.fortran-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rdt-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rdt.xlc-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rdt.remotetools-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rdt.remotejars-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rdt.sync-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.rdt.sync.fortran-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.services-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.gem-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.sci-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.sdk-feature"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		
-		<!--Plugins-->
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.extensionpoints.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.file.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.proxy.protocol"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.remotetools.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.rse.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.remote.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.generic.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.generic.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.help"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.proxy"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>			
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.ll.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.help"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.proxy"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.ibm.pe.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.control.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.control.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.help"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.pbs"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.pbs.doc.user"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml_jaxb"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.monitor.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.monitor.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.da"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.da.server"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.proxy"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.mpich2.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.mpi.openmpi.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.proxy.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.help"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.proxy"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-			<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"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.x10"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.proxy"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.utils"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/remotetools/org.eclipse.ptp.remotetools.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/remotetools/org.eclipse.ptp.remotetools.environment.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/remotetools/org.eclipse.ptp.remotetools.environment.generichost"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/remotetools/org.eclipse.ptp.remotetools.environment.launcher"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/remotetools/org.eclipse.ptp.remotetools.environment.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/remotetools/org.eclipse.ptp.remotetools.preferences"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/remotetools/org.eclipse.ptp.remotetools.utils"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.launch"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/doc/org.eclipse.ptp.doc.user"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/doc/org.eclipse.ptp.doc.isv"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.common"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.doc.user"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.lapi"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>			
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.mpi.analysis.cdt"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.mpi.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.openmp.analysis"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.openmp.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.openmp.ui.pv"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.upc"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.wizards"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.doc.user"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/ppw/org.eclipse.ptp.etfw.ppw"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau.jars"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau.papiselect"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau.perfdmf"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau.selinst"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau.selinstfort"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.toolopts"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.feedback"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.remotejars"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.stubs"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.server.dstore"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.doc.user"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.managedbuilder.gnu.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.managedbuilder.xlupc.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.xlc"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.make.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.tests"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.services.test"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.sync.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.sync.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.sync.ui.fortran"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.sync.git.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.sync.git.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.ui.test"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.aix.ppc"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.linux.ppc"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.linux.x86"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.linux.x86_64"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.macosx.ppc"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/releng/org.eclipse.ptp.macosx.x86"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.parallel"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.services.core"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.services.test"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/core/org.eclipse.ptp.services.ui"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/gem/org.eclipse.ptp.gem"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/sci/org.eclipse.ptp.sci"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/tools/gem/org.eclipse.ptp.gem.help"/>
-			<param name="tagbranch" value="${ptpTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran-dev-docs"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran-feature"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran-samples"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface.vpg"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.cmdline"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.core"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.core.intel"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.core.vpg"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.core.vpg.preprocessor.c"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.core.vpg.preprocessor.c.tests"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.core.vpg.tests"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.core.vpg.tests.failing"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.doc.user"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.errorparsers.xlf"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.intel-feature"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.core"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.gnu.ui"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.intel.ui"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.ui"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.xlf.ui"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.master"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.releng"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.ui"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>		
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.ui.vpg"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.ui.vpg.preprocessor.c"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>	
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.vpg-feature"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.photran.xlf-feature"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine-feature"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-		<antcall target="tagone">
-			<param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine-support"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-		</antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.core"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.core.refactoring"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.core.vpg"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.core.vpg.tests"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.doc.isv"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.examples.testing"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.examples.text"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.testing.junit3"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.ui"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.ui.refactoring"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-        <antcall target="tagone">
-            <param name="tagmodule" value="org.eclipse.ptp/photran/org.eclipse.rephraserengine.ui.vpg"/>
-			<param name="tagbranch" value="${photranTagBranch}"/>
-        </antcall>
-	</target>
-</project>
diff --git a/releng/org.eclipse.ptp.releng/buildindex.html b/releng/org.eclipse.ptp.releng/buildindex.html
deleted file mode 100644
index 5d5d1d7..0000000
--- a/releng/org.eclipse.ptp.releng/buildindex.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <title>PTP @branchVersion@ Build @buildId@</title>
-</head>
-<body>
-<h2>PTP @branchVersion@ Build @buildId@</h2>
-<p><a href="build.log">Build Log</a></p>
-<p><a href="compilelog.txt">Compile Log</a></p>
-<p><a href="junits.html">JUnit Results</a></p>
-<table border="1" cellpadding="5">
-<col width="20%"/>
-<col width="30%"/>
-<col width="50%"/>
-<tr>
-	<th>Name</th>
-	<th>Download Link</th>
-	<th>Description</th>
-</tr>
-<tr>
-	<td>PTP Master Archive</td>
-	<td> 
-		<a href="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/builds/@ptpBranchVersion@/I.@buildId@/ptp-master-@branchVersion@-@buildId@.zip">ptp-master-@branchVersion@-@buildId@.zip</a>
-	</td>
-	<td>Contains all features/plugins for PTP and Photran. This is a copy of the PTP update site.</td>
-</tr>
-<tr>
-	<td>PTP Proxy Archive</td>
-	<td> 
-		<a href="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/builds/@ptpBranchVersion@/I.@buildId@/ptp-proxy-@branchVersion@-@buildId@.zip">ptp-proxy-@branchVersion@-@buildId@.zip</a>
-	</td>
-	<td>Contains the source code for the proxy components of PTP. This zip should be copied to the remote system and compiled.</td>
-</tr>
-<tr>
-	<td>RDT Server for AIX</td>
-	<td> 
-		<a href="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/builds/@ptpBranchVersion@/I.@buildId@/rdt-server-aix-@branchVersion@.tar"
-			class="external text"
-			rel="nofollow">rdt-server-aix-@branchVersion@.tar</a>
-	</td>
-	<td>AIX version of the RDT server. Only required if using RSE for remote connections.</td>
-</tr>
-<tr>
-	<td>RDT Server for Linux</td>
-	<td> 
-		<a href="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/builds/@ptpBranchVersion@/I.@buildId@/rdt-server-linux-@branchVersion@.tar"
-			class="external text"
-			rel="nofollow">rdt-server-linux-@branchVersion@.tar</a>
-	</td>
-	<td>Generic Linux version of the RDT server. Only required if using RSE for remote connections.</td>
-</tr>
-<tr>
-	<td>RDT Server for Linux PPC</td>
-	<td> 
-		<a href="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/builds/@ptpBranchVersion@/I.@buildId@/rdt-server-linux.ppc-@branchVersion@.tar"
-			class="external text"
-			rel="nofollow">rdt-server-linux.ppc-@branchVersion@.tar</a>
-	</td>
-	<td>Linux version of the RDT server for PPC systems. Only required if using RSE for remote connections.</td>
-</tr>
-<tr>
-	<td>RDT Server for Linux x86</td>
-	<td> 
-		<a href="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/builds/@ptpBranchVersion@/I.@buildId@/rdt-server-linux.x86-@branchVersion@.tar"
-			class="external text"
-			rel="nofollow">rdt-server-linux.x86-@branchVersion@.tar</a>
-	</td>
-	<td>Linux version of the RDT server for x86 systems. Only required if using RSE for remote connections.</td>
-</tr>
-<tr>
-	<td>RDT Server for Mac OS X</td>
-	<td> 
-		<a href="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/builds/@ptpBranchVersion@/I.@buildId@/rdt-server-macosx-@branchVersion@.tar"
-			class="external text"
-			rel="nofollow">rdt-server-macosx-@branchVersion@.tar</a>
-	</td>
-	<td>Mac OS X version of the RDT server. Only required if using RSE for remote connections.</td>
-</tr>
-<tr>
-	<td>RDT Server for Unix</td>
-	<td> 
-		<a href="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/builds/@ptpBranchVersion@/I.@buildId@/rdt-server-unix-@branchVersion@.tar"
-			class="external text"
-			rel="nofollow">rdt-server-unix-@branchVersion@.tar</a>
-	</td>
-	<td>Generic Unix version of the RDT server. Only required if using RSE for remote connections.</td>
-</tr>
-<tr>
-	<td>RDT Server for Windows</td>
-	<td> 
-		<a href="http://www.eclipse.org/downloads/download.php?file=/tools/ptp/builds/@ptpBranchVersion@/I.@buildId@/rdt-server-windows-@branchVersion@.zip"
-			class="external text"
-			rel="nofollow">rdt-server-windows-@branchVersion@.zip</a>
-	</td>
-	<td>Windows version of the RDT server. Only required if using RSE for remote connections.</td>
-</tr>
-</table>
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.releng/buildsite.xml b/releng/org.eclipse.ptp.releng/buildsite.xml
deleted file mode 100644
index 29e446d..0000000
--- a/releng/org.eclipse.ptp.releng/buildsite.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <description url="http://download.eclipse.org/tools/ptp/updates/@eclipseRelease@">
-      Parallel Tools Platform Indigo Update Site
-   </description>
-   <feature url="features/org.eclipse.ptp_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.core_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.core" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.debug.sdm_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.debug.sdm" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.etfw_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.etfw" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.external_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.external" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.pldt_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.pldt" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.remote_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.remote" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.remote.remotetools_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.remote.remotetools" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-    <feature url="features/org.eclipse.ptp.remotetools_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.remotetools" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rm.ibm.ll_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rm.ibm.ll" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rm.ibm.pe_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rm.ibm.pe" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rm.mpich2_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rm.mpich2" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rm.openmpi_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rm.openmpi" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rm.pbs_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rm.pbs" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rm.jaxb_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rm.jaxb" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rm.jaxb.pbs_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rm.jaxb.pbs" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rm.lml_jaxb_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rm.lml_jaxb" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rm.lml_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rm.lml" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rm.slurm_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rm.slurm" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.services_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.services" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.utils_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.utils" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.pldt.lapi_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.pldt.lapi" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.gem_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.gem" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.remote.rse_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.remote.rse" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.pldt.upc_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.pldt.upc" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.pldt.fortran_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.pldt.fortran" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.etfw.tau_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.etfw.tau" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-    <feature url="features/org.eclipse.ptp.etfw.tau.fortran_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.etfw.tau.fortran" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.etfw.ppw_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.etfw.ppw" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.sci_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.sci" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-    <feature url="features/org.eclipse.ptp.sdk_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.sdk" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Parallel Tools Platform"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rdt_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rdt" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Remote Development Tools"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rdt.xlc_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rdt.xlc" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Remote Development Tools"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rdt.sync_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rdt.sync" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Remote Development Tools"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rdt.sync.fortran_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rdt.sync.fortran" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Remote Development Tools"/>
-   </feature>
-   <feature url="features/org.eclipse.ptp.rdt.remotetools_@ptpBranchVersion@.@timeStamp@.jar" id="org.eclipse.ptp.rdt.remotetools" version="@ptpBranchVersion@.@timeStamp@">
-      <category name="Remote Development Tools"/>
-   </feature>
-   <feature url="features/org.eclipse.photran_@photranBranchVersion@.@timeStamp@.jar" id="org.eclipse.photran" version="@photranBranchVersion@.@timeStamp@">
-      <category name="Fortran Development Tools (Photran)"/>
-   </feature>
-   <feature url="features/org.eclipse.photran.intel_@photranBranchVersion@.@timeStamp@.jar" id="org.eclipse.photran.intel" version="@photranBranchVersion@.@timeStamp@" os="linux">
-      <category name="Fortran Development Tools (Photran)"/>
-   </feature>
-   <feature url="features/org.eclipse.photran.xlf_@photranBranchVersion@.@timeStamp@.jar" id="org.eclipse.photran.xlf" version="@photranBranchVersion@.@timeStamp@">
-      <category name="Fortran Development Tools (Photran)"/>
-   </feature>
-   <feature url="features/org.eclipse.rephraserengine_@photranBranchVersion@.@timeStamp@.jar" id="org.eclipse.rephraserengine" version="@photranBranchVersion@.@timeStamp@">
-      <category name="Fortran Development Tools (Photran)"/>
-   </feature>
-   <category-def name="Parallel Tools Platform" label="Parallel Tools Platform"/>
-   <category-def name="Remote Development Tools" label="Remote Development Tools"/>
-   <category-def name="Fortran Development Tools (Photran)" label="Fortran Development Tools (Photran)"/>
-</site>
diff --git a/releng/org.eclipse.ptp.releng/index.html b/releng/org.eclipse.ptp.releng/index.html
deleted file mode 100644
index b402e6c..0000000
--- a/releng/org.eclipse.ptp.releng/index.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<html>
-<head>
-<title>PTP Update Site</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<style>@import url("web/site.css");</style>
-<script type="text/javascript">
-    var transformDone = false;
-    var stylesheet, xmlFile;
-
-    function loadXMLDoc(url, callback) {
-        if (window.XMLHttpRequest) {
-            var req = new XMLHttpRequest();
-
-            function processReqChange() {
-                if (req.readyState == 4) {    // only if req shows "loaded"
-                    if (req.status == 200) {  // only if "OK"
-                        callback(req.responseXML);
-                    } else {
-                        alert("There was a problem retrieving the XML data:\n" + req.statusText);
-                    }
-                }
-            }
-
-            req.onreadystatechange = processReqChange;
-            req.open("GET", url, true);
-            req.send(null);
-        }
-    }
-
-    function init() {
-        if (window.ActiveXObject) {
-            xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
-            xmlFile.async = false;
-            xmlFile.load("site.xml");
-            stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
-            stylesheet.async = false;
-            stylesheet.load("web/site.xsl");
-            cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
-            cache.stylesheet = stylesheet;
-            transformDataIE();
-        } else {
-            xmlFile = stylesheet = null;
-            transformDone = false;
-	    loadXMLDoc("site.xml",
-                function(result) {
-		    xmlFile = result;
-                    transform();
-                }
-            );
-            loadXMLDoc("web/site.xsl",
-                function(result) {
-                    stylesheet = result;
-                    transform();
-                }
-	    );
-        }
-    }
-    function transform() {
-        if (!transformDone && xmlFile && stylesheet) {
-            var processor = new XSLTProcessor();
-            processor.importStylesheet(stylesheet);
-            var doc = processor.transformToDocument(xmlFile);
-            var dataDivBody = document.getElementById("data");
-//          alert(new XMLSerializer().serializeToString(doc.documentElement.innerHTML));
-            dataDivBody.innerHTML = doc.documentElement.innerHTML;
-            transformDone = true;
-        }
-    }
-    function transformDataIE() { // separate transformation function for IE 6.0+
-        var processor = cache.createProcessor();
-        processor.input = xmlFile;
-	processor.transform();
-	data.innerHTML = processor.output;
-    }
-</script>
-</head>
-<body onload="init();">
-<!--[insert static HTML here]-->
-<div id="data"><!-- this is where the transformed data goes --></div>
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.releng/maps/photran.map b/releng/org.eclipse.ptp.releng/maps/photran.map
deleted file mode 100644
index 4b962b9..0000000
--- a/releng/org.eclipse.ptp.releng/maps/photran.map
+++ /dev/null
@@ -1,36 +0,0 @@
-! Master feature
-!feature@org.eclipse.photran.master=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.master
-
-! Photran features
-feature@org.eclipse.rephraserengine=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.rephraserengine-feature
-feature@org.eclipse.photran=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran-feature
-feature@org.eclipse.photran.xlf=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.xlf-feature
-feature@org.eclipse.photran.intel=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.intel-feature
-
-! Plugins
-plugin@org.eclipse.rephraserengine.core=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.rephraserengine.core
-plugin@org.eclipse.rephraserengine.core.refactoring=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.rephraserengine.core.refactoring
-plugin@org.eclipse.rephraserengine.core.vpg=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.rephraserengine.core.vpg
-plugin@org.eclipse.rephraserengine.doc.isv=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.rephraserengine.doc.isv
-plugin@org.eclipse.rephraserengine.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.rephraserengine.ui
-plugin@org.eclipse.rephraserengine.ui.refactoring=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.rephraserengine.ui.refactoring
-plugin@org.eclipse.rephraserengine.ui.vpg=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.rephraserengine.ui.vpg
-plugin@org.eclipse.photran.core=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.core
-plugin@org.eclipse.photran.managedbuilder.core=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.core
-plugin@org.eclipse.photran.managedbuilder.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.ui
-plugin@org.eclipse.photran.cdtinterface=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface
-plugin@org.eclipse.photran.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.ui
-plugin@org.eclipse.photran.managedbuilder.gnu.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.gnu.ui
-plugin@org.eclipse.photran.cdtinterface.vpg=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.cdtinterface.vpg
-plugin@org.eclipse.photran.core.vpg=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.core.vpg
-plugin@org.eclipse.photran.ui.vpg=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.ui.vpg
-plugin@org.eclipse.photran.core.vpg.preprocessor.c=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.core.vpg.preprocessor.c
-plugin@org.eclipse.photran.ui.vpg.preprocessor.c=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.ui.vpg.preprocessor.c
-plugin@org.eclipse.photran.managedbuilder.intel.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.intel.ui
-plugin@org.eclipse.photran.core.intel=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.core.intel
-plugin@org.eclipse.photran.errorparsers.xlf=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.errorparsers.xlf
-plugin@org.eclipse.photran.managedbuilder.xlf.ui=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.managedbuilder.xlf.ui
-plugin@org.eclipse.photran.doc.user=@photranTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/photran/org.eclipse.photran.doc.user
-
-! Tests
-
diff --git a/releng/org.eclipse.ptp.releng/maps/ptp.map b/releng/org.eclipse.ptp.releng/maps/ptp.map
deleted file mode 100644
index 87569f6..0000000
--- a/releng/org.eclipse.ptp.releng/maps/ptp.map
+++ /dev/null
@@ -1,207 +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.license=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.license-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.jaxb=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.jaxb-feature
-feature@org.eclipse.ptp.rm.jaxb.pbs=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.jaxb.pbs-feature
-feature@org.eclipse.ptp.rm.lml_jaxb=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.lml_jaxb-feature
-feature@org.eclipse.ptp.rm.lml=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.lml-feature
-feature@org.eclipse.ptp.rm.mpich2=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.mpich2-feature
-feature@org.eclipse.ptp.rm.openmpi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.openmpi-feature
-feature@org.eclipse.ptp.rm.slurm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rm.slurm-feature
-feature@org.eclipse.ptp.external=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.external-feature
-feature@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.sdm-feature
-feature@org.eclipse.ptp.services=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.services-feature
-feature@org.eclipse.ptp.sdk=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.sdk-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
-feature@org.eclipse.ptp.pldt.fortran=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.pldt.fortran-feature
-
-! ETFw (formerly PERF) features
-feature@org.eclipse.ptp.etfw=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.etfw-feature
-feature@org.eclipse.ptp.etfw.tau=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.etfw.tau-feature
-feature@org.eclipse.ptp.etfw.tau.fortran=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.etfw.tau.fortran-feature
-feature@org.eclipse.ptp.etfw.ppw=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.etfw.ppw-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
-feature@org.eclipse.ptp.rdt.xlc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt.xlc-feature
-feature@org.eclipse.ptp.rdt.remotetools=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt.remotetools-feature
-feature@org.eclipse.ptp.rdt.remotejars=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt.remotejars-feature
-feature@org.eclipse.ptp.rdt.sync=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt.sync-feature
-feature@org.eclipse.ptp.rdt.sync.fortran=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.rdt.sync.fortran-feature
-
-! GEM feature
-feature@org.eclipse.ptp.gem=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.gem-feature
-
-! PPW Feature
-plugin@org.eclipse.ptp.etfw.ppw=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/ppw/org.eclipse.ptp.etfw.ppw
-
-! SCI feature
-feature@org.eclipse.ptp.sci=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/releng/org.eclipse.ptp.sci-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.extensionpoints.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils.extensionpoints.core
-plugin@org.eclipse.ptp.utils.file.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.utils.file.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.generic.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.generic.core
-plugin@org.eclipse.ptp.rm.generic.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.generic.ui
-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.jaxb.control.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.control.core
-plugin@org.eclipse.ptp.rm.jaxb.control.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.control.ui
-plugin@org.eclipse.ptp.rm.jaxb.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.core
-plugin@org.eclipse.ptp.rm.jaxb.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.help
-plugin@org.eclipse.ptp.rm.jaxb.pbs=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.pbs
-plugin@org.eclipse.ptp.rm.jaxb.pbs.doc.user=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.pbs.doc.user
-plugin@org.eclipse.ptp.rm.jaxb.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.jaxb.ui
-plugin@org.eclipse.ptp.rm.lml_jaxb=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml_jaxb
-plugin@org.eclipse.ptp.rm.lml.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.core
-plugin@org.eclipse.ptp.rm.lml.monitor.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.monitor.core
-plugin@org.eclipse.ptp.rm.lml.monitor.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.monitor.ui
-plugin@org.eclipse.ptp.rm.lml.da.server=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.da.server
-plugin@org.eclipse.ptp.rm.lml.da=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.da
-plugin@org.eclipse.ptp.rm.lml.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.lml.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.proxy.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.proxy.core
-plugin@org.eclipse.ptp.rm.slurm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.core
-plugin@org.eclipse.ptp.rm.slurm.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.help
-plugin@org.eclipse.ptp.rm.slurm.proxy=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.proxy
-plugin@org.eclipse.ptp.rm.slurm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.slurm.ui
-plugin@org.eclipse.ptp.rm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rms/org.eclipse.ptp.rm.ui
-plugin@org.eclipse.ptp.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/core/org.eclipse.ptp.ui
-plugin@org.eclipse.ptp.debug.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.core
-plugin@org.eclipse.ptp.debug.sdm=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm
-plugin@org.eclipse.ptp.debug.sdm.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.core
-plugin@org.eclipse.ptp.debug.sdm.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.ui
-plugin@org.eclipse.ptp.debug.sdm.x10=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/debug/org.eclipse.ptp.debug.sdm.x10
-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.doc.user=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/doc/org.eclipse.ptp.doc.user
-plugin@org.eclipse.ptp.doc.isv=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/doc/org.eclipse.ptp.doc.isv
-
-! 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/remotetools/org.eclipse.ptp.remotetools.core
-plugin@org.eclipse.ptp.remotetools.environment.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/remotetools/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/remotetools/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/remotetools/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/remotetools/org.eclipse.ptp.remotetools.environment.ui
-plugin@org.eclipse.ptp.remotetools.preferences=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/remotetools/org.eclipse.ptp.remotetools.preferences
-plugin@org.eclipse.ptp.remotetools.utils=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/remotetools/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/pldt/org.eclipse.ptp.pldt.common
-plugin@org.eclipse.ptp.pldt.doc.user=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.doc.user
-plugin@org.eclipse.ptp.pldt.lapi=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.lapi
-plugin@org.eclipse.ptp.pldt.mpi.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/pldt/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/pldt/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/pldt/org.eclipse.ptp.pldt.mpi.core
-plugin@org.eclipse.ptp.pldt.mpi.fortran=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran
-plugin@org.eclipse.ptp.pldt.openmp.analysis=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/pldt/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/pldt/org.eclipse.ptp.pldt.openmp.core
-plugin@org.eclipse.ptp.pldt.openmp.fortran=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran
-plugin@org.eclipse.ptp.pldt.openmp.ui.pv=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/pldt/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/pldt/org.eclipse.ptp.pldt.upc
-plugin@org.eclipse.ptp.pldt.wizards=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/pldt/org.eclipse.ptp.pldt.wizards
-
-! ETF Plugins
-plugin@org.eclipse.ptp.etfw=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw
-plugin@org.eclipse.ptp.etfw.tau=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau
-plugin@org.eclipse.ptp.etfw.tau.papiselect=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau.papiselect
-plugin@org.eclipse.ptp.etfw.tau.perfdmf=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau.perfdmf
-plugin@org.eclipse.ptp.etfw.tau.selinst=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau.selinst
-plugin@org.eclipse.ptp.etfw.tau.selinstfort=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.tau.selinstfort
-plugin@org.eclipse.ptp.etfw.toolopts=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.toolopts
-plugin@org.eclipse.ptp.etfw.feedback=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.feedback
-plugin@org.eclipse.ptp.etfw.doc.user=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.doc.user
-
-! 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.doc.user=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.doc.user
-plugin@org.eclipse.ptp.rdt.managedbuilder.gnu.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.managedbuilder.gnu.ui
-plugin@org.eclipse.ptp.rdt.managedbuilder.xlc.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.managedbuilder.xlc.ui
-plugin@org.eclipse.ptp.rdt.managedbuilder.xlupc.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.managedbuilder.xlupc.ui
-plugin@org.eclipse.ptp.rdt.xlc=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.xlc
-plugin@org.eclipse.ptp.rdt.make.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.make.ui
-plugin@org.eclipse.ptp.rdt.core.remotejars=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.remotejars
-plugin@org.eclipse.ptp.rdt.core.stubs=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.core.stubs
-plugin@org.eclipse.ptp.rdt.server.dstore=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.server.dstore
-plugin@org.eclipse.ptp.rdt.sync.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.sync.core
-plugin@org.eclipse.ptp.rdt.sync.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.sync.ui
-plugin@org.eclipse.ptp.rdt.sync.git.core=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.sync.git.core
-plugin@org.eclipse.ptp.rdt.sync.git.ui=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.sync.git.ui
-plugin@org.eclipse.ptp.rdt.sync.ui.fortran=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/rdt/org.eclipse.ptp.rdt.sync.ui.fortran
-
-! GEM Plugins
-plugin@org.eclipse.ptp.gem=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/gem/org.eclipse.ptp.gem
-plugin@org.eclipse.ptp.gem.help=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/gem/org.eclipse.ptp.gem.help
-
-! PPW Plugin
-plugin@org.eclipse.ptp.etfw.ppw=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/ppw/org.eclipse.ptp.etfw.ppw
-
-! SCI Plugin
-plugin@org.eclipse.ptp.sci=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/sci/org.eclipse.ptp.sci
-
-! 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.etfw.parallel=@ptpTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.ptp/tools/etfw/org.eclipse.ptp.etfw.parallel
-
-! Tests
-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
-
-! Orbit bundles
-plugin@javax.activation,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/javax.activation_1.1.0.v201005080500.jar
-plugin@javax.xml,1.3.4=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/javax.xml_1.3.4.v201005080400.jar
-plugin@javax.xml.stream,1.0.1=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/javax.xml.stream_1.0.1.v201004272200.jar
-plugin@javax.xml.bind,2.1.9=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/javax.xml.bind_2.1.9.v201005080401.jar
-plugin@com.sun.xml.bind,2.1.9=GET,http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/bundles/com.sun.xml.bind_2.1.9.v200905260854.jar
-
-! JGit plugins
-!plugin@org.eclipse.jgit=GET,http://download.eclipse.org/jgit/maven/org/eclipse/jgit/org.eclipse.jgit/0.12.1/org.eclipse.jgit-0.12.1.jar
-plugin@org.eclipse.jgit=GET,http://download.eclipse.org/tools/ptp/builds/jgit/org.eclipse.jgit_0.12.1.jar
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 bd40fe9..0000000
--- a/releng/org.eclipse.ptp.releng/master/build.properties
+++ /dev/null
@@ -1,104 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-#####################
-# Parameters describing how and where to execute the build.
-# Typical users need only update the following properties:
-#    baseLocation - where things you are building against are installed
-#    bootclasspath - The base jars to compile against (typicaly rt.jar)
-#    configs - the list of {os, ws, arch} configurations to build.  
-#
-# Of course any of the settings here can be overridden by spec'ing 
-# them on the command line (e.g., -DbaseLocation=d:/eclipse
-
-############# CVS CONTROL ################
-# The CVS tag to use when fetching the map files from the repository
-mapVersionTag=HEAD
-
-# The CVS tag to use when fetching elements to build.  By default the
-# builder will use whatever is in the maps.  Use this value to override
-# for example, when doing a nightly build out of HEAD
-# fetchTag=HEAD
-
-ptpTag=HEAD
-photranTag=HEAD
-
-############## BUILD / GENERATION CONTROL ################
-# The directory into which the build elements will be fetched and where
-# the build will take place.  buildDirectory and install should be the same
-# value.
-buildDirectory=build
-
-# Type of build.  Used in naming the build output.  Typically this value is
-# one of I, N, M, S, ...
-buildType=I
-
-# ID of the build.  Used in naming the build output.
-buildId=TestBuild
-
-# Label for the build.  Used in naming the build output
-buildLabel=${buildType}.${buildId}
-
-# Timestamp for the build.  Used in naming the build output
-timestamp=007
-
-# Base location for anything the build needs to compile against.  For example,
-# when building GEF, the baseLocation should be the location of a previously
-# installed Eclipse against which the GEF code will be compiled.
-baseLocation=
-
-#Os/Ws/Arch/nl of the eclipse specified by baseLocation
-#baseos
-#basews
-#basearch
-#basenl
-
-# The location underwhich all of the build output will be collected.  This will be
-# the root path in the resultant zip file.
-collPlace=eclipse
-
-# The directory  in which to execute zip of the ${collPlace} directory
-collBase=.
-
-# The list of {os, ws, arch} configurations to build.  This 
-# value is a '&' separated list of ',' separate triples.  For example, 
-#     configs=win32,win32,x86 & linux,motif,x86
-# By default the value is *,*,*
-configs= \
-	  aix,motif,ppc \
-    & linux,gtk,x86 \
-    & linux,gtk,x86_64 \
-    & linux,gtk,ppc \
-    & macosx,cocoa,ppc \
-    & macosx,cocoa,x86 \
-    & macosx,cocoa,x86_64 \
-    & win32,win32,x86
-
-outputUpdateJars=true
-groupConfigurations=true
-
-#Arguments to send to the zip executable
-zipargs=
-
-flattenDependencies=true
-
-############# 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 77666e2..0000000
--- a/releng/org.eclipse.ptp.releng/master/customTargets.xml
+++ /dev/null
@@ -1,195 +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-${ptpBranchVersion}-${buildId}.zip"/>
-	</ant>
-</target>
-	
-<!-- ===================================================================== -->
-<!-- Check out map files from correct repository -->
-<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
-<!-- ===================================================================== -->
-<target name="getMapFiles">
-	<copy file="${builder}/../maps/ptp.map" todir="${buildDirectory}/maps"/>
-	<replace file="${buildDirectory}/maps/ptp.map">
-		<replacefilter token="@ptpTag@" value="${ptpTag}"/>
-	</replace>
-	<copy file="${builder}/../maps/photran.map" todir="${buildDirectory}/maps"/>
-	<replace file="${buildDirectory}/maps/photran.map">
-		<replacefilter token="@photranTag@" value="${photranTag}"/>
-	</replace>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before setup -->
-<!-- ===================================================================== -->
-<target name="preSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after setup but before starting the build proper -->
-<!-- ===================================================================== -->
-<target name="postSetup">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="preFetch">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after fetching the build elements -->
-<!-- ===================================================================== -->
-<target name="postFetch">
-	<condition property="patchesAvailable">
-		<available file="${builder}/patch.xml"/>
-	</condition>
-	<antcall target="applyPatches"/>
-</target>
-
-<target name="applyPatches" if="patchesAvailable">
-	<ant antfile="${builder}/patch.xml"/>
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do before generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="preGenerate">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after generating the build scripts. -->
-<!-- ===================================================================== -->
-<target name="postGenerate">
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="preProcess">
-	<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
-		<include name="**/about.mappings" />
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.aix.ppc/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.ppc/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.x86/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.linux.x86_64/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.macosx.ppc/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.macosx.x86/BUILD">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.debug.sdm/configure">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.debug.sdm/configure.in">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.proxy/configure">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.proxy/configure.in">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.utils/configure">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.utils/configure.in">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.rm.ibm.ll.proxy/configure">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.rm.ibm.ll.proxy/configure.in">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.rm.ibm.pe.proxy/configure">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.rm.ibm.pe.proxy/configure.in">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.rm.slurm.proxy/configure">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-	<replace file="${buildDirectory}/plugins/org.eclipse.ptp.rm.slurm.proxy/configure.in">
-		<replacefilter token="@buildVersion@" value="${ptpBranchVersion}.${timestamp}"/>
-	</replace>
-
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after running the build.xmls for the elements being built. -->
-<!-- ===================================================================== -->
-<target name="postProcess">
-</target>
-
-
-<!-- ===================================================================== -->
-<!-- Steps to do before running assemble. -->
-<!-- ===================================================================== -->
-<target name="preAssemble">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after  running assemble. -->
-<!-- ===================================================================== -->
-<target name="postAssemble">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do after the build is done. -->
-<!-- ===================================================================== -->
-<target name="postBuild">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do to test the build results -->
-<!-- ===================================================================== -->
-<target name="test">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Steps to do to publish the build results -->
-<!-- ===================================================================== -->
-<target name="publish">
-</target>
-
-<!-- ===================================================================== -->
-<!-- Default target                                                        -->
-<!-- ===================================================================== -->
-<target name="noDefault">
-	<echo message="You must specify a target when invoking this file" />
-</target>
-
-</project>
diff --git a/releng/org.eclipse.ptp.releng/pack.properties b/releng/org.eclipse.ptp.releng/pack.properties
deleted file mode 100644
index 1cb5a5e..0000000
--- a/releng/org.eclipse.ptp.releng/pack.properties
+++ /dev/null
@@ -1 +0,0 @@
-pack200.default.args=-E4
diff --git a/releng/org.eclipse.ptp.releng/ptpbuild b/releng/org.eclipse.ptp.releng/ptpbuild
deleted file mode 100644
index 025edae..0000000
--- a/releng/org.eclipse.ptp.releng/ptpbuild
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-#
-# ptpbuild wrapper script
-#
-# Usage: ptpbuild [-t tag] [-d build_dir] [build_args]
-#
-# where
-#
-# tag is the CVS tag used to check out the releng project (default HEAD)
-# build_dir is the location that the build will take place
-# build_args are any arguments you want to pass to the build script
-#
-# set up anything environment specific that needs to be done before
-# launching the build script in the releng project
-
-LANG=en_US
-TAG=HEAD
-CDT_TAG=HEAD
-VERBOSE=false
-
-# main staging directory
-BUILD_DIR=/opt/public/download-staging.priv/tools/ptp/releng
-
-args=`getopt vc:d:t: $*`
-
-if [ $? != 0 ]; then
-	echo "usage: ptpbuild [-v] [-t tag] [-c cdt_tag] [-d build_dir] [build_args]"
-	exit 1
-fi
-
-set -- $args
-for i
-do
-	case "$i"
-	in
-	-v) VERBOSE=true; shift;;
-	-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
-
-touch $BUILD_LOG
-chmod a+r $BUILD_LOG
-
-do_build() {
-	# create the releng staging directory and go there
-	mkdir -p $1 && cd $1
-
-	# remove the old build
-	rm -fr org.eclipse.ptp_${2}
-
-	# Check out the releng project
-	cvs -d /cvsroot/tools co -r $2 -d org.eclipse.ptp_${2} org.eclipse.ptp/releng/org.eclipse.ptp.releng
-
-	# run the main script
-	cd org.eclipse.ptp_${2}
-	sh build.sh $3
-}
-
-if [ $VERBOSE = true ]; then
-	do_build $BUILD_DIR $TAG "$*" 2>&1 | tee $BUILD_LOG
-else
-	do_build $BUILD_DIR $TAG "$*" > $BUILD_LOG 2>&1
-fi
-
-if grep -q 'BUILD FAILED' $BUILD_LOG; then
-	echo "BUILD FAILED. See $BUILD_LOG for details."
-fi
-
-exit 0
diff --git a/releng/org.eclipse.ptp.releng/update_versions b/releng/org.eclipse.ptp.releng/update_versions
deleted file mode 100644
index 0220256..0000000
--- a/releng/org.eclipse.ptp.releng/update_versions
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/sh
-#
-# script to update PTP versions
-#
-# Usage: update_versions ptp_version photran_version
-#
-# ptp_version - new version string for PTP (e.g. "3.0.1")
-# photran_version - new version string for Photran (e.g. "5.0.1")
-#
-# Note: a "qualifier" suffix will automatically be added to the version where appropriate
-#
-
-TMP_DIR=/tmp
-
-if [ $# -lt 2 ]; then
-	echo "usage: update_versions ptp_version photran_version"
-	exit 1
-fi
-
-ptp_version=$1
-photran_version=$2
-
-PTP_FEATURES="\
-	org.eclipse.ptp-feature \
-	org.eclipse.ptp.core-feature \
-	org.eclipse.ptp.etfw-feature \
-	org.eclipse.ptp.etfw.ppw-feature \
-	org.eclipse.ptp.etfw.tau-feature \
-	org.eclipse.ptp.etfw.tau.fortran-feature \
-	org.eclipse.ptp.external-feature \
-	org.eclipse.ptp.gem-feature \
-	org.eclipse.ptp.master \
-	org.eclipse.ptp.pldt-feature \
-	org.eclipse.ptp.pldt.lapi-feature \
-	org.eclipse.ptp.pldt.upc-feature \
-	org.eclipse.ptp.pldt.fortran-feature \
-	org.eclipse.ptp.rdt-feature \
-	org.eclipse.ptp.rdt.remotejars-feature \
-	org.eclipse.ptp.rdt.remotetools-feature \
-	org.eclipse.ptp.rdt.sync-feature \
-	org.eclipse.ptp.rdt.sync.fortran-feature \
-	org.eclipse.ptp.rdt.xlc-feature \
-	org.eclipse.ptp.remote-feature \
-	org.eclipse.ptp.remote.remotetools-feature \
-	org.eclipse.ptp.remote.rse-feature \
-	org.eclipse.ptp.remotetools-feature \
-	org.eclipse.ptp.rm.ibm.ll-feature \
-	org.eclipse.ptp.rm.ibm.pe-feature \
-	org.eclipse.ptp.rm.jaxb-feature \
-	org.eclipse.ptp.rm.jaxb.pbs-feature \
-	org.eclipse.ptp.rm.lml_jaxb-feature \
-	org.eclipse.ptp.rm.lml-feature \
-	org.eclipse.ptp.rm.mpich2-feature \
-	org.eclipse.ptp.rm.openmpi-feature \
-	org.eclipse.ptp.rm.slurm-feature \
-	org.eclipse.ptp.sci-feature \
-	org.eclipse.ptp.sdk-feature \
-	org.eclipse.ptp.sdm-feature \
-	org.eclipse.ptp.services-feature \
-	org.eclipse.ptp.utils-feature"
-	
-PHOTRAN_FEATURES="\
-	org.eclipse.photran-feature \
-	org.eclipse.photran.intel-feature \
-	org.eclipse.photran.xlf-feature \
-	org.eclipse.rephraserengine-feature"
-
-PTP_PLUGINS="\
-	org.eclipse.ptp.aix.ppc \
-	org.eclipse.ptp.linux.ppc \
-	org.eclipse.ptp.linux.x86 \
-	org.eclipse.ptp.linux.x86_64 \
-	org.eclipse.ptp.macosx.ppc \
-	org.eclipse.ptp.macosx.x86 \
-	org.eclipse.ptp"
-	
-PTP_C_PROJECTS="\
-	org.eclipse.ptp.debug.sdm \
-	org.eclipse.ptp.proxy \
-	org.eclipse.ptp.rm.ibm.pe.proxy \
-	org.eclipse.ptp.rm.ibm.ll.proxy \
-	org.eclipse.ptp.rm.slurm.proxy \
-	org.eclipse.ptp.sci \
-	org.eclipse.ptp.utils"
-	
-update_feature() {
-	sed -e "s/^\([ \t]*\)version=\"[0-9]\.[0-9]\.[0-9]\.qualifier\"/\1version=\"$2\.qualifier\"/" < $1/feature.xml > $TMP_DIR/${1}_feature.xml
-	mv $TMP_DIR/${1}_feature.xml $1/feature.xml
-}
-
-update_manifest() {
-	sed -e "s/^\([ \t]*\)Bundle-Version: *[0-9]\.[0-9]\.[0-9]\.qualifier/\1Bundle-Version: $2.qualifier/" < $1/META-INF/MANIFEST.MF > $TMP_DIR/${1}_MANIFEST.MF
-	mv $TMP_DIR/${1}_MANIFEST.MF $1/META-INF/MANIFEST.MF
-}
-
-for feature in $PTP_FEATURES; do
-	echo "Updating $feature..."
-	update_feature $feature $ptp_version
-done
-
-for plugin in $PTP_PLUGINS; do
-	echo "Updating $plugin..."
-	update_manifest $plugin $ptp_version
-done
-
-for project in $PTP_C_PROJECTS; do
-	echo "Updating $project..."
-	update_manifest $project $ptp_version
-done
-
-for feature in $PHOTRAN_FEATURES; do
-	echo "Updating $feature..."
-	update_feature $feature $photran_version
-done
-
-echo "Updating org.eclipse.ptp.releng..."
-sed -e "s/<property name=\"ptpBranchVersion\" value=\"[0-9]\.[0-9]\.[0-9]\"\/>/<property name=\"ptpBranchVersion\" value=\"$ptp_version\"\/>/" \
-	-e "s/<property name=\"photranBranchVersion\" value=\"[0-9]\.[0-9]\.[0-9]\"\/>/<property name=\"photranBranchVersion\" value=\"$photran_version\"\/>/" \
-	< org.eclipse.ptp.releng/build.xml > $TMP_DIR/org.eclipse.ptp.releng_build.xml
-mv $TMP_DIR/org.eclipse.ptp.releng_build.xml org.eclipse.ptp.releng/build.xml
-
-echo "Updating org.eclipse.ptp.rdt.core.remotejars.."
-sed -e "s/<property name=\"serverVersion\" value=\"[0-9]\.[0-9]\.[0-9]\"\/>/<property name=\"serverVersion\" value=\"$ptp_version\"\/>/" \
-	< org.eclipse.ptp.rdt.core.remotejars/build.xml > $TMP_DIR/org.eclipse.ptp.rdt.core.remotejars_build.xml
-mv $TMP_DIR/org.eclipse.ptp.rdt.core.remotejars_build.xml org.eclipse.ptp.rdt.core.remotejars/build.xml
-
-exit 0
diff --git a/releng/org.eclipse.ptp.releng/web/site.css b/releng/org.eclipse.ptp.releng/web/site.css
deleted file mode 100644
index 62c6f9f..0000000
--- a/releng/org.eclipse.ptp.releng/web/site.css
+++ /dev/null
@@ -1,12 +0,0 @@
-<STYLE type="text/css">
-td.spacer {padding-bottom: 10px; padding-top: 10px;}
-.title { font-family: sans-serif; color: #99AACC;}
-.bodyText { font-family: sans-serif; font-size: 9pt; color:#000000;  }
-.sub-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white;}
-.log-text {font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black;}
-.big-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white;}
-.light-row {background:#FFFFFF}
-.dark-row {background:#EEEEFF}
-.header {background:#99AADD}
-#indent {word-wrap : break-word;width :300px;text-indent:10px;}
-</STYLE>
diff --git a/releng/org.eclipse.ptp.releng/web/site.xsl b/releng/org.eclipse.ptp.releng/web/site.xsl
deleted file mode 100644
index 574006f..0000000
--- a/releng/org.eclipse.ptp.releng/web/site.xsl
+++ /dev/null
@@ -1,214 +0,0 @@
-<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl="urn:schemas-microsoft-com:xslt">
-<xsl:output method="html" encoding="UTF-8"/>
-<xsl:key name="cat" match="category" use="@name"/>
-<xsl:template match="/">
-<xsl:for-each select="site">
-	<html>
-	<head>
-	<title>PTP Update Site</title>
-	<style>@import url("web/site.css");</style>
-	</head>
-	<body>
-	<h1 class="title">PTP Update Site</h1>
-	<p class="bodyText"><xsl:value-of select="description"/></p>
-	<table width="100%" border="0" cellspacing="1" cellpadding="2">
-	<xsl:for-each select="category-def">
-		<xsl:sort select="@label" order="ascending" case-order="upper-first"/>
-		<xsl:sort select="@name" order="ascending" case-order="upper-first"/>
-	<xsl:if test="count(key('cat',@name)) != 0">
-			<tr class="header">
-				<td class="sub-header" width="30%">
-					<xsl:value-of select="@name"/>
-				</td>
-				<td class="sub-header" width="70%">
-					<xsl:value-of select="@label"/>
-				</td>
-			</tr>
-			<xsl:for-each select="key('cat',@name)">
-			<xsl:sort select="ancestor::feature//@version" order="ascending"/>
-			<xsl:sort select="ancestor::feature//@id" order="ascending" case-order="upper-first"/>
-			<tr>
-				<xsl:choose>
-				<xsl:when test="(position() mod 2 = 1)">
-					<xsl:attribute name="class">dark-row</xsl:attribute>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:attribute name="class">light-row</xsl:attribute>
-				</xsl:otherwise>
-				</xsl:choose>
-				<td class="log-text" id="indent">
-						<xsl:choose>
-						<xsl:when test="ancestor::feature//@label">
-							<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@label"/></a>
-							<br/>
-							<div id="indent">
-							(<xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/>)
-							</div>
-						</xsl:when>
-						<xsl:otherwise>
-						<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/></a>
-						</xsl:otherwise>
-						</xsl:choose>
-						<br />
-				</td>
-				<td>
-					<table>
-						<xsl:if test="ancestor::feature//@os">
-							<tr><td class="log-text" id="indent">Operating Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@os"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@ws">
-							<tr><td class="log-text" id="indent">Windows Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@ws"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@nl">
-							<tr><td class="log-text" id="indent">Languages:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@nl"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@arch">
-							<tr><td class="log-text" id="indent">Architecture:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@arch"/></td>
-							</tr>
-						</xsl:if>
-					</table>
-				</td>
-			</tr>
-			</xsl:for-each>
-			<tr><td class="spacer"><br/></td><td class="spacer"><br/></td></tr>
-		</xsl:if>
-	</xsl:for-each>
-	<xsl:if test="count(feature)  &gt; count(feature/category)">
-	<tr class="header">
-		<td class="sub-header" colspan="2">
-		Uncategorized
-		</td>
-	</tr>
-	</xsl:if>
-	<xsl:choose>
-	<xsl:when test="function-available('msxsl:node-set')">
-	   <xsl:variable name="rtf-nodes">
-		<xsl:for-each select="feature[not(category)]">
-			<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-			<xsl:sort select="@version" order="ascending" />
-			<xsl:value-of select="."/>
-			<xsl:copy-of select="." />
-		</xsl:for-each>
-	   </xsl:variable>
-	   <xsl:variable name="myNodeSet" select="msxsl:node-set($rtf-nodes)/*"/>
-	<xsl:for-each select="$myNodeSet">
-	<tr>
-		<xsl:choose>
-		<xsl:when test="position() mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:when>
-	<xsl:otherwise>
-	<xsl:for-each select="feature[not(category)]">
-	<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-	<xsl:sort select="@version" order="ascending" />
-	<tr>
-		<xsl:choose>
-		<xsl:when test="count(preceding-sibling::feature[not(category)]) mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:otherwise>
-	</xsl:choose>
-	</table>
-	</body>
-	</html>
-</xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/releng/org.eclipse.ptp.repo/.project b/releng/org.eclipse.ptp.repo/.project
deleted file mode 100644
index 450f1fe..0000000
--- a/releng/org.eclipse.ptp.repo/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.repo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.repo/category.xml b/releng/org.eclipse.ptp.repo/category.xml
deleted file mode 100644
index 2c46066..0000000
--- a/releng/org.eclipse.ptp.repo/category.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-	<description url="http://download.eclipse.org/tools/ptp/updates/@eclipseRelease@">
-		Parallel Tools Platform Update Site
-	</description>
-
-	<category-def name="Parallel Tools Platform" label="Parallel Tools Platform" />
-	<category-def name="Remote Development Tools" label="Remote Development Tools" />
-	<category-def name="Fortran Development Tools (Photran)" label="Fortran Development Tools (Photran)" />
-
-	<feature url="features/org.eclipse.ptp_0.0.0.jar" id="org.eclipse.ptp" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.core_0.0.0.jar" id="org.eclipse.ptp.core" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.debug.sdm_0.0.0.jar" id="org.eclipse.ptp.debug.sdm" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.etfw_0.0.0.jar" id="org.eclipse.ptp.etfw" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.external_0.0.0.jar" id="org.eclipse.ptp.external" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.pldt_0.0.0.jar" id="org.eclipse.ptp.pldt" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.remote_0.0.0.jar" id="org.eclipse.ptp.remote" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.remote.remotetools_0.0.0.jar" id="org.eclipse.ptp.remote.remotetools" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.remotetools_0.0.0.jar" id="org.eclipse.ptp.remotetools" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.ibm.ll_0.0.0.jar" id="org.eclipse.ptp.rm.ibm.ll" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.ibm.pe_0.0.0.jar" id="org.eclipse.ptp.rm.ibm.pe" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.mpich2_0.0.0.jar" id="org.eclipse.ptp.rm.mpich2" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.openmpi_0.0.0.jar" id="org.eclipse.ptp.rm.openmpi" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.jaxb_0.0.0.jar" id="org.eclipse.ptp.rm.jaxb" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.jaxb.pbs_0.0.0.jar" id="org.eclipse.ptp.rm.jaxb.pbs" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.lml_jaxb_0.0.0.jar" id="org.eclipse.ptp.rm.lml_jaxb" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.lml_0.0.0.jar" id="org.eclipse.ptp.rm.lml" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rm.slurm_0.0.0.jar" id="org.eclipse.ptp.rm.slurm" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.services_0.0.0.jar" id="org.eclipse.ptp.services" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.utils_0.0.0.jar" id="org.eclipse.ptp.utils" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.pldt.lapi_0.0.0.jar" id="org.eclipse.ptp.pldt.lapi" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.gem_0.0.0.jar" id="org.eclipse.ptp.gem" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.remote.rse_0.0.0.jar" id="org.eclipse.ptp.remote.rse" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.pldt.upc_0.0.0.jar" id="org.eclipse.ptp.pldt.upc" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.pldt.fortran_0.0.0.jar" id="org.eclipse.ptp.pldt.fortran" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.etfw.tau_0.0.0.jar" id="org.eclipse.ptp.etfw.tau" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.etfw.tau.fortran_0.0.0.jar" id="org.eclipse.ptp.etfw.tau.fortran" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.etfw.ppw_0.0.0.jar" id="org.eclipse.ptp.etfw.ppw" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.sci_0.0.0.jar" id="org.eclipse.ptp.sci" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.sdk_0.0.0.jar" id="org.eclipse.ptp.sdk" version="0.0.0">
-		<category name="Parallel Tools Platform" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rdt_0.0.0.jar" id="org.eclipse.ptp.rdt" version="0.0.0">
-		<category name="Remote Development Tools" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rdt.xlc_0.0.0.jar" id="org.eclipse.ptp.rdt.xlc" version="0.0.0">
-		<category name="Remote Development Tools" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rdt.sync_0.0.0.jar" id="org.eclipse.ptp.rdt.sync" version="0.0.0">
-		<category name="Remote Development Tools" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rdt.sync.fortran_0.0.0.jar" id="org.eclipse.ptp.rdt.sync.fortran" version="0.0.0">
-		<category name="Remote Development Tools" />
-	</feature>
-	<feature url="features/org.eclipse.ptp.rdt.remotetools_0.0.0.jar" id="org.eclipse.ptp.rdt.remotetools" version="0.0.0">
-		<category name="Remote Development Tools" />
-	</feature>
-	<feature url="features/org.eclipse.photran_0.0.0.jar" id="org.eclipse.photran" version="0.0.0">
-		<category name="Fortran Development Tools (Photran)" />
-	</feature>
-	<feature url="features/org.eclipse.photran.intel_0.0.0.jar" id="org.eclipse.photran.intel" version="0.0.0" os="linux">
-		<category name="Fortran Development Tools (Photran)" />
-	</feature>
-	<feature url="features/org.eclipse.photran.xlf_0.0.0.jar" id="org.eclipse.photran.xlf" version="0.0.0">
-		<category name="Fortran Development Tools (Photran)" />
-	</feature>
-	<feature url="features/org.eclipse.rephraserengine_0.0.0.jar" id="org.eclipse.rephraserengine" version="0.0.0">
-		<category name="Fortran Development Tools (Photran)" />
-	</feature>
-</site>
diff --git a/releng/org.eclipse.ptp.repo/pom.xml b/releng/org.eclipse.ptp.repo/pom.xml
deleted file mode 100644
index ad9b499..0000000
--- a/releng/org.eclipse.ptp.repo/pom.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.eclipse.ptp</groupId>
-		<artifactId>ptp-parent</artifactId>
-		<version>6.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<version>6.0.0-SNAPSHOT</version>
-	<artifactId>org.eclipse.ptp.repo</artifactId>
-	<packaging>eclipse-repository</packaging>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-p2-publisher-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<publishArtifacts>true</publishArtifacts>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>production</id>
-			<properties>
-				<ptp-install>/home/data/httpd/download.eclipse.org/tools/ptp/builds/hudson/ptp-nightly</ptp-install>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.eclipse.dash.maven</groupId>
-						<artifactId>eclipse-signing-maven-plugin</artifactId>
-						<version>1.0.5-SNAPSHOT</version>
-						<executions>
-							<execution>
-								<id>pack</id>
-								<configuration>
-									<inputFile>${project.build.directory}/org.eclipse.ptp.repo.zip</inputFile>
-								</configuration>
-								<phase>package</phase>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>sign</id>
-								<configuration>
-									<inputFile>${project.build.directory}/packed/org.eclipse.ptp.repo.zip</inputFile>
-									<signerInputDirectory>/home/data/httpd/download-staging.priv/tools/ptp</signerInputDirectory>
-								</configuration>
-								<phase>package</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>repack</id>
-								<configuration>
-									<inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
-								</configuration>
-								<phase>package</phase>
-								<goals>
-									<goal>pack</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>fixCheckSums</id>
-								<configuration>
-									<inputFile>${project.build.directory}/packed/site_assembly.zip</inputFile>
-								</configuration>
-								<phase>package</phase>
-								<goals>
-									<goal>fixCheckSums</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>deploy</id>
-								<phase>install</phase>
-								<goals>
-									<goal>run</goal>
-								</goals>
-								<configuration>
-									<tasks>
-										<mkdir dir="${ptp-install}" />
-										<delete>
-											<fileset dir="${ptp-install}">
-												<include name="**" />
-											</fileset>
-										</delete>
-										<copy includeemptydirs="false" todir="${ptp-install}">
-											<fileset dir="${project.build.directory}/checksumFix">
-												<include name="**" />
-											</fileset>
-										</copy>
-										<zip basedir="${project.build.directory}/checksumFix" destfile="${ptp-install}/org.eclipse.ptp.repo.${unqualifiedVersion}.${buildQualifier}.zip" />
-										<copy todir="${ptp-install}">
-											<fileset dir="${basedir}/../../rdt/org.eclipse.ptp.rdt.core.remotejars">
-												<filename name="rdt-server-aix-${unqualifiedVersion}.tar" />
-												<filename name="rdt-server-linux-${unqualifiedVersion}.tar" />
-												<filename name="rdt-server-linux.ppc-${unqualifiedVersion}.tar" />
-												<filename name="rdt-server-linux.x86-${unqualifiedVersion}.tar" />
-												<filename name="rdt-server-macosx-${unqualifiedVersion}.tar" />
-												<filename name="rdt-server-unix-${unqualifiedVersion}.tar" />
-												<filename name="rdt-server-windows-${unqualifiedVersion}.zip" />
-											</fileset>
-										</copy>
-										<unzip src="${basedir}/../../releng/org.eclipse.ptp.aix.ppc/target/org.eclipse.ptp.aix.ppc-${project.version}.jar"
-											dest="${ptp-install}/proxy/org.eclipse.ptp.aix.ppc_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip src="${basedir}/../../releng/org.eclipse.ptp.linux.ppc/target/org.eclipse.ptp.linux.ppc-${project.version}.jar"
-											dest="${ptp-install}/proxy/org.eclipse.ptp.linux.ppc_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip src="${basedir}/../../releng/org.eclipse.ptp.linux.x86/target/org.eclipse.ptp.linux.x86-${project.version}.jar"
-											dest="${ptp-install}/proxy/org.eclipse.ptp.linux.x86_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip src="${basedir}/../../releng/org.eclipse.ptp.linux.x86_64/target/org.eclipse.ptp.linux.x86_64-${project.version}.jar"
-											dest="${ptp-install}/proxy/org.eclipse.ptp.linux.x86_64_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip src="${basedir}/../../releng/org.eclipse.ptp.macosx.ppc/target/org.eclipse.ptp.macosx.ppc-${project.version}.jar"
-											dest="${ptp-install}/proxy/org.eclipse.ptp.macosx.ppc_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip src="${basedir}/../../releng/org.eclipse.ptp.macosx.x86/target/org.eclipse.ptp.macosx.x86-${project.version}.jar"
-											dest="${ptp-install}/proxy/org.eclipse.ptp.macosx.x86_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip src="${basedir}/../../debug/org.eclipse.ptp.debug.sdm/target/org.eclipse.ptp.debug.sdm-${project.version}.jar"
-											dest="${ptp-install}/proxy/org.eclipse.ptp.debug.sdm_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip src="${basedir}/../../core/org.eclipse.ptp.proxy/target/org.eclipse.ptp.proxy-${project.version}.jar" dest="${ptp-install}/proxy/org.eclipse.ptp.proxy_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip src="${basedir}/../../core/org.eclipse.ptp.utils/target/org.eclipse.ptp.utils-${project.version}.jar" dest="${ptp-install}/proxy/org.eclipse.ptp.utils_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip
-											src="${basedir}/../../rms/org.eclipse.ptp.rm.ibm.ll.proxy/target/org.eclipse.ptp.rm.ibm.ll.proxy-${project.version}.jar"
-											dest="${ptp-install}/proxy/org.eclipse.ptp.rm.ibm.ll.proxy_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip
-											src="${basedir}/../../rms/org.eclipse.ptp.rm.ibm.pe.proxy/target/org.eclipse.ptp.rm.ibm.pe.proxy-${project.version}.jar"
-											dest="${ptp-install}/proxy/org.eclipse.ptp.rm.ibm.pe.proxy_${unqualifiedVersion}.${buildQualifier}" />
-										<unzip src="${basedir}/../../rms/org.eclipse.ptp.rm.slurm.proxy/target/org.eclipse.ptp.rm.slurm.proxy-${project.version}.jar"
-											dest="${ptp-install}/proxy/org.eclipse.ptp.rm.slurm.proxy_${unqualifiedVersion}.${buildQualifier}" />
-										<zip destfile="${ptp-install}/ptp-proxy-${unqualifiedVersion}-${buildQualifier}.zip">
-											<fileset dir="${ptp-install}">
-												<include name="proxy/**/*" />
-											</fileset>
-										</zip>
-									</tasks>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project
deleted file mode 100644
index 861eb7b..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.ibm.bluegene-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties
deleted file mode 100644
index 95b0993..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.properties
+++ /dev/null
@@ -1,148 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For Blue Gene
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the Blue Gene system
-
-# copyright
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-IBM Corporation - Initial API and implementation\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml
deleted file mode 100644
index 5806959..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.ibm.bluegene"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.remote"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.ibm.bluegene.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html b/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.ibm.bluegene-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/.project b/releng/org.eclipse.ptp.rm.lsf-feature/.project
deleted file mode 100644
index 4e56dff..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.lsf-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/build.properties b/releng/org.eclipse.ptp.rm.lsf-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties b/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties
deleted file mode 100644
index 05b6267..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For LSF
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for the LSF job scheduler
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml b/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml
deleted file mode 100644
index 8b8551f..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/feature.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.lsf"
-      label="%featureName"
-      version="2.0.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.remote"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.lsf.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.lsf-feature/license.html b/releng/org.eclipse.ptp.rm.lsf-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.lsf-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/.project b/releng/org.eclipse.ptp.rm.orte-feature/.project
deleted file mode 100644
index 5884ded..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.orte-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/build.properties b/releng/org.eclipse.ptp.rm.orte-feature/build.properties
deleted file mode 100644
index 279df8f..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               feature.properties,\
-               epl-v10.html
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html b/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/feature.properties b/releng/org.eclipse.ptp.rm.orte-feature/feature.properties
deleted file mode 100644
index 48c887f..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-#################################################################################
-# Copyright (c) 2005 The Regents of the University of California. 
-# This material was produced under U.S. Government contract W-7405-ENG-36 
-# for Los Alamos National Laboratory, which is operated by the University 
-# of California for the U.S. Department of Energy. The U.S. Government has 
-# rights to use, reproduce, and distribute this software. NEITHER THE 
-# GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR 
-# ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified 
-# to produce derivative works, such modified software should be clearly marked, 
-# so as not to confuse it with the version available from LANL.
-# 
-# Additionally, this program and the accompanying materials 
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# LA-CC 04-115
-#
-#################################################################################
-
-
-# "featureName" property - name of the feature
-featureName=PTP Support For Open MPI
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds support for Open MPI
-
-# copyright
-copyright=\
-Copyright (c) 2005 The Regents of the University of California.\n\
-This material was produced under U.S. Government contract W-7405-ENG-36\n\
-for Los Alamos National Laboratory, which is operated by the University\n\
-of California for the U.S. Department of Energy. The U.S. Government has\n\
-rights to use, reproduce, and distribute this software. NEITHER THE\n\
-GOVERNMENT NOR THE UNIVERSITY MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR\n\
-ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE. If software is modified\n\
-to produce derivative works, such modified software should be clearly marked,\n\
-so as not to confuse it with the version available from LANL.\n\
-\n\
-Additionally, this program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-LA-CC 04-115\n
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/feature.xml b/releng/org.eclipse.ptp.rm.orte-feature/feature.xml
deleted file mode 100644
index 89b2532..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/feature.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.orte"
-      label="%featureName"
-      version="2.0.1.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://eclipse.org/ptp">
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.rm.remote"/>
-      <import plugin="org.eclipse.ptp.utils"/>
-      <import plugin="org.eclipse.ptp.proxy"/>
-      <import plugin="org.eclipse.ptp.ui"/>
-      <import plugin="org.eclipse.ptp.launch"/>
-      <import plugin="org.eclipse.ptp.remote.core"/>
-      <import plugin="org.eclipse.ptp.remote.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.proxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.orte.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/releng/org.eclipse.ptp.rm.orte-feature/license.html b/releng/org.eclipse.ptp.rm.orte-feature/license.html
deleted file mode 100644
index c6af966..0000000
--- a/releng/org.eclipse.ptp.rm.orte-feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
-   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-		
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>	
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/releng/org.eclipse.ptp.rm.pbs-feature/.project b/releng/org.eclipse.ptp.rm.pbs-feature/.project
deleted file mode 100644
index 810b6ef..0000000
--- a/releng/org.eclipse.ptp.rm.pbs-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.ptp.rm.pbs-feature/build.properties b/releng/org.eclipse.ptp.rm.pbs-feature/build.properties
deleted file mode 100644
index b3a611b..0000000
--- a/releng/org.eclipse.ptp.rm.pbs-feature/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
-               feature.properties
diff --git a/releng/org.eclipse.ptp.rm.pbs-feature/feature.properties b/releng/org.eclipse.ptp.rm.pbs-feature/feature.properties
deleted file mode 100644
index 3029c64..0000000
--- a/releng/org.eclipse.ptp.rm.pbs-feature/feature.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#################################################################################
-# Copyright (c) 2010 University of Illinois 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
-#################################################################################
-
-# "featureName" property - name of the feature
-featureName=PTP Resource Manager for PBS (Legacy)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse PTP
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse PTP Update Site
-
-# "description" property - description of the feature
-description=Adds a legacy resource manager and support for the PBS job scheduler.
-
-# copyright
-copyright=\
-Copyright (c) 2010 University of Illinois 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
diff --git a/releng/org.eclipse.ptp.rm.pbs-feature/feature.xml b/releng/org.eclipse.ptp.rm.pbs-feature/feature.xml
deleted file mode 100644
index 20d7ab5..0000000
--- a/releng/org.eclipse.ptp.rm.pbs-feature/feature.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.ptp.rm.pbs"
-      label="%featureName"
-      version="5.0.0.qualifier"
-      plugin="org.eclipse.ptp.rm.pbs.core"
-      provider-name="%providerName"
-      license-feature="org.eclipse.ptp.license"
-      license-feature-version="1.0.0.qualifier">
-
-   <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/updates/indigo"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.ptp.services.core" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.proxy.protocol"/>
-      <import plugin="org.eclipse.ptp.core"/>
-      <import plugin="org.eclipse.ptp.remote.core" version="2.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.core" version="1.0.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.services.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.remote.ui"/>
-      <import plugin="org.eclipse.ptp.utils.ui" version="1.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.ui" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.launch" version="3.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ptp.rm.ui" version="1.0.1" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.ptp.rm.pbs.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.pbs.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.pbs.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.pbs.jproxy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.ptp.rm.pbs.core.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/rms/org.eclipse.ptp.rm.jaxb.openmpi/.project b/rms/org.eclipse.ptp.rm.jaxb.openmpi/.project
deleted file mode 100644
index 66d893b..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.jaxb.openmpi</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<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>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.jaxb.openmpi/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.jaxb.openmpi/META-INF/MANIFEST.MF
deleted file mode 100644
index 9227703..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.jaxb.openmpi;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.eclipse.ptp.rm.jaxb.core;bundle-version="1.0.0"
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/rms/org.eclipse.ptp.rm.jaxb.openmpi/about.html b/rms/org.eclipse.ptp.rm.jaxb.openmpi/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.openmpi/about.ini b/rms/org.eclipse.ptp.rm.jaxb.openmpi/about.ini
deleted file mode 100644
index 5bd1def..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/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=ptp_logo_icon32.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.jaxb.openmpi/about.mappings b/rms/org.eclipse.ptp.rm.jaxb.openmpi/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/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.jaxb.openmpi/about.properties b/rms/org.eclipse.ptp.rm.jaxb.openmpi/about.properties
deleted file mode 100644
index 7a64224..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/about.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#################################################################################
-# Copyright (c) 2011 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 
-#################################################################################
-
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-blurb=PTP Resource Manager for Open MPI\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2011 IBM Corporation.  All rights reserved.\n\
-Visit http://www.eclipse.org/ptp\n
-
diff --git a/rms/org.eclipse.ptp.rm.jaxb.openmpi/build.properties b/rms/org.eclipse.ptp.rm.jaxb.openmpi/build.properties
deleted file mode 100644
index a10dba8..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = META-INF/,\
-               plugin.xml,\
-               data/,\
-               plugin.properties,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               ptp_logo_icon32.png
diff --git a/rms/org.eclipse.ptp.rm.jaxb.openmpi/data/openmpi-generic.xml b/rms/org.eclipse.ptp.rm.jaxb.openmpi/data/openmpi-generic.xml
deleted file mode 100644
index 6714e29..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/data/openmpi-generic.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 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 -->
-<!-- * -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="pbs-generic-interactive">
-	<control-data>
-		<!-- this is a necessary property for the functioning of LML; link it to the batch-specific variable name -->
-		<property name="control.queue.name" visible="false">
-			<link-value-to>destination</link-value-to>
-		</property>
-		<property name="ompi_minor_version" visible="false" type="integer"/>
-		<property name="local_prefix" visible="false" type="string">
-			<default>/usr/local/mpi/bin/</default>
-		</property>
-		<attribute name="numProcs" min="1" type="integer"/>
-		<attribute name="byNodeOption" type="boolean"/>
-		<attribute name="bySlotOption" type="boolean"/>
-		<attribute name="noOversubscribeOption" type="boolean"/>
-		<attribute name="noLocalOption" type="boolean"/>
-		<attribute name="prefixOption" type="boolean"/>
-		<attribute name="prefix" type="string"/>
-		<!--managed-files>
-			<file-staging-location>${ptp_rm:directory#value}</file-staging-location>
-			<file name="generate_routing_table">
-				<contents>
-<![CDATA[
-#!/usr/bin/perl
-]]>
-				</contents>
-			</file>
-		</managed-files-->
-		<start-up-command name="ompi_info">
-			<arg>${ptp_rm:local_prefix#value}ompi_info</arg>
-			<arg>-a</arg>
-			<arg>--parseable</arg>
-			<stdout-parser delim="\n">
-				<!--target type="attribute" allowOverwrites="true">
-					<match>
-						<expression>mca:.*:param:([^:]*):value:(.*)</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="visible">
-							<entry value="true"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-					<match>
-						<expression>mca:.*:param:([^:]*):status:(.*)</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="status">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-					<match>
-						<expression>mca:.*:param:([^:]*):help:(.*)</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="tooltip">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-					<test op="EQ">
-						<value>#status</value>
-						<value>read-only</value>
-						<set field="readOnly">
-							<entry value="true"/>
-						</set>
-						<else>
-							<set field="readOnly">
-								<entry value="false"/>
-							</set>
-						</else>
-					</test>
-				</target-->
-				<target type="attribute">
-					<match>
-						<expression>ompi:version:full:[\d]+\.([\d]+).*</expression>
-						<set field="name">
-							<entry value="ompi_minor_version"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-					<test op="LT">
-						<value>#value</value>
-						<value>7</value>
-						<throw message="Only supports Open MPI 1.7 and later"/>
-					</test>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<submit-interactive name="submit-interactive" directory="${ptp_rm:directory#value}" waitForId="true" keepOpen="true">
-			<arg>${ptp_rm:local_prefix#value}mpirun</arg>
-			<arg>--report-pid</arg>
-			<arg>-np</arg>
-			<arg>${ptp_rm:numProcs#value}</arg>
-			<arg>${ptp_rm:executablePath#value}</arg>
-			<arg>${ptp_rm:progArgs#value}</arg>
-			<stdout-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>^mpirun pid: ([\d]+)$</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry value="RUNNING"/>
-						</set>
-					</match>
-				</target>
-				<exit-after>^([\d]+)$</exit-after>
-			</stdout-parser>
-			<stderr-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.+</expression>
-						<set field="name">
-							<entry value="${ptp_rm:@jobId#name}"/>
-						</set>
-						<set field="value">
-							<entry value="FAILED"/>
-						</set>
-					</match>
-				</target>
-			</stderr-parser>
-		</submit-interactive>
-		<submit-interactive-debug name="submit-interactive-debug" directory="${ptp_rm:directory#value}" waitForId="true" keepOpen="true">
-			<arg>${ptp_rm:local_prefix#value}mpirun</arg>
-			<arg>--report-pid</arg>
-			<arg>-np</arg>
-			<arg>${ptp_rm:numProcs#value}</arg>
-			<arg>${ptp_rm:debuggerExecutablePath#value}</arg>
-			<arg>${ptp_rm:debuggerArgs#value}</arg>
-			<stdout-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>^([\d]+)$</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry value="RUNNING"/>
-						</set>
-					</match>
-				</target>
-				<exit-after>^([\d]+)$</exit-after>
-			</stdout-parser>
-			<stderr-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.+</expression>
-						<set field="name">
-							<entry value="${ptp_rm:@jobId#name}"/>
-						</set>
-						<set field="value">
-							<entry value="FAILED"/>
-						</set>
-					</match>
-				</target>
-			</stderr-parser>
-			<cmd exec="${ptp_rm:debuggerExecutablePath#value} --master" wait="false"/>
-			<cmd exec="${ptp_rm:directory#value}/generate_routing_table" wait="true"/>
-		</submit-interactive-debug>		
-		<launch-tab>
-			<dynamic>
-				<title>Basic Open MPI</title>
-				<layout>
-					<grid-layout numColumns="1"/>
-				</layout>
-				<composite>
-					<layout>
-						<grid-layout numColumns="2"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT">
-						<fixed-text>Number of processes:</fixed-text>
-					</widget>
-					<widget type="spinner" style="SWT.BORDER" readOnly="false" saveValueTo="numProcs">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.LEFT" verticalAlign="SWT.CENTER"
-								grabExcessHorizontal="false" grabExcessVertical="false"/>
-						</layout-data>
-					</widget>
-				</composite>
-				<!-- Options group -->
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="4"/>
-					</layout>
-					<layout-data>
-						<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="true"/>
-					</layout-data>
-					<title>Options</title>
-					<widget type="checkbox" title="By node" saveValueTo="byNodeOption"/>
-					<widget type="checkbox" title="By slot" saveValueTo="bySlotOption"/>
-					<widget type="checkbox" title="No oversubscribe" saveValueTo="noOversubscribeOption"/>
-					<widget type="checkbox" title="No local" saveValueTo="noLocalOption"/>
-					<widget type="checkbox" title="Prefix:" buttonId="prefixButton" saveValueTo="prefixOption"/>
-					<widget type="text" style="SWT.BORDER" saveValueTo="prefix">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="3" grabExcessHorizontal="true"/>
-						</layout-data>
-						<control-state>
-							<enable-if button="prefixButton" selected="true"/>
-						</control-state>
-					</widget>
-				</composite>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false"/>
-					</layout>
-					<layout-data>
-						<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.FILL"  grabExcessHorizontal="true" grabExcessVertical="true"/>
-					</layout-data>
-					<title>Hosts</title>
-					<widget type="checkbox" title="Host file:" buttonId="hostFileButton" saveValueTo="useHostFile"/>
-					<browse textStyle="SWT.BORDER" title="Browse">
-						<text-layout-data>
-							<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.CENTER" grabExcessHorizontal="true"/>
-						</text-layout-data>
-						<button-layout-data>
-							<grid-data horizontalAlign="SWT.RIGHT" verticalAlign="SWT.CENTER"/>
-						</button-layout-data>
-						<text-control-state>
-							<enable-if button="hostFileButton" selected="true"/>
-						</text-control-state>
-						<button-control-state>
-							<enable-if button="hostFileButton" selected="true"/>
-						</button-control-state>
-					</browse>					
-					<widget type="checkbox" title="Host list:" buttonId="hostListButton" saveValueTo="useHostList">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.LEFT" verticalAlign="SWT.TOP"/>
-						</layout-data>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="host_list">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.FILL" horizontalSpan="2" 
-								grabExcessHorizontal="true" grabExcessVertical="true"/>
-						</layout-data>
-						<control-state>
-							<enable-if button="hostListButton" selected="true"/>
-						</control-state>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic>
-				<title>Advanced Open MPI</title>
-				<layout>
-					<grid-layout numColumns="1"/>
-				</layout>
-				<composite>
-					<layout>
-						<grid-layout numColumns="1"/>
-					</layout>
-					<layout-data>
-						<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="true"/>
-					</layout-data>
-					<!-- Launch group -->
-					<composite group="true">
-						<layout>
-							<grid-layout numColumns="2" makeColumnsEqualWidth="false"/>
-						</layout>
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="true" grabExcessVertical="false"/>
-						</layout-data>
-						<title>Launch Arguments</title>
-						<widget type="checkbox" title="Use default arguments" saveValueTo="useDefaultAguments">
-							<layout-data>
-								<grid-data horizontalSpan="2"/>
-							</layout-data>
-						</widget>
-						<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-							<fixed-text>Arguments:</fixed-text>
-						</widget>
-						<widget type="text" readOnly="true" style="SWT.LEFT | SWT.BORDER">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="true" grabExcessVertical="false" widthHint="400"/>
-							</layout-data>
-							<dynamic-text>
-								<arg>${ptp_rm:allAttributes#value}</arg>
-							</dynamic-text>
-						</widget>
-					</composite>
-					<!-- MCA group -->
-					<composite group="true">
-						<layout>
-							<grid-layout numColumns="1"/>
-						</layout>
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="true"/>
-						</layout-data>
-						<title>MCA Parameters</title>
-						<viewer name="allAttributes" style="SWT.BORDER | SWT.MULTI" sort="true" type="table">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="true"/>
-							</layout-data>
-							<column-data name="Name" width="175">
-								<tooltip>Double-click on selected rows toggles their checked value.</tooltip>
-							</column-data>
-							<column-data name="Value" width="200">
-								<tooltip>Click to activate value widget.</tooltip>
-							</column-data>
-							<items allDiscovered="true">
-							</items>
-							<value pattern="-mca @name &quot;@value&quot;"/>
-						</viewer>
-					</composite>
-				</composite>
-			</dynamic>
-		</launch-tab>
-	</control-data>
-	<monitor-data schedulerType="OPENMPI">
-	</monitor-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.openmpi/plugin.properties b/rms/org.eclipse.ptp.rm.jaxb.openmpi/plugin.properties
deleted file mode 100644
index 53ef4db..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 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 Open MPI Resource Manager Configuration
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.jaxb.openmpi/plugin.xml b/rms/org.eclipse.ptp.rm.jaxb.openmpi/plugin.xml
deleted file mode 100644
index e2920f9..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.rm.jaxb.core.JAXBResourceManagerConfigurations">
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/openmpi-generic.xml"
-            name="Open MPI-Generic">
-      </JAXBResourceManagerConfiguration>
-   </extension>
-
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.jaxb.openmpi/pom.xml b/rms/org.eclipse.ptp.rm.jaxb.openmpi/pom.xml
deleted file mode 100644
index 7d92412..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse.ptp</groupId>
-    <artifactId>ptp-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.ptp.rm.jaxb.openmpi</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/rms/org.eclipse.ptp.rm.jaxb.openmpi/ptp_logo_icon32.png b/rms/org.eclipse.ptp.rm.jaxb.openmpi/ptp_logo_icon32.png
deleted file mode 100644
index e8ec572..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.openmpi/ptp_logo_icon32.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/.classpath b/rms/org.eclipse.ptp.rm.jaxb.tests/.classpath
deleted file mode 100644
index c0b0b1f..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="eclipse"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/.project b/rms/org.eclipse.ptp.rm.jaxb.tests/.project
deleted file mode 100644
index 36f1ae3..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.jaxb.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/rms/org.eclipse.ptp.rm.jaxb.tests/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.jaxb.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 87a0234..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Sat Feb 12 11:12:54 CST 2011
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.jaxb.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index e5fdb17..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.jaxb.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.jaxb.tests.JAXBTestsPlugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.ui,
- org.eclipse.core.filesystem,
- org.eclipse.search,
- org.eclipse.ptp.services.core;bundle-version="1.0.0",
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.core,
- org.eclipse.ptp.rm.core,
- javax.xml;bundle-version="1.3.4",
- javax.xml.bind;bundle-version="2.1.9",
- org.eclipse.cdt.debug.core;bundle-version="7.1.0",
- org.junit;bundle-version="3.8.2",
- org.eclipse.ptp.rm.jaxb.core;bundle-version="1.0.0",
- org.eclipse.ptp.rm.jaxb.ui;bundle-version="1.0.0",
- org.eclipse.core.variables;bundle-version="3.2.400",
- org.eclipse.ptp.rm.jaxb.control.core;bundle-version="1.0.0",
- org.eclipse.ptp.rm.lml.monitor.core;bundle-version="1.0.0",
- org.eclipse.ptp.rm.lml_jaxb;bundle-version="1.0.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %pluginProvider
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/build.properties b/rms/org.eclipse.ptp.rm.jaxb.tests/build.properties
deleted file mode 100644
index ede7561..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = eclipse/
-bin.includes = META-INF/,\
-               .,\
-               data/,\
-               plugin.xml
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/browse-example.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/browse-example.xml
deleted file mode 100644
index 60680be..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/browse-example.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="resource_manager_type.xsd" name="browse-example">
-   <control-data>
-      <property name="path1" visible="true"/>
-      <property name="path2" visible="true"/>
-      <property name="path3" visible="true"/>
-      <property name="path4" visible="true"/>
-      <submit-interactive name="submit-interactive">
-         <arg>echo</arg>
-         <arg>$VAR_1</arg>
-         <arg>$VAR_2</arg>
-         <arg>$VAR_3</arg>
-         <arg>$VAR_4</arg>
-         <environment name="VAR_1" value="${ptp_rm:path1#value}"/>
-         <environment name="VAR_2" value="${ptp_rm:path2#value}"/>
-         <environment name="VAR_3" value="${ptp_rm:path3#value}"/>
-         <environment name="VAR_4" value="${ptp_rm:path4#value}"/>
-      </submit-interactive>
-      <launch-tab>
-         <dynamic includeWidgetValuesFrom="Cores">
-            <title>Paths</title>
-            <layout>
-               <grid-layout/>
-            </layout>
-            <composite>
-               <layout>
-                  <grid-layout numColumns="4" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-               </layout>
-               <layout-data>
-                  <grid-data horizontalSpan="4" widthHint="700"/>
-               </layout-data>
-               <!-- row 1 -->
-               <widget type="label" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-                  </layout-data>
-                  <tooltip>Browse for a file or directory, return the URI</tooltip>
-                  <fixed-text>Browse URI: </fixed-text>
-               </widget>
-               <browse uri="true" textStyle="SWT.BORDER" readOnly="false" title="Browse" saveValueTo="path1">
-                  <text-layout-data>
-                     <grid-data horizontalAlign="SWT.FILL" widthHint="200" horizontalSpan="2" grabExcessHorizontal="true"/>
-                  </text-layout-data>
-                  <button-layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" widthHint="100" horizontalSpan="1" grabExcessHorizontal="false"/>
-                  </button-layout-data>
-               </browse>
-               <!-- row 2 -->
-               <widget type="label" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-                  </layout-data>
-                  <tooltip>Browse for only a directory, return the path</tooltip>
-                  <fixed-text>Browse Dir Path: </fixed-text>
-               </widget>
-               <browse uri="false" directory="true" textStyle="SWT.BORDER" readOnly="true" title="Browse" saveValueTo="path2">
-                  <text-layout-data>
-                     <grid-data horizontalAlign="SWT.FILL" widthHint="200" horizontalSpan="2" grabExcessHorizontal="true"/>
-                  </text-layout-data>
-                  <button-layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" widthHint="100" horizontalSpan="1" grabExcessHorizontal="false"/>
-                  </button-layout-data>
-               </browse>
-               <!-- row 3 -->
-               <widget type="label" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-                  </layout-data>
-                  <tooltip>Browse for only local files or directories</tooltip>
-                  <fixed-text>Browse Local File: </fixed-text>
-               </widget>
-               <browse textStyle="SWT.BORDER | SWT.H_SCROLL" readOnly="true" localOnly="true" title="Browse" saveValueTo="path3">
-                  <text-layout-data>
-                     <grid-data horizontalAlign="SWT.FILL" widthHint="200" horizontalSpan="2" grabExcessHorizontal="true"/>
-                  </text-layout-data>
-                  <button-layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" widthHint="100" horizontalSpan="1" grabExcessHorizontal="false"/>
-                  </button-layout-data>
-               </browse>
-               <!-- row 4 -->
-               <widget type="label" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-                  </layout-data>
-                   <tooltip>Browse for only local directories, return URI</tooltip>
-                  <fixed-text>Browse Local Dir URI: </fixed-text>
-               </widget>
-               <browse directory="true" uri="true" textStyle="SWT.BORDER" readOnly="true" localOnly="true" title="Browse" saveValueTo="path4">
-                  <text-layout-data>
-                     <grid-data horizontalAlign="SWT.FILL" widthHint="200" horizontalSpan="2" grabExcessHorizontal="true"/>
-                  </text-layout-data>
-                  <button-layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" widthHint="100" horizontalSpan="1" grabExcessHorizontal="false"/>
-                  </button-layout-data>
-               </browse>
-            </composite>
-         </dynamic>
-      </launch-tab>
-   </control-data>
-   <monitor-data schedulerType="PBS"/>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/button-group-example.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/button-group-example.xml
deleted file mode 100644
index 7f5cf8b..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/button-group-example.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="button-group-example">
-	<control-data>
-		<attribute name="logResults" translateBooleanAs="1,0">
-			<description>Does nothing; for testing boolean value translation.</description>
-		</attribute>
-		<attribute name="numCores" min="1" type="integer">
-			<default>1</default>
-		</attribute>
-		<script>
-			<line>
-				<arg isUndefinedIfMatches="logResults:">logResults: ${ptp_rm:logResults#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="numCores">numCores: ${ptp_rm:numCores#value}</arg>
-			</line>
-		</script>
-		<launch-tab>
-			<dynamic>
-				<title>Cores</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<!-- row 1 -->
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Log results: </fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="logResults" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<!-- row 2 -->
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>MPI Number of Cores: </fixed-text>
-					</widget>
-					<button-group saveValueTo="numCores" group="true">
-						<layout>
-							<row-layout type="SWT.VERTICAL" center="true" fill="true" justify="true"/>
-						</layout>
-						<button type="radiobutton" title="1"/>
-						<button type="radiobutton" title="2"/>
-						<button type="radiobutton" title="3"/>
-						<button type="radiobutton" title="4"/>
-						<button type="radiobutton" title="5"/>
-						<button type="radiobutton" title="6"/>
-						<button type="radiobutton" title="7"/>
-						<button type="radiobutton" title="8"/>
-					</button-group>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-		</launch-tab>
-	</control-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/control-state-example.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/control-state-example.xml
deleted file mode 100644
index 7897a40..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/control-state-example.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="control-state-example">
-	<control-data>
-		<property name="checked00" visible="false"/>
-		<property name="checked01" visible="false"/>
-		<property name="checked10" visible="false"/>
-		<property name="checked11" visible="false"/>
-		<property name="saved" visible="true"/>
-		<launch-tab>
-			<dynamic>
-				<title>Basic 0</title>
-				<layout>
-					<grid-layout numColumns="3"/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3"/>
-					</layout>
-					<layout-data>
-						<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.FILL" grabExcessHorizontal="true" grabExcessVertical="true"
-							horizontalSpan="2"/>
-					</layout-data>
-					<title>Hosts</title>
-					<widget type="checkbox" buttonId="001" title="Host file:" saveValueTo="checked00"/>
-					<browse textStyle="SWT.BORDER" title="Browse">
-						<text-layout-data>
-							<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.CENTER" grabExcessHorizontal="true"/>
-						</text-layout-data>
-						<button-layout-data>
-							<grid-data horizontalAlign="SWT.RIGHT" verticalAlign="SWT.CENTER"/>
-						</button-layout-data>
-						<text-control-state>
-							<enable-if button="001" selected="true"/>
-						</text-control-state>
-						<button-control-state>
-							<enable-if button="001" selected="true"/>
-						</button-control-state>
-					</browse>
-					<!-- <widget type="checkbox" buttonId="002" title="Host list:" saveValueTo="w01"> -->
-					<widget type="checkbox" buttonId="002" title="Host list:" saveValueTo="checked01">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.LEFT" verticalAlign="SWT.TOP"/>
-						</layout-data>
-						<control-state>
-							<show-if button="001" selected="true"/>
-						</control-state>
-					</widget>
-					<widget type="text" style="SWT.V_SCROLL | SWT.BORDER" saveValueTo="saved">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="true"
-								grabExcessVertical="true"/>
-						</layout-data>
-						<control-state>
-							<show-if button="001" selected="true"/>
-							<enable-if>
-								<and>
-									<rule button="001" selected="true"/>
-									<rule button="002" selected="true"/>
-								</and>
-							</enable-if>
-						</control-state>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic>
-				<title>Basic 1</title>
-				<layout>
-					<grid-layout numColumns="3"/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3"/>
-					</layout>
-					<layout-data>
-						<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.FILL" grabExcessHorizontal="true" grabExcessVertical="true"
-							horizontalSpan="2"/>
-					</layout-data>
-					<title>Hosts</title>
-					<widget type="checkbox" buttonId="011" title="Host file:" saveValueTo="checked10"/>
-					<browse textStyle="SWT.BORDER" title="Browse">
-						<text-layout-data>
-							<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.CENTER" grabExcessHorizontal="true"/>
-						</text-layout-data>
-						<button-layout-data>
-							<grid-data horizontalAlign="SWT.RIGHT" verticalAlign="SWT.CENTER"/>
-						</button-layout-data>
-						<text-control-state>
-							<enable-if button="011" selected="true"/>
-						</text-control-state>
-						<button-control-state>
-							<enable-if button="011" selected="true"/>
-						</button-control-state>
-					</browse>
-					<widget type="checkbox" buttonId="012" title="Host list:" saveValueTo="checked11">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.LEFT" verticalAlign="SWT.TOP"/>
-						</layout-data>
-						<control-state>
-							<show-if button="011" selected="true"/>
-						</control-state>
-					</widget>
-					<widget type="text" style="SWT.V_SCROLL | SWT.BORDER">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="true"
-								grabExcessVertical="true"/>
-						</layout-data>
-						<control-state>
-							<show-if button="011" selected="true"/>
-							<enable-if>
-								<and>
-									<rule button="011" selected="true"/>
-									<rule button="012" selected="true"/>
-								</and>
-							</enable-if>
-						</control-state>
-					</widget>
-				</composite>
-			</dynamic>
-		</launch-tab>
-	</control-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/demo-example-with-action.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/demo-example-with-action.xml
deleted file mode 100644
index aa9468c..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/demo-example-with-action.xml
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="demo-example-full">
-	<control-data>
-		<!-- this is a necessary property for the functioning of LML; link it to the batch-specific variable name -->
-		<property name="control.queue.name" visible="false">
-			<link-value-to>destination</link-value-to>
-		</property>
-		<!-- we set this to invisible because the values are not really modifiable -->
-		<property name="queues" visible="false"/>
-		<!-- needed by RM internals for fetch; name is fixed by convention -->
-		<property name="stdout_remote_path" visible="false">
-			<default>${ptp_rm:directory#value}/${ptp_rm:Job_Name#value}.o${ptp_rm:@jobId#default}</default>
-			<link-value-to>Output_Path</link-value-to>
-		</property>
-		<!-- needed by RM internals for fetch; name is fixed by convention -->
-		<property name="stderr_remote_path" visible="false">
-			<default>${ptp_rm:directory#value}/${ptp_rm:Job_Name#value}.e${ptp_rm:@jobId#default}</default>
-			<link-value-to>Error_Path</link-value-to>
-		</property>
-		<property name="local.input.file" visible="true"/>
-		<property name="remote.input.files" visible="false"/>
-		<attribute name="remote.input.file" visible="true" type="choice">
-			<items-from>remote.input.files</items-from>
-		</attribute>
-		<attribute name="mpiCommand" type="string">
-			<description>Which mpi command to use.</description>
-		</attribute>
-		<attribute name="mpiCores" min="1" type="integer">
-			<description>the '-np' value</description>
-		</attribute>
-		<attribute name="destination" type="string">
-			<description>Designation of the queue to which to submit the job.</description>
-		</attribute>
-		<attribute name="Error_Path" type="string">
-			<description>The final path name for the file containing the job's standard error stream.</description>
-		</attribute>
-		<attribute name="Job_Name" type="string">
-			<description>The name assigned to the job by the qsub or qalter command.</description>
-			<default>ptp_job</default>
-			<validator>
-				<regex expression="[a-zA-Z_][0-9a-zA-Z_]*"/>
-				<error-message>must be at least one alphanumeric character</error-message>
-			</validator>
-		</attribute>
-		<attribute name="Output_Path" type="string">
-			<description>The final path name for the file containing the job's standard output stream.</description>
-		</attribute>
-		<attribute name="Resource_List.mem" type="string">
-			<description>Maximum amount of memory used by all concurrent processes in the job.</description>
-		</attribute>
-		<attribute name="Resource_List.nodes" type="string">
-			<description>Number and/or type of nodes to be reserved for exclusive use by the job.</description>
-			<default>1</default>
-		</attribute>
-		<attribute name="Resource_List.walltime" type="string">
-			<description>Maximum amount of real time during which the job can be in the running state.</description>
-			<default>00:30:00</default>
-			<validator>
-				<regex expression="\d\d:\d\d:\d\d"/>
-				<error-message>format must be hh:mm:ss</error-message>
-			</validator>
-		</attribute>
-		<managed-files>
-			<file-staging-location>.eclipsesettings</file-staging-location>
-			<file name="menu.input">
-				<path>${ptp_rm:local.input.file#value}</path>
-			</file>
-		</managed-files>
-		<script>
-			<line>
-				<arg>#!/bin/bash</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -q">#PBS -q ${ptp_rm:destination#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -e">#PBS -e ${ptp_rm:Error_Path#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -N">#PBS -N ${ptp_rm:Job_Name#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -o">#PBS -o ${ptp_rm:Output_Path#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l mem=">#PBS -l mem=${ptp_rm:Resource_List.mem#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l nodes=">#PBS -l nodes=${ptp_rm:Resource_List.nodes#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l walltime=">#PBS -l walltime=${ptp_rm:Resource_List.walltime#value}</arg>
-			</line>
-			<line>
-				<arg>#PBS -V</arg>
-			</line>
-			<line>
-				<arg>MPI_ARGS="-np ${ptp_rm:mpiCores#value}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">if [ "-np" == "${MPI_ARGS}" ] ; then</arg>
-			</line>
-			<line>
-				<arg resolve="false"> MPI_ARGS=</arg>
-			</line>
-			<line>
-				<arg resolve="false">fi</arg>
-			</line>
-			<line>
-				<arg>COMMAND=${ptp_rm:mpiCommand#value}</arg>
-			</line>
-			<line>
-				<arg resolve="false">if [ -n "${COMMAND}" ] ; then</arg>
-			</line>
-			<line>
-				<arg resolve="false"> COMMAND="${COMMAND} ${MPI_ARGS}</arg>
-				<arg>${ptp_rm:executablePath#value} ${ptp_rm:progArgs#value}</arg>
-				<arg resolve="false">${INPUT}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">else</arg>
-			</line>
-			<line>
-				<arg> COMMAND="${ptp_rm:executablePath#value} ${ptp_rm:progArgs#value}</arg>
-				<arg resolve="false">${INPUT}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">fi</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="cd">cd ${ptp_rm:directory#value}</arg>
-			</line>
-			<line>
-				<arg>env</arg>
-				<arg>&gt;</arg>
-				<arg>ENV</arg>
-			</line>
-			<line>
-				<arg resolve="false">${COMMAND}</arg>
-			</line>
-		</script>
-		<start-up-command name="get-queues">
-			<arg>qstat</arg>
-			<arg>-Q</arg>
-			<arg>-f</arg>
-			<stdout-parser delim="\n">
-				<target ref="queues">
-					<match>
-						<expression>Queue: ([\w\d]+)</expression>
-						<add field="value">
-							<entry valueGroup="1"/>
-						</add>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<submit-batch name="submit-batch" waitForId="true">
-			<arg>qsub</arg>
-			<arg>${ptp_rm:managed_file_for_script#value}</arg>
-			<environment name="INPUT">
-				<arg isUndefinedIfMatches="-f">-f ${ptp_rm:remote.input.file#value}</arg>
-			</environment>
-			<environment name="INPUT">
-				<arg isUndefinedIfMatches="-f">-f ${ptp_rm:menu.input#value}</arg>
-			</environment>
-			<stdout-parser delim="\n" all="true" save="1">
-				<target ref="@jobId">
-					<match>
-						<expression>([\d]+)([.])(.+)[\s]+.*</expression>
-						<append field="name">
-							<entry valueGroup="1"/>
-							<entry valueGroup="2"/>
-							<entry valueGroup="3"/>
-						</append>
-						<set field="default">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry value="SUBMITTED"/>
-						</set>
-					</match>
-					<match>
-						<expression>([\d]+)[.].+</expression>
-						<set field="name">
-							<entry valueGroup="0"/>
-						</set>
-						<set field="default">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry value="SUBMITTED"/>
-						</set>
-					</match>
-				</target>
-				<target ref="@jobId">
-					<match>
-						<expression flags="DOTALL">.*Job not submitted.*</expression>
-						<set field="value">
-							<entry value="FAILED"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-			<stderr-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.*Job not submitted.*</expression>
-						<throw message="Job Submit Failed"/>
-					</match>
-				</target>
-			</stderr-parser>
-		</submit-batch>
-		<get-job-status name="get-job-status" ignoreExitStatus="true">
-			<arg>qstat</arg>
-			<arg>${ptp_rm:@jobId#name}</arg>
-			<stdout-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>[\d]+[.].+[\s]+.+[\s]+.+[\s]+.+[\s]+([A-Z])[\s]+.+</expression>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-					<test op="EQ">
-						<value>#value</value>
-						<value>Q</value>
-						<set field="value">
-							<entry value="QUEUED_ACTIVE"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>R</value>
-						<set field="value">
-							<entry value="RUNNING"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>S</value>
-						<set field="value">
-							<entry value="SUSPENDED"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>C</value>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>E</value>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>H</value>
-						<set field="value">
-							<entry value="SYSTEM_ON_HOLD"/>
-						</set>
-					</test>
-				</target>
-			</stdout-parser>
-			<stderr-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.+</expression>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</match>
-				</target>
-			</stderr-parser>
-		</get-job-status>
-		<terminate-job name="cancel" ignoreExitStatus="true">
-			<arg>qdel</arg>
-			<arg>${ptp_rm:@jobId#name}</arg>
-		</terminate-job>
-		<button-action name="get-input">
-			<arg>ls</arg>
-			<arg>-l</arg>
-			<arg>${ptp_rm:directory#value}/input</arg>
-			<stdout-parser delim="\n">
-				<target ref="remote.input.files">
-					<match>
-						<expression>[-drwx+@]+.+[\d:]+[\s]+(.+)</expression>
-						<add field="value">
-							<entry valueGroup="1"/>
-						</add>
-					</match>
-				</target>
-			</stdout-parser>
-		</button-action>
-		<launch-tab>
-			<dynamic>
-				<title>Demo Example</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite>
-					<layout>
-						<fill-layout type="SWT.HORIZONTAL"/>
-					</layout>
-					<composite group="true">
-						<layout>
-							<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-						</layout>
-						<!-- row 1 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Job Name: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Job_Name">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-						<!-- row 2 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Queue: </fixed-text>
-						</widget>
-						<widget type="combo" style="SWT.BORDER" readOnly="true" saveValueTo="destination">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false"/>
-							</layout-data>
-							<items-from>queues</items-from>
-						</widget>
-						<!-- row 3 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Wallclock Time: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Resource_List.walltime">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-						<!-- row 4 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Number of nodes: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Resource_List.nodes">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-						<!-- row 5 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Total Memory Needed: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Resource_List.mem">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-					</composite>
-					<composite group="true">
-						<layout>
-							<grid-layout numColumns="2" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-						</layout>
-						<!-- row 1 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>MPI Command: </fixed-text>
-						</widget>
-						<button-group saveValueTo="mpiCommand" group="true">
-							<layout>
-								<row-layout type="SWT.HORIZONTAL" center="true" fill="true" justify="true"/>
-							</layout>
-							<button type="radiobutton" title=""/>
-							<button type="radiobutton" title="mpiexec"/>
-							<button type="radiobutton" title="mpirun"/>
-						</button-group>
-						<!-- row 2 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>MPI Number of Cores: </fixed-text>
-						</widget>
-						<widget type="spinner" style="SWT.BORDER" readOnly="true" saveValueTo="mpiCores">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="1" grabExcessHorizontal="false" widthHint="100"/>
-							</layout-data>
-						</widget>
-					</composite>
-				</composite>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="4" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<!-- row 1 -->
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Remote Input File: </fixed-text>
-					</widget>
-					<widget type="combo" style="SWT.BORDER" readOnly="true" saveValueTo="remote.input.file">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-					</widget>
-					<action title="Refresh">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" widthHint="100" horizontalSpan="1" grabExcessHorizontal="false"/>
-						</layout-data>
-						<button-action clearValue="remote.input.files" refresh="true">
-							<action>get-input</action>
-						</button-action>
-					</action>
-					<!-- row 2 -->
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Local Input File: </fixed-text>
-					</widget>
-					<browse textStyle="SWT.BORDER" localOnly="true" title="Browse" saveValueTo="local.input.file">
-						<text-layout-data>
-							<grid-data horizontalAlign="SWT.FILL" widthHint="200" horizontalSpan="2" grabExcessHorizontal="true"/>
-						</text-layout-data>
-						<button-layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" widthHint="100" horizontalSpan="1" grabExcessHorizontal="false"/>
-						</button-layout-data>
-					</browse>
-				</composite>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="1" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<viewer name="environment" style="SWT.BORDER | SWT.MULTI" sort="true" type="table">
-						<layout-data>
-							<grid-data widthHint="600" heightHint="40" horizontalSpan="1"/>
-						</layout-data>
-						<column-data name="Name" width="175"/>
-						<column-data name="Value" width="400"/>
-						<items>
-							<include>remote.input.file</include>
-						</items>
-						<value pattern="export @name='@value'" separator="; "/>
-					</viewer>
-				</composite>
-			</dynamic>
-		</launch-tab>
-	</control-data>
-	<monitor-data schedulerType="PBS">
-		<driver>
-			<name></name>
-		</driver>
-	</monitor-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/demo-example.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/demo-example.xml
deleted file mode 100644
index 872d2c5..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/demo-example.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="demo-example">
-	<control-data>
-		<!-- this is a necessary property for the functioning of LML; link it to the batch-specific variable name -->
-		<property name="control.queue.name" visible="false">
-			<link-value-to>destination</link-value-to>
-		</property>
-		<!-- we set this to invisible because the values are not really modifiable -->
-		<property name="queues" visible="false"/>
-		<!-- needed by RM internals for fetch; name is fixed by convention -->
-		<property name="stdout_remote_path" visible="false">
-			<default>${ptp_rm:directory#value}/${ptp_rm:Job_Name#value}.o${ptp_rm:@jobId#default}</default>
-			<link-value-to>Output_Path</link-value-to>
-		</property>
-		<!-- needed by RM internals for fetch; name is fixed by convention -->
-		<property name="stderr_remote_path" visible="false">
-			<default>${ptp_rm:directory#value}/${ptp_rm:Job_Name#value}.e${ptp_rm:@jobId#default}</default>
-			<link-value-to>Error_Path</link-value-to>
-		</property>
-		<attribute name="mpiCommand" type="string">
-			<description>Which mpi command to use.</description>
-		</attribute>
-		<attribute name="mpiCores" min="1" type="integer">
-			<description>the '-np' value</description>
-		</attribute>
-		<attribute name="destination" type="string">
-			<description>Designation of the queue to which to submit the job.</description>
-		</attribute>
-		<attribute name="Error_Path" type="string">
-			<description>The final path name for the file containing the job's standard error stream.</description>
-		</attribute>
-		<attribute name="Job_Name" type="string">
-			<description>The name assigned to the job by the qsub or qalter command.</description>
-			<default>ptp_job</default>
-			<validator>
-				<regex expression="[a-zA-Z_][0-9a-zA-Z_]*"/>
-				<error-message>must be at least one alphanumeric character</error-message>
-			</validator>
-		</attribute>
-		<attribute name="Output_Path" type="string">
-			<description>The final path name for the file containing the job's standard output stream.</description>
-		</attribute>
-		<attribute name="Resource_List.mem" type="string">
-			<description>Maximum amount of memory used by all concurrent processes in the job.</description>
-		</attribute>
-		<attribute name="Resource_List.nodes" type="string">
-			<description>Number and/or type of nodes to be reserved for exclusive use by the job.</description>
-			<default>1</default>
-		</attribute>
-		<attribute name="Resource_List.walltime" type="string">
-			<description>Maximum amount of real time during which the job can be in the running state.</description>
-			<default>00:30:00</default>
-			<validator>
-				<regex expression="\d\d:\d\d:\d\d"/>
-				<error-message>format must be hh:mm:ss</error-message>
-			</validator>
-		</attribute>
-		<script deleteAfterSubmit="false">
-			<line>
-				<arg>#!/bin/bash</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -q">#PBS -q ${ptp_rm:destination#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -e">#PBS -e ${ptp_rm:Error_Path#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -N">#PBS -N ${ptp_rm:Job_Name#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -o">#PBS -o ${ptp_rm:Output_Path#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l mem=">#PBS -l mem=${ptp_rm:Resource_List.mem#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l nodes=">#PBS -l nodes=${ptp_rm:Resource_List.nodes#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l walltime=">#PBS -l walltime=${ptp_rm:Resource_List.walltime#value}</arg>
-			</line>
-			<line>
-				<arg>#PBS -V</arg>
-			</line>
-			<line>
-				<arg>MPI_ARGS="-np ${ptp_rm:mpiCores#value}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">if [ "-np" == "${MPI_ARGS}" ] ; then</arg>
-			</line>
-			<line>
-				<arg resolve="false"> MPI_ARGS=</arg>
-			</line>
-			<line>
-				<arg resolve="false">fi</arg>
-			</line>
-			<line>
-				<arg>COMMAND=${ptp_rm:mpiCommand#value}</arg>
-			</line>
-			<line>
-				<arg resolve="false">if [ -n "${COMMAND}" ] ; then</arg>
-			</line>
-			<line>
-				<arg resolve="false"> COMMAND="${COMMAND} ${MPI_ARGS}</arg>
-				<arg>${ptp_rm:executablePath#value} ${ptp_rm:progArgs#value}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">else</arg>
-			</line>
-			<line>
-				<arg> COMMAND="${ptp_rm:executablePath#value} ${ptp_rm:progArgs#value}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">fi</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="cd">cd ${ptp_rm:directory#value}</arg>
-			</line>
-			<line>
-				<arg resolve="false">${COMMAND}</arg>
-			</line>
-		</script>
-		<start-up-command name="get-queues">
-			<arg>qstat</arg>
-			<arg>-Q</arg>
-			<arg>-f</arg>
-			<stdout-parser delim="\n">
-				<target ref="queues">
-					<match>
-						<expression>Queue: ([\w\d]+)</expression>
-						<add field="value">
-							<entry valueGroup="1"/>
-						</add>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<submit-batch name="submit-batch" waitForId="true">
-			<arg>qsub</arg>
-			<arg>${ptp_rm:managed_file_for_script#value}</arg>
-			<stdout-parser delim="\n" all="true" save="1">
-				<target ref="@jobId">
-					<match>
-						<expression>([\d]+)([.])(.+)[\s]+.*</expression>
-						<append field="name">
-							<entry valueGroup="1"/>
-							<entry valueGroup="2"/>
-							<entry valueGroup="3"/>
-						</append>
-						<set field="default">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry value="SUBMITTED"/>
-						</set>
-					</match>
-					<match>
-						<expression>([\d]+)[.].+</expression>
-						<set field="name">
-							<entry valueGroup="0"/>
-						</set>
-						<set field="default">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry value="SUBMITTED"/>
-						</set>
-					</match>
-				</target>
-				<target ref="@jobId">
-					<match>
-						<expression flags="DOTALL">.*Job not submitted.*</expression>
-						<set field="value">
-							<entry value="FAILED"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-			<stderr-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.*Job not submitted.*</expression>
-						<throw message="Job Submit Failed"/>
-					</match>
-				</target>
-			</stderr-parser>
-		</submit-batch>
-		<get-job-status name="get-job-status" ignoreExitStatus="true">
-			<arg>qstat</arg>
-			<arg>${ptp_rm:@jobId#name}</arg>
-			<stdout-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>[\d]+[.].+[\s]+.+[\s]+.+[\s]+.+[\s]+([A-Z])[\s]+.+</expression>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-					<test op="EQ">
-						<value>#value</value>
-						<value>Q</value>
-						<set field="value">
-							<entry value="QUEUED_ACTIVE"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>R</value>
-						<set field="value">
-							<entry value="RUNNING"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>S</value>
-						<set field="value">
-							<entry value="SUSPENDED"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>C</value>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>E</value>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>H</value>
-						<set field="value">
-							<entry value="SYSTEM_ON_HOLD"/>
-						</set>
-					</test>
-				</target>
-			</stdout-parser>
-			<stderr-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.+</expression>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</match>
-				</target>
-			</stderr-parser>
-		</get-job-status>
-		<terminate-job name="cancel" ignoreExitStatus="true">
-			<arg>qdel</arg>
-			<arg>${ptp_rm:@jobId#name}</arg>
-		</terminate-job>
-		<launch-tab>
-			<dynamic>
-				<title>Demo Example</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite>
-					<layout>
-						<fill-layout type="SWT.HORIZONTAL"/>
-					</layout>
-					<composite group="true">
-						<layout>
-							<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-						</layout>
-						<!-- row 1 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Job Name: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Job_Name">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-						<!-- row 2 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Queue: </fixed-text>
-						</widget>
-						<widget type="combo" style="SWT.BORDER" readOnly="true" saveValueTo="destination">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false"/>
-							</layout-data>
-							<items-from>queues</items-from>
-						</widget>
-						<!-- row 3 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Wallclock Time: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Resource_List.walltime">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-						<!-- row 4 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Number of nodes: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Resource_List.nodes">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-						<!-- row 5 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Total Memory Needed: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Resource_List.mem">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-					</composite>
-					<composite group="true">
-						<layout>
-							<grid-layout numColumns="2" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-						</layout>
-						<!-- row 1 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>MPI Command: </fixed-text>
-						</widget>
-						<button-group saveValueTo="mpiCommand" group="true">
-							<layout>
-								<row-layout type="SWT.HORIZONTAL" center="true" fill="true" justify="true"/>
-							</layout>
-							<button type="radiobutton" title=""/>
-							<button type="radiobutton" title="mpiexec"/>
-							<button type="radiobutton" title="mpirun"/>
-						</button-group>
-						<!-- row 2 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>MPI Number of Cores: </fixed-text>
-						</widget>
-						<widget type="spinner" readOnly="true" saveValueTo="mpiCores">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="1" grabExcessHorizontal="false" widthHint="100"/>
-							</layout-data>
-						</widget>
-					</composite>
-				</composite>
-			</dynamic>
-		</launch-tab>
-	</control-data>
-	<monitor-data schedulerType="PBS">
-		<driver>
-			<name></name>
-		</driver>
-	</monitor-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/discovered-properties-example.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/discovered-properties-example.xml
deleted file mode 100644
index ac8383b..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/discovered-properties-example.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="resource_manager_type.xsd" name="discovered-properties-example">
-   <control-data>
-      <start-up-command name="ompi_info">
-         <arg>ompi_info</arg>
-         <arg>-a</arg>
-         <arg>--parseable</arg>
-         <stdout-parser delim="\n">
-            <target type="attribute" allowOverwrites="true">
-               <match>
-                  <expression>mca:.*:param:([^:]*):value:(.*)</expression>
-                  <set field="name">
-                     <entry valueGroup="1"/>
-                  </set>
-                  <set field="visible">
-                     <entry value="true"/>
-                  </set>
-                  <set field="value">
-                     <entry valueGroup="2"/>
-                  </set>
-               </match>
-               <match>
-                  <expression>mca:.*:param:([^:]*):status:(.*)</expression>
-                  <set field="name">
-                     <entry valueGroup="1"/>
-                  </set>
-                  <set field="status">
-                     <entry valueGroup="2"/>
-                  </set>
-               </match>
-               <match>
-                  <expression>mca:.*:param:([^:]*):help:(.*)</expression>
-                  <set field="name">
-                     <entry valueGroup="1"/>
-                  </set>
-                  <set field="tooltip">
-                     <entry valueGroup="2"/>
-                  </set>
-               </match>
-               <test op="EQ">
-                  <value>#status</value>
-                  <value>read-only</value>
-                  <set field="readOnly">
-                     <entry value="true"/>
-                  </set>
-                  <else>
-                     <set field="readOnly">
-                        <entry value="false"/>
-                     </set>
-                  </else>
-               </test>
-            </target>
-            <target type="attribute">
-               <match>
-                  <expression>ompi:version:full:([^:]*)</expression>
-                  <set field="name">
-                     <entry value="ompi_version"/>
-                  </set>
-                  <set field="value">
-                     <entry valueGroup="1"/>
-                  </set>
-                  <set field="visible">
-                     <entry value="false"/>
-                  </set>
-                  <set field="readOnly">
-                     <entry value="true"/>
-                  </set>
-               </match>
-            </target>
-         </stdout-parser>
-      </start-up-command>
-      <launch-tab>
-         <dynamic showViewExcluded="true">
-            <title>Discovered Properties</title>
-            <layout>
-               <grid-layout/>
-            </layout>
-            <composite group="true">
-               <layout>
-                  <grid-layout numColumns="2"/>
-               </layout>
-               <layout-data>
-                  <grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.CENTER" grabExcessHorizontal="true"/>
-               </layout-data>
-               <widget type="label">
-                  <layout-data>
-                     <grid-data/>
-                  </layout-data>
-                  <fixed-text>Arguments:</fixed-text>
-               </widget>
-               <widget type="text" readOnly="true" style="SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL">
-                  <layout-data>
-                     <grid-data heightHint="100" horizontalAlign="SWT.FILL" verticalAlign="SWT.CENTER" grabExcessHorizontal="true"/>
-                  </layout-data>
-                  <dynamic-text>
-                     <arg>${ptp_rm:allAttributes#value}</arg>
-                  </dynamic-text>
-               </widget>
-            </composite>
-            <composite group="true">
-               <layout>
-                  <grid-layout/>
-               </layout>
-               <layout-data>
-                  <grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.FILL" grabExcessHorizontal="true" grabExcessVertical="true"/>
-               </layout-data>
-               <viewer name="allAttributes" style="SWT.BORDER | SWT.MULTI" sort="true" type="table" initialAllChecked="false">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="true"/>
-                  </layout-data>
-                  <column-data name="Name" width="175">
-                     <tooltip>Multi-select and click checkbox to apply change to all rows.</tooltip>
-                  </column-data>
-                  <column-data name="Value" width="200">
-                     <tooltip>Click to activate value widget.</tooltip>
-                  </column-data>
-                  <items allDiscovered="true">
-                  </items>
-                  <value pattern="-mca @name &quot;@value&quot;"/>
-               </viewer>
-            </composite>
-         </dynamic>
-      </launch-tab>
-   </control-data>
-   <monitor-data schedulerType="PBS">
-   </monitor-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/namelist-example.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/namelist-example.xml
deleted file mode 100644
index 11063ba..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/namelist-example.xml
+++ /dev/null
@@ -1,1012 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="demo-example">
-	<control-data>
-		<!-- this is a necessary property for the functioning of LML; link it to the batch-specific variable name -->
-		<property name="control.queue.name" visible="false">
-			<link-value-to>destination</link-value-to>
-		</property>
-		<!-- we set this to invisible because the values are not really modifiable -->
-		<property name="queues" visible="false"/>
-		<!-- needed by RM internals for fetch; name is fixed by convention -->
-		<property name="stdout_remote_path" visible="false">
-			<default>${ptp_rm:directory#value}/${ptp_rm:Job_Name#value}.o${ptp_rm:@jobId#default}</default>
-			<link-value-to>Output_Path</link-value-to>
-		</property>
-		<!-- needed by RM internals for fetch; name is fixed by convention -->
-		<property name="stderr_remote_path" visible="false">
-			<default>${ptp_rm:directory#value}/${ptp_rm:Job_Name#value}.e${ptp_rm:@jobId#default}</default>
-			<link-value-to>Error_Path</link-value-to>
-		</property>
-		<attribute name="mpiCommand" type="string">
-			<description>Which mpi command to use.</description>
-		</attribute>
-		<attribute name="mpiCores" min="1" type="integer">
-			<description>the '-np' value</description>
-		</attribute>
-		<attribute name="destination" type="string">
-			<description>Designation of the queue to which to submit the job.</description>
-		</attribute>
-		<attribute name="Error_Path" type="string">
-			<description>The final path name for the file containing the job's standard error stream.</description>
-		</attribute>
-		<attribute name="Job_Name" type="string">
-			<description>The name assigned to the job by the qsub or qalter command.</description>
-			<default>ptp_job</default>
-			<validator>
-				<regex expression="[a-zA-Z_][0-9a-zA-Z_]*"/>
-				<error-message>must be at least one alphanumeric character</error-message>
-			</validator>
-		</attribute>
-		<attribute name="Output_Path" type="string">
-			<description>The final path name for the file containing the job's standard output stream.</description>
-		</attribute>
-		<attribute name="Resource_List.mem" type="string">
-			<description>Maximum amount of memory used by all concurrent processes in the job.</description>
-		</attribute>
-		<attribute name="Resource_List.nodes" type="string">
-			<description>Number and/or type of nodes to be reserved for exclusive use by the job.</description>
-			<default>1</default>
-		</attribute>
-		<attribute name="Resource_List.walltime" type="string">
-			<description>Maximum amount of real time during which the job can be in the running state.</description>
-			<default>00:30:00</default>
-			<validator>
-				<regex expression="\d\d:\d\d:\d\d"/>
-				<error-message>format must be hh:mm:ss</error-message>
-			</validator>
-		</attribute>
-
-		<!--RUN PARAMETERS -->
-		<attribute name="runname" type="string">
-			<description>Name of run (Used for filenames)</description>
-			<default>cloud2d</default>
-			<validator>
-				<regex expression="[\w\d]+"/>
-				<error-message>value cannot be empty</error-message>
-			</validator>
-		</attribute>
-		<attribute name="runlabel" type="string">
-			<description>Plotting label of run </description>
-			<default>cloud2d</default>
-			<validator>
-				<regex expression="[\w\d]+"/>
-				<error-message>value cannot be empty</error-message>
-			</validator>
-		</attribute>
-		<attribute name="simtime" type="string">
-			<description>Simulation time</description>
-			<default>7200</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="dt" type="string">
-			<description>Time step in seconds</description>
-			<default>10</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="nsmall" type="string">
-			<description>No. of small time steps (must be 6,12,18..)</description>
-			<default>12</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="nx" type="string">
-			<description>No. of grid cells in r + 1</description>
-			<default>181</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="nz" type="string">
-			<description>No. of grid cells in z + 1</description>
-			<default>36</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="xdomain" type="string">
-			<description>Length of domain in meters</description>
-			<default>180000</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="zdomain" type="string">
-			<description>Height of domain in meters</description>
-			<default>17500</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="ugrid" type="string">
-			<description>U-grid motion in m/s</description>
-			<default>14</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-
-		<!--OUTPUT PARAMETERS -->
-		<attribute name="tprint" type="string">
-			<description>Printing interval</description>
-			<default>100</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="tplot" type="string">
-			<description>Plotting interval</description>
-			<default>300</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="tsave" type="string">
-			<description>History dump interval</description>
-			<default>600</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-
-		<!--INITIALIZATION PARAMETERS -->
-		<attribute name="tbble" type="string">
-			<description>Perturbation theta for bubble</description>
-			<default>-15</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="xrad" type="string">
-			<description>X-radius of bubble</description>
-			<default>4000</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="zrad" type="string">
-			<description>Z-radius of bubble</description>
-			<default>2000</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="xcntr" type="string">
-			<description>X-center of bubble</description>
-			<default>18000</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="zcntr" type="string">
-			<description>Z-center of bubble</description>
-			<default>3000</default>
-			<validator>
-				<regex expression="[-\d]+"/>
-				<error-message>value must be an integer</error-message>
-			</validator>
-		</attribute>
-		<attribute name="sndtype" type="string">
-			<description>SND_TYPE = [0,1,2] :: [dry adiabatic,Weisman snd,WK+shear]</description>
-			<default>0</default>
-			<validator>
-				<regex expression="[012]"/>
-				<error-message>value must be 0, 1 or 2</error-message>
-			</validator>
-		</attribute>
-		<attribute name="inittype" type="string">
-			<description>INIT_TYPE = [0,1] :: [workshop bble, cloud bble]</description>
-			<default>0</default>
-			<validator>
-				<regex expression="[01]"/>
-				<error-message>value must be 0 or 1</error-message>
-			</validator>
-		</attribute>
-		<managed-files>
-			<file-staging-location>${ptp_rm:directory#value}/input2</file-staging-location>
-			<file name="namelist.input">
-				<line>
-					<arg>&amp;run</arg>
-				</line>
-				<line>
-					<arg> runname = '${ptp_rm:runname#value}',</arg>
-				</line>
-				<line>
-					<arg> runlabel = '${ptp_rm:runlabel#value}',</arg>
-				</line>
-				<line>
-					<arg> simtime = ${ptp_rm:simtime#value}.,</arg>
-				</line>
-				<line>
-					<arg> dt = ${ptp_rm:dt#value}.,</arg>
-				</line>
-				<line>
-					<arg> nsmall = ${ptp_rm:nsmall#value}.,</arg>
-				</line>
-				<line>
-					<arg> nx = ${ptp_rm:nx#value}.,</arg>
-				</line>
-				<line>
-					<arg> nz = ${ptp_rm:nz#value}.,</arg>
-				</line>
-				<line>
-					<arg> xdomain = ${ptp_rm:xdomain#value}.,</arg>
-				</line>
-				<line>
-					<arg> zdomain = ${ptp_rm:zdomain#value}.,</arg>
-				</line>
-				<line>
-					<arg> ugrid = ${ptp_rm:ugrid#value}.,</arg>
-				</line>
-				<line>
-					<arg>&amp;end</arg>
-				</line>
-				<line>
-					<arg>c</arg>
-				</line>
-				<line>
-					<arg>&amp;dump</arg>
-				</line>
-				<line>
-					<arg> tprint = ${ptp_rm:tprint#value}.,</arg>
-				</line>
-				<line>
-					<arg> tplot = ${ptp_rm:tplot#value}.,</arg>
-				</line>
-				<line>
-					<arg> tsave = ${ptp_rm:tsave#value}.,</arg>
-				</line>
-				<line>
-					<arg>&amp;end</arg>
-				</line>
-				<line>
-					<arg>c</arg>
-				</line>
-				<line>
-					<arg>&amp;init_params</arg>
-				</line>
-				<line>
-					<arg> tbble = ${ptp_rm:tbble#value}.,</arg>
-				</line>
-				<line>
-					<arg> xcntr = ${ptp_rm:xcntr#value}.,</arg>
-				</line>
-				<line>
-					<arg> zcntr = ${ptp_rm:zcntr#value}.,</arg>
-				</line>
-				<line>
-					<arg> xrad = ${ptp_rm:xrad#value}.,</arg>
-				</line>
-				<line>
-					<arg> zrad = ${ptp_rm:zrad#value}.,</arg>
-				</line>
-				<line>
-					<arg> sndtype = ${ptp_rm:sndtype#value},</arg>
-				</line>
-				<line>
-					<arg> inittype = ${ptp_rm:inittype#value},</arg>
-				</line>
-				<line>
-					<arg>&amp;end</arg>
-				</line>
-
-			</file>
-		</managed-files>
-		<script>
-			<file-staging-location>${ptp_rm:directory#value}</file-staging-location>
-			<line>
-				<arg>#!/bin/bash</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -q">#PBS -q ${ptp_rm:destination#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -e">#PBS -e ${ptp_rm:Error_Path#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -N">#PBS -N ${ptp_rm:Job_Name#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -o">#PBS -o ${ptp_rm:Output_Path#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l mem=">#PBS -l mem=${ptp_rm:Resource_List.mem#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l nodes=">#PBS -l nodes=${ptp_rm:Resource_List.nodes#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l walltime=">#PBS -l walltime=${ptp_rm:Resource_List.walltime#value}</arg>
-			</line>
-			<line>
-				<arg>#PBS -V</arg>
-			</line>
-			<line>
-				<arg>MPI_ARGS="-np ${ptp_rm:mpiCores#value}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">if [ "-np" == "${MPI_ARGS}" ] ; then</arg>
-			</line>
-			<line>
-				<arg resolve="false"> MPI_ARGS=</arg>
-			</line>
-			<line>
-				<arg resolve="false">fi</arg>
-			</line>
-			<line>
-				<arg>COMMAND=${ptp_rm:mpiCommand#value}</arg>
-			</line>
-			<line>
-				<arg resolve="false">if [ -n "${COMMAND}" ] ; then</arg>
-			</line>
-			<line>
-				<arg resolve="false"> COMMAND="${COMMAND} ${MPI_ARGS}</arg>
-				<arg>${ptp_rm:executablePath#value} ${ptp_rm:progArgs#value}</arg>
-				<arg resolve="false">${INPUT}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">else</arg>
-			</line>
-			<line>
-				<arg> COMMAND="${ptp_rm:executablePath#value} ${ptp_rm:progArgs#value}</arg>
-				<arg resolve="false">${INPUT}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">fi</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="cd">cd ${ptp_rm:directory#value}</arg>
-			</line>
-			<line>
-				<arg resolve="false">${COMMAND}</arg>
-			</line>
-		</script>
-		<start-up-command name="get-queues">
-			<arg>qstat</arg>
-			<arg>-Q</arg>
-			<arg>-f</arg>
-			<stdout-parser delim="\n">
-				<target ref="queues">
-					<match>
-						<expression>Queue: ([\w\d]+)</expression>
-						<add field="value">
-							<entry valueGroup="1"/>
-						</add>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<submit-batch name="submit-batch" waitForId="true">
-			<arg>qsub</arg>
-			<arg>${ptp_rm:managed_file_for_script#value}</arg>
-			<environment name="INPUT">
-				<arg isUndefinedIfMatches="-f">-f ${ptp_rm:namelist.input#value}</arg>
-			</environment>
-			<stdout-parser delim="\n" all="true" save="1">
-				<target ref="@jobId">
-					<match>
-						<expression>([\d]+)([.])(.+)[\s]+.*</expression>
-						<append field="name">
-							<entry valueGroup="1"/>
-							<entry valueGroup="2"/>
-							<entry valueGroup="3"/>
-						</append>
-						<set field="default">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry value="SUBMITTED"/>
-						</set>
-					</match>
-					<match>
-						<expression>([\d]+)[.].+</expression>
-						<set field="name">
-							<entry valueGroup="0"/>
-						</set>
-						<set field="default">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry value="SUBMITTED"/>
-						</set>
-					</match>
-				</target>
-				<target ref="@jobId">
-					<match>
-						<expression flags="DOTALL">.*Job not submitted.*</expression>
-						<set field="value">
-							<entry value="FAILED"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-			<stderr-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.*Job not submitted.*</expression>
-						<throw message="Job Submit Failed"/>
-					</match>
-				</target>
-			</stderr-parser>
-		</submit-batch>
-		<get-job-status name="get-job-status" ignoreExitStatus="true">
-			<arg>qstat</arg>
-			<arg>${ptp_rm:@jobId#name}</arg>
-			<stdout-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>[\d]+[.].+[\s]+.+[\s]+.+[\s]+.+[\s]+([A-Z])[\s]+.+</expression>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-					<test op="EQ">
-						<value>#value</value>
-						<value>Q</value>
-						<set field="value">
-							<entry value="QUEUED_ACTIVE"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>R</value>
-						<set field="value">
-							<entry value="RUNNING"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>S</value>
-						<set field="value">
-							<entry value="SUSPENDED"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>C</value>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>E</value>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>H</value>
-						<set field="value">
-							<entry value="SYSTEM_ON_HOLD"/>
-						</set>
-					</test>
-				</target>
-			</stdout-parser>
-			<stderr-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.+</expression>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</match>
-				</target>
-			</stderr-parser>
-		</get-job-status>
-		<terminate-job name="cancel" ignoreExitStatus="true">
-			<arg>qdel</arg>
-			<arg>${ptp_rm:@jobId#name}</arg>
-		</terminate-job>
-		<launch-tab>
-			<dynamic includeWidgetValuesFrom="Input">
-				<title>Job</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite>
-					<layout>
-						<fill-layout type="SWT.HORIZONTAL"/>
-					</layout>
-					<composite group="true">
-						<layout>
-							<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-						</layout>
-						<!-- row 1 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Job Name: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Job_Name">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-						<!-- row 2 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Queue: </fixed-text>
-						</widget>
-						<widget type="combo" style="SWT.BORDER" readOnly="true" saveValueTo="destination">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false"/>
-							</layout-data>
-							<items-from>queues</items-from>
-						</widget>
-						<!-- row 3 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Wallclock Time: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Resource_List.walltime">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-						<!-- row 4 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Number of nodes: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Resource_List.nodes">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-						<!-- row 5 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>Total Memory Needed: </fixed-text>
-						</widget>
-						<widget type="text" style="SWT.BORDER" saveValueTo="Resource_List.mem">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-							</layout-data>
-						</widget>
-					</composite>
-					<composite group="true">
-						<layout>
-							<grid-layout numColumns="2" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-						</layout>
-						<!-- row 1 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>MPI Command: </fixed-text>
-						</widget>
-						<button-group saveValueTo="mpiCommand" group="true">
-							<layout>
-								<row-layout type="SWT.HORIZONTAL" center="true" fill="true" justify="true"/>
-							</layout>
-							<button type="radiobutton" title=""/>
-							<button type="radiobutton" title="mpiexec"/>
-							<button type="radiobutton" title="mpirun"/>
-						</button-group>
-						<!-- row 2 -->
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-							</layout-data>
-							<fixed-text>MPI Number of Cores: </fixed-text>
-						</widget>
-						<widget type="spinner" readOnly="true" saveValueTo="mpiCores">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="1" grabExcessHorizontal="false" widthHint="100"/>
-							</layout-data>
-						</widget>
-					</composite>
-				</composite>
-			</dynamic>
-			<dynamic includeWidgetValuesFrom="Job">
-				<title>Input</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="4" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<title>Run Parameters</title>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>runname:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="runname">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:runname#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>runlabel:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="runlabel">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:runlabel#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>simtime:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="simtime">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:simtime#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>dt:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="dt">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:dt#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>nsmall:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="nsmall">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:nsmall#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>nx:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="nx">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:nx#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>nz:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="nz">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:nz#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>xdomain:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="xdomain">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:xdomain#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>zdomain:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="zdomain">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:zdomain#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>ugrid:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="ugrid">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:ugrid#description}</fixed-text>
-					</widget>
-				</composite>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="4" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<title>Output Parameters</title>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>tprint:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="tprint">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:tprint#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>tplot:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="tplot">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:tplot#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>tsave:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="tsave">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:tsave#description}</fixed-text>
-					</widget>
-				</composite>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="4" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<title>Initialization Parameters</title>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>tbble:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="tbble">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:tbble#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>xcntr:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="xcntr">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:xcntr#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>zcntr:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="zcntr">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:zcntr#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>xrad:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="xrad">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:xrad#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>zrad:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="zrad">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:zrad#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>sndtype:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="sndtype">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:sndtype#description}</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>inittype:</fixed-text>
-					</widget>
-					<widget type="text" style="SWT.BORDER" saveValueTo="inittype">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="false" widthHint="150"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>${ptp_rm:inittype#description}</fixed-text>
-					</widget>
-				</composite>
-			</dynamic>
-		</launch-tab>
-	</control-data>
-	<monitor-data schedulerType="PBS">
-		<driver>
-			<name></name>
-		</driver>
-	</monitor-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/pbs-test-local.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/pbs-test-local.xml
deleted file mode 100644
index 33b9beb..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/pbs-test-local.xml
+++ /dev/null
@@ -1,529 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="pbs-test-local">
-	<control-data>
-		<property name="queues" visible="false"/>
-		<!-- needed by RM internals for fetch; name is fixed by convention -->
-		<property name="stdout_remote_path" visible="true">
-			<default>${ptp_rm:directory#value}/${ptp_rm:Job_Name#value}.o@jobId</default>
-			<link-value-to>Output_Path</link-value-to>
-		</property>
-		<!-- needed by RM internals for fetch; name is fixed by convention -->
-		<property name="stderr_remote_path" visible="true">
-			<default>${ptp_rm:directory#value}/${ptp_rm:Job_Name#value}.e@jobId</default>
-			<link-value-to>Error_Path</link-value-to>
-		</property>
-		<property name="remote_path_tooltip" visible="false">
-			<default><![CDATA[Not the same as the PBS attribute for stdout or stderr; 
-used internally by the resource manager and should correspond
-to whatever path the scheduler will copy the output to at the 
-end of execution; the job id can be included in this path 
-using '@jobId'.]]></default>
-		</property>
-		<attribute name="mpiCommand" type="choice">
-			<description>Which mpi command to use.</description>
-			<choice>,mpiexec,mpirun</choice>
-		</attribute>
-		<attribute name="mpiCores" min="1" type="integer">
-			<description>the '-np' value</description>
-		</attribute>
-		<attribute name="Account_Name" type="string">
-			<description>Account to which to charge this job.</description>
-			<tooltip>Format: string</tooltip>
-		</attribute>
-		<attribute name="Checkpoint" type="choice">
-			<description>Determines when checkpointing (if supported) will be performed by PBS on behalf of the job.</description>
-			<tooltip><![CDATA[Format: the strings "n" (no checkpointing), 
-"s" (to be performed only when the server executing 
-the job is shutdown), "c"s (to be performed at the 
-default minimum time for thes servers executing the 
-job), "c=mmmm" (to be performed at an intervals 
-of minutes which is the integer number of minutes of CPUs 
-time used bys the job; values must be greater than zero); 
-defaults value: "u", which is unspecified.]]></tooltip>
-			<choice>,u,n,s,c,c=????</choice>
-			<default>u</default>
-		</attribute>
-		<attribute name="depend" type="string">
-			<description>The type of inter-job dependencies specified by the job owner.</description>
-			<tooltip>Format: "type:jobid[,jobid...]"; default value: no dependencies.</tooltip>
-		</attribute>
-		<attribute name="destination" type="choice">
-			<description>Designation of the queue to which to submit the job.</description>
-			<tooltip>Format: queue[@server].</tooltip>
-			<choice>normal,debug</choice>
-		</attribute>
-		<attribute name="directive" type="string">
-			<description>Defines the prefix that declares a directive to the qsub command within the script file.</description>
-			<tooltip><![CDATA[See the paragraph on script directives in the 
-Extended Description section. If the option is presented with a
-directive_prefix argument that is the null string, qsub will 
-not scan the script file for directives.]]></tooltip>
-		</attribute>
-		<attribute name="Error_Path" type="string">
-			<description>The final path name for the file containing the job's standard error stream.</description>
-			<tooltip><![CDATA[Format: "[hostname:]pathname". If 
-the option is not specified, the default file name for the 
-standard error stream will be used. The default name has 
-the following form: job_name.eSeq_num where job_name is 
-the name of the job, see -N option, and Seq_num
-is the job number assigned when the job is submitted; 
-default value: (job_name).e(job_number).]]></tooltip>
-		</attribute>
-		<attribute name="export_all" type="boolean">
-			<description><![CDATA[Declares that all environment variables in the qsub command's environment are to be exported to the batch job.]]></description>
-			<default>true</default>
-		</attribute>
-		<attribute name="group_list" type="string">
-			<description><![CDATA[A list of composite-descriptor group="true"_names@hosts which determines the composite-descriptor group="true" under which the job is run on a given host.]]></description>
-			<tooltip><![CDATA[Format: composite-descriptor 
-group="true"_name[@host][,composite-descriptor group="true"_name[@host]...].
-When a job is to be placed into execution, the server will select a 
-composite-descriptor group="true" name according to the following ordered set 
-of rules: 1) Select the composite-descriptor group="true" name from
-the list for which the associated host name matches the name of the
-execution host; 2) Select the composite-descriptor group="true" name 
-which has no associated host name, the wildcard name; 3) Use
-the login composite-descriptor group="true" for the username under 
-which the job will be run.]]></tooltip>
-		</attribute>
-		<attribute name="Hold_Types" type="choice">
-			<description>The set of holds currently applied to the job.</description>
-			<tooltip><![CDATA[If the set is not null, the job will not be scheduled
-for execution and is said to be in the hold state. Note, the hold
-state takes precedence over the wait state. Format: string made up 
-of the letters 'u', 's', 'o'; default value: no hold.]]></tooltip>
-			<choice>,u,s,o</choice>
-		</attribute>
-		<attribute name="Job_Name" type="string">
-			<description>The name assigned to the job by the qsub or qalter command.</description>
-			<tooltip><![CDATA[Format: string up to 15 characters, 
-first character must be alphabetic; default value: 
-the base name of the job script or STDIN.]]></tooltip>
-		</attribute>
-		<attribute name="Join_Path" type="boolean">
-			<description>Merge stdout and stderr into stdout.</description>
-			<tooltip><![CDATA[Format: boolean, values accepted are "True", "TRUE",
-"true", "Y", "y", "1", "False", "FALSE", "false", "N", "n", "0";
-default value: false.]]></tooltip>
-			<default>false</default>
-		</attribute>
-		<attribute name="Keep_Files" type="choice">
-			<description>Retain these streams on the execution host upon job termination.</description>
-			<tooltip><![CDATA[Format: "o", "e", "oe" or "eo"; default value:
-no keep, return files to submission host.]]></tooltip>
-			<choice>,o,e,oe,eo</choice>
-		</attribute>
-		<attribute name="Mail_Points" type="choice">
-			<description>Identifies at which state changes the server will send mail about the job.</description>
-			<tooltip><![CDATA[Format: string made up of the letters
-'a' for abort, 'b' for beginning, and default value:
- a', send on job abort.]]></tooltip>
-			<choice>,a,b</choice>
-			<default>a</default>
-		</attribute>
-		<attribute name="Mail_Users" type="string">
-			<description>The set of users to whom mail may be sent when the job makes certain state changes.</description>
-			<tooltip>Format: "user@host[,user@host]"; default value: job owner only.</tooltip>
-		</attribute>
-		<attribute name="Output_Path" type="string">
-			<description>The final path name for the file containing the job's standard output stream.</description>
-			<tooltip><![CDATA[Format: "[hostname:]pathname". If the option
-is not specified, the default file name for the standard error stream 
-will be used. The default name has the following form: job_name.oSeq_num
-where job_name is the name of the job, see -N option, and Seq_num
-is the job number assigned when the job is submitted; 
-default value: (job_name).o(job_number).]]></tooltip>
-		</attribute>
-		<attribute name="Priority" type="string">
-			<description>The job scheduling priority assigned by the user.</description>
-			<tooltip>Format: "[+|-]nnnnn"; default value: undefined.</tooltip>
-		</attribute>
-		<attribute name="Rerunnable" type="choice">
-			<description>The rerunnable flag assigned by the user.</description>
-			<tooltip>Format: "y" or "n", see Join_Path; default value: y, job is rerunable.</tooltip>
-			<choice>,n,y</choice>
-			<default>y</default>
-		</attribute>
-		<attribute name="Resource_List.arch" type="string">
-			<description>Specifies the administrator defined system architecture requried.</description>
-			<tooltip>This defaults to whatever the PBS_MACH string is set to in "local.mk". Units: string.</tooltip>
-		</attribute>
-		<attribute name="Resource_List.cput" type="string">
-			<description>Maximum amount of CPU time used by all processes in the job.</description>
-			<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-		</attribute>
-		<attribute name="Resource_List.file" type="string">
-			<description>The largest size of any single file that may be created by the job.</description>
-			<tooltip><![CDATA[Format: integer[suffix]; the suffix is a multiplier 
-in bytes or words (word size of the host): b (bytes), 
-w (words), kb/kw (kilo), mb/mw (mega), gb/bw (giga).]]></tooltip>
-		</attribute>
-		<attribute name="Resource_List.host" type="string">
-			<description>Name of host on which job should be run.</description>
-		</attribute>
-		<attribute name="Resource_List.mem" type="string">
-			<description>Maximum amount of memory used by all concurrent processes in the job.</description>
-			<tooltip><![CDATA[Format: integer[suffix]; the suffix is a multiplier 
-in bytes or words (word size of the host): b (bytes), 
-w (words), kb/kw (kilo), mb/mw (mega), gb/bw (giga).]]></tooltip>
-		</attribute>
-		<attribute name="Resource_List.nice" type="integer" min="0" max="10">
-			<description>The nice value under which the job is to be run.</description>
-			<tooltip>0 to 10.</tooltip>
-			<default>0</default>
-		</attribute>
-		<attribute name="Resource_List.nodes" type="string">
-			<description>Number and/or type of nodes to be reserved for exclusive use by the job.</description>
-			<tooltip><![CDATA[The value is one or more node_specs joined with 
-the '+' character, "node_spec[+node_spec...]. Each node_spec is
-a number of nodes required of the type declared in the node_spec
-and a name or one or more properity or properities desired for 
-the nodes. The number, the name, and each properity in the 
-node_spec are separated by a colon ':'. If no number is specified, 
-one (1) is assumed. Units: string. The name of a node is its 
-hostname. The properties of nodes are: ppn=# requested; defaults 
-to 1; or an arbitrary string defined by system administrator. 
-Example: To ask for 2 processors on each of two blue nodes and 
-three processors on one red node: -l nodes=2:blue:ppn=2+red:ppn=3.]]></tooltip>
-			<default>1</default>
-		</attribute>
-		<attribute name="Resource_List.ompthreads" type="integer" min="1">
-			<description>Number of threads per processor for Open MP jobs.</description>
-			<default>1</default>
-		</attribute>
-		<attribute name="Resource_List.pcput" type="string">
-			<description>Maximum amount of CPU time used by any single process in the job.</description>
-			<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-		</attribute>
-		<attribute name="Resource_List.pmem" type="string">
-			<description>Maximum amount of physical memory (workingset) used by any single process of the job.</description>
-			<tooltip><![CDATA[Format: integer[suffix]; the suffix is a multiplier
-in bytes or words (word size of the host): b (bytes), w (words), kb/kw
-(kilo), mb/mw (mega), gb/bw (giga).]]></tooltip>
-		</attribute>
-		<attribute name="Resource_List.pvmem" type="string">
-			<description>Maximum amount of virtual memory used by any single process in the job.</description>
-			<tooltip><![CDATA[Format: integer[suffix]; the suffix is a multiplier
-in bytes or words (word size of the host): b (bytes), w (words), kb/kw
-(kilo), mb/mw (mega), gb/bw (giga).]]></tooltip>
-		</attribute>
-		<attribute name="Resource_List.vmem" type="string">
-			<description>Maximum amount of virtual memory used by all concurrent processes in the job.</description>
-			<tooltip><![CDATA[Format: integer[suffix]; the suffix is a multiplier 
-in bytes or words (word size of the host): b (bytes), w (words), kb/kw
-(kilo), mb/mw (mega), gb/bw (giga).]]></tooltip>
-		</attribute>
-		<attribute name="Resource_List.walltime" type="string">
-			<description>Maximum amount of real time during which the job can be in the running state.</description>
-			<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-			<default>00:30:00</default>
-		</attribute>
-		<attribute name="Shell_Path_List" type="string">
-			<description>A set of absolute paths of the program to process the job's script file.</description>
-			<tooltip><![CDATA[Format: path[@host][,path[@host]...]. 
-If this is null, then the user's login shell on the host 
-of execution will be used. Default value: null, login shell.]]></tooltip>
-		</attribute>
-		<attribute name="stagein" type="string">
-			<description>The list of files to be staged in prior to job execution.</description>
-			<tooltip>Format: local_path@remote_host:remote_path.</tooltip>
-		</attribute>
-		<attribute name="stageout" type="string">
-			<description>The list of files to be staged out after job execution.</description>
-			<tooltip>Format: local_path@remote_host:remote_path.</tooltip>
-		</attribute>
-		<attribute name="User_List" type="string">
-			<description>The list of user@hosts which determines the user name under which the job is run on a given host.</description>
-			<tooltip><![CDATA[When a job is to be placed into execution, 
-the server will select a user name from the list according
-to the following ordered set of rules: 1) Select the user 
-name from the list for which the associated host name matches
-the name of the execution host; 2) Select the user name which 
-has no associated host name, the wild card name; 3) Use the 
-Job_Owner as the user name. Default value: job owner name.]]></tooltip>
-		</attribute>
-		<attribute name="Variable_List" type="string">
-			<description>This is the list of environment variables passed with the Queue Job batch request.</description>
-		</attribute>
-		<script insertEnvironmentAfter="35">
-			<line>
-				<arg>#!/bin/bash</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -A">#PBS -A ${ptp_rm:Account_Name#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -c">#PBS -c ${ptp_rm:Checkpoint#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -W depend=">#PBS -W depend=${ptp_rm:depend#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -q">#PBS -q ${ptp_rm:destination#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -C">#PBS -C ${ptp_rm:line#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -e">#PBS -e ${ptp_rm:Error_Path#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -V">#PBS -V ${ptp_rm:export_all#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -W group_list=">#PBS -W group_list=${ptp_rm:group_list#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -h">#PBS -h ${ptp_rm:Hold_Types#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -N">#PBS -N ${ptp_rm:Job_Name#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -j">#PBS -j ${ptp_rm:Join_Path#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -k">#PBS -k ${ptp_rm:Keep_Files#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -m">#PBS -m ${ptp_rm:Mail_Points#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -M">#PBS -M ${ptp_rm:Mail_Users#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -o">#PBS -o ${ptp_rm:Output_Path#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -p">#PBS -p ${ptp_rm:Priority#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -r">#PBS -r ${ptp_rm:Rerunnable#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l arch=">#PBS -l arch=${ptp_rm:Resource_List.arch#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l cput=">#PBS -l cput=${ptp_rm:Resource_List.cput#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l file=">#PBS -l file=${ptp_rm:Resource_List.file#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l host=">#PBS -l host=${ptp_rm:Resource_List.host#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l mem=">#PBS -l mem=${ptp_rm:Resource_List.mem#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l nice=">#PBS -l nice=${ptp_rm:Resource_List.nice#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l nodes=">#PBS -l nodes=${ptp_rm:Resource_List.nodes#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l ompthreads=">#PBS -l ompthreads=${ptp_rm:Resource_List.ompthreads#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l pcput=">#PBS -l pcput=${ptp_rm:Resource_List.pcput#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l pmem=">#PBS -l pmem=${ptp_rm:Resource_List.pmem#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l pvmem=">#PBS -l pvmem=${ptp_rm:Resource_List.pvmem#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l vmem=">#PBS -l vmem=${ptp_rm:Resource_List.vmem#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -l walltime=">#PBS -l walltime=${ptp_rm:Resource_List.walltime#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -S">#PBS -S ${ptp_rm:Shell_Path_List#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -W stagein=">#PBS -W stagein=${ptp_rm:stagein#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -W stageout=">#PBS -W stageout=${ptp_rm:stageout#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -u">#PBS -u ${ptp_rm:User_List#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="#PBS -v">#PBS -v ${ptp_rm:Variable_List#value}</arg>
-			</line>
-			<line>
-				<arg>MPI_ARGS="-np ${ptp_rm:mpiCores#value}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">if [ "-np" == "${MPI_ARGS}" ] ; then</arg>
-			</line>
-			<line>
-				<arg resolve="false"> MPI_ARGS=</arg>
-			</line>
-			<line>
-				<arg resolve="false">fi</arg>
-			</line>
-			<line>
-				<arg>COMMAND=${ptp_rm:mpiCommand#value}</arg>
-			</line>
-			<line>
-				<arg resolve="false">if [ -n "${COMMAND}" ] ; then</arg>
-			</line>
-			<line>
-				<arg resolve="false"> COMMAND="${COMMAND} ${MPI_ARGS}</arg>
-				<arg>${ptp_rm:executablePath#value} ${ptp_rm:progArgs#value}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">else</arg>
-			</line>
-			<line>
-				<arg> COMMAND="${ptp_rm:executablePath#value} ${ptp_rm:progArgs#value}"</arg>
-			</line>
-			<line>
-				<arg resolve="false">fi</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="cd">cd ${ptp_rm:directory#value}</arg>
-			</line>
-			<line>
-				<arg resolve="false">${COMMAND}</arg>
-			</line>
-			<line>
-				<arg resolve="false">touch DONE</arg>
-			</line>
-		</script>
-		<submit-interactive name="submit-interactive" waitForId="false">
-			<arg>echo</arg>
-			<arg>${ptp_rm:managed_file_for_script#value}</arg>
-		</submit-interactive>
-		<get-job-status name="get-job-status" ignoreExitStatus="true">
-			<arg>echo</arg>
-			<arg>${ptp_rm:@jobId#name}</arg>
-			<stdout-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.*</expression>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-		</get-job-status>
-		<launch-tab>
-			<dynamic>
-				<title>Advanced PBS Settings</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite>
-					<layout>
-						<grid-layout numColumns="1"/>
-					</layout>
-					<layout-data>
-						<grid-data widthHint="600" heightHint="900" horizontalSpan="1"/>
-					</layout-data>
-					<!-- QUEUES remote path group -->
-					<composite group="true">
-						<layout>
-							<grid-layout numColumns="3" makeColumnsEqualWidth="false"/>
-						</layout>
-						<widget type="label" style="SWT.LEFT">
-							<layout-data>
-								<grid-data horizontalAlign="SWT.BEGINNING"/>
-							</layout-data>
-							<tooltip>${ptp_rm:destination#tooltip}</tooltip>
-							<fixed-text>Queue: </fixed-text>
-						</widget>
-						<widget type="combo" style="SWT.BORDER" readOnly="true" saveValueTo="destination">
-							<layout-data>
-								<grid-data widthHint="150" horizontalAlign="SWT.FILL" horizontalSpan="2"/>
-							</layout-data>
-							<items-from>queues</items-from>
-						</widget>
-					</composite>
-					<composite group="true">
-						<layout>
-							<grid-layout numColumns="1"/>
-						</layout>
-						<widget type="text" readOnly="true" style="SWT.LEFT | SWT.BORDER | SWT.WRAP | SWT.V_SCROLL">
-							<layout-data>
-								<grid-data widthHint="600" heightHint="75" horizontalSpan="1"/>
-							</layout-data>
-							<dynamic-text>
-								<arg>${ptp_rm:allAttributes#value}</arg>
-								<arg isUndefinedIfMatches=" destination=''"> destination='${ptp_rm:destination#value}'</arg>
-							</dynamic-text>
-						</widget>
-						<viewer name="allAttributes" style="SWT.BORDER | SWT.MULTI" sort="true" type="tree">
-							<layout-data>
-								<grid-data widthHint="600" heightHint="400" horizontalSpan="1"/>
-							</layout-data>
-							<column-data name="Name" width="175">
-								<tooltip>Double-click on selected rows toggles their checked value.</tooltip>
-							</column-data>
-							<column-data name="Value" width="400">
-								<tooltip>Click to activate value widget.</tooltip>
-							</column-data>
-							<items allPredefined="true">
-								<exclude>destination</exclude>
-							</items>
-							<value pattern="@name='@value'"/>
-						</viewer>
-						<!-- STDOUT/STDERR remote path group -->
-						<!-- <composite group="true"> -->
-						<!-- <layout> -->
-						<!-- <grid-layout numColumns="4" makeColumnsEqualWidth="false"/> -->
-						<!-- </layout> -->
-						<!-- <layout-data> -->
-						<!-- <grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="4" widthHint="300"/> -->
-						<!-- </layout-data> -->
-						<!-- <widget type="label" style="SWT.LEFT"> -->
-						<!-- <tooltip>${ptp_rm:remote_path_tooltip#default}</tooltip> -->
-						<!-- <fixed-text>Remote Output Path:</fixed-text> -->
-						<!-- </widget> -->
-						<!-- <widget type="text" style="SWT.BORDER" saveValueTo="stdout_remote_path"> -->
-						<!-- <layout-data> -->
-						<!-- <grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="true" widthHint="100"/> -->
-						<!-- </layout-data> -->
-						<!-- </widget> -->
-						<!-- <widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE"> -->
-						<!-- <fixed-text>Enable read upon job termination</fixed-text> -->
-						<!-- </widget> -->
-						<!-- <widget type="label" style="SWT.LEFT"> -->
-						<!-- <tooltip>${ptp_rm:remote_path_tooltip#default}</tooltip> -->
-						<!-- <fixed-text>Remote Error Path:</fixed-text> -->
-						<!-- </widget> -->
-						<!-- <widget type="text" style="SWT.BORDER" saveValueTo="stderr_remote_path"> -->
-						<!-- <layout-data> -->
-						<!-- <grid-data horizontalAlign="SWT.FILL" horizontalSpan="2" grabExcessHorizontal="true" widthHint="100"/> -->
-						<!-- </layout-data> -->
-						<!-- </widget> -->
-						<!-- <widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_BLUE"> -->
-						<!-- <fixed-text>Enable read upon job termination</fixed-text> -->
-						<!-- </widget> -->
-						<!-- </composite> -->
-					</composite>
-				</composite>
-			</dynamic>
-		</launch-tab>
-	</control-data>
-	<monitor-data schedulerType="PBS">
-		<driver>
-			<name></name>
-		</driver>
-	</monitor-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/sharedvar-example-2.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/sharedvar-example-2.xml
deleted file mode 100644
index d47bc41..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/sharedvar-example-2.xml
+++ /dev/null
@@ -1,583 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="miscellaneous-example">
-	<control-data>
-		<property name="a1" visible="true" translateBooleanAs="1,0"/>
-		<property name="a2" visible="true" translateBooleanAs="1,0"/>
-		<property name="a3" visible="true" translateBooleanAs="1,0"/>
-		<property name="a4" visible="true" translateBooleanAs="1,0"/>
-		<property name="b1" visible="true" translateBooleanAs="1,0"/>
-		<property name="b2" visible="true" translateBooleanAs="1,0"/>
-		<property name="b3" visible="true" translateBooleanAs="1,0"/>
-		<property name="b4" visible="true" translateBooleanAs="1,0"/>
-		<property name="c1" visible="true" translateBooleanAs="1,0"/>
-		<property name="c2" visible="true" translateBooleanAs="1,0"/>
-		<property name="c3" visible="true" translateBooleanAs="1,0"/>
-		<property name="c4" visible="true" translateBooleanAs="1,0"/>
-		<property name="d1" visible="true" translateBooleanAs="1,0"/>
-		<property name="d2" visible="true" translateBooleanAs="1,0"/>
-		<property name="d3" visible="true" translateBooleanAs="1,0"/>
-		<property name="d4" visible="true" translateBooleanAs="1,0"/>
-		<property name="e1" visible="true" translateBooleanAs="1,0"/>
-		<property name="e2" visible="true" translateBooleanAs="1,0"/>
-		<property name="e3" visible="true" translateBooleanAs="1,0"/>
-		<property name="e4" visible="true" translateBooleanAs="1,0"/>
-		<property name="f1" visible="true" translateBooleanAs="1,0"/>
-		<property name="f2" visible="true" translateBooleanAs="1,0"/>
-		<property name="f3" visible="true" translateBooleanAs="1,0"/>
-		<property name="f4" visible="true" translateBooleanAs="1,0"/>
-		<script>
-			<line>
-				<arg isUndefinedIfMatches="a1=">a1=${ptp_rm:a1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="a2=">a2=${ptp_rm:a2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="a3=">a3=${ptp_rm:a3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="a4=">a4=${ptp_rm:a4#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="b1=">b1=${ptp_rm:b1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="b2=">b2=${ptp_rm:b2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="b3=">b3=${ptp_rm:b3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="b4=">b4=${ptp_rm:b4#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="c1=">c1=${ptp_rm:c1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="c2=">c2=${ptp_rm:c2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="c3=">c3=${ptp_rm:c3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="c4=">c4=${ptp_rm:c4#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="d1=">d1=${ptp_rm:d1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="d2=">d2=${ptp_rm:d2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="d3=">d3=${ptp_rm:d3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="d4=">d4=${ptp_rm:d4#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="e1=">e1=${ptp_rm:e1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="e2=">e2=${ptp_rm:e2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="e3=">e3=${ptp_rm:e3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="e4=">e4=${ptp_rm:e4#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="f1=">f1=${ptp_rm:f1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="f2=">f2=${ptp_rm:f2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="f3=">f3=${ptp_rm:f3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="f4=">f4=${ptp_rm:f4#value}</arg>
-			</line>
-		</script>
-		<submit-interactive name="submit-interactive">
-			<arg>echo</arg>
-			<arg>$VAR_a1</arg>
-			<arg>$VAR_a2</arg>
-			<arg>$VAR_a3</arg>
-			<arg>$VAR_a4</arg>
-			<arg>$VAR_b1</arg>
-			<arg>$VAR_b2</arg>
-			<arg>$VAR_b3</arg>
-			<arg>$VAR_b4</arg>
-			<arg>$VAR_c1</arg>
-			<arg>$VAR_c2</arg>
-			<arg>$VAR_c3</arg>
-			<arg>$VAR_c4</arg>
-			<arg>$VAR_d1</arg>
-			<arg>$VAR_d2</arg>
-			<arg>$VAR_d3</arg>
-			<arg>$VAR_d4</arg>
-			<arg>$VAR_e1</arg>
-			<arg>$VAR_e2</arg>
-			<arg>$VAR_e3</arg>
-			<arg>$VAR_e4</arg>
-			<arg>$VAR_f1</arg>
-			<arg>$VAR_f2</arg>
-			<arg>$VAR_f3</arg>
-			<arg>$VAR_f4</arg>
-			<environment name="VAR_a1" value="${ptp_rm:a1#value}"/>
-			<environment name="VAR_a2" value="${ptp_rm:a2#value}"/>
-			<environment name="VAR_a3" value="${ptp_rm:a3#value}"/>
-			<environment name="VAR_a4" value="${ptp_rm:a4#value}"/>
-			<environment name="VAR_b1" value="${ptp_rm:b1#value}"/>
-			<environment name="VAR_b2" value="${ptp_rm:b2#value}"/>
-			<environment name="VAR_b3" value="${ptp_rm:b3#value}"/>
-			<environment name="VAR_b4" value="${ptp_rm:b4#value}"/>
-			<environment name="VAR_c1" value="${ptp_rm:c1#value}"/>
-			<environment name="VAR_c2" value="${ptp_rm:c2#value}"/>
-			<environment name="VAR_c3" value="${ptp_rm:c3#value}"/>
-			<environment name="VAR_c4" value="${ptp_rm:c4#value}"/>
-			<environment name="VAR_d1" value="${ptp_rm:d1#value}"/>
-			<environment name="VAR_d2" value="${ptp_rm:d2#value}"/>
-			<environment name="VAR_d3" value="${ptp_rm:d3#value}"/>
-			<environment name="VAR_d4" value="${ptp_rm:d4#value}"/>
-			<environment name="VAR_e1" value="${ptp_rm:e1#value}"/>
-			<environment name="VAR_e2" value="${ptp_rm:e2#value}"/>
-			<environment name="VAR_e3" value="${ptp_rm:e3#value}"/>
-			<environment name="VAR_e4" value="${ptp_rm:e4#value}"/>
-			<environment name="VAR_f1" value="${ptp_rm:f1#value}"/>
-			<environment name="VAR_f2" value="${ptp_rm:f2#value}"/>
-			<environment name="VAR_f3" value="${ptp_rm:f3#value}"/>
-			<environment name="VAR_f4" value="${ptp_rm:f4#value}"/>
-			<stdout-parser delim="\n">
-            <target type="property">
-               <match>
-                  <expression>(${ptp_rm:a1#value}).*</expression>
-                  <set field="name">
-                     <entry valueGroup="1"/>
-                  </set>
-               </match>
-            </target>
-         </stdout-parser>
-		</submit-interactive>
-		<launch-tab>
-			<dynamic includeWidgetValuesFrom="B,C,D,E,F">
-				<title>A</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>a1:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="a1" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>a2:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="a2" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>a3:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="a3" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>a4:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="a4" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic includeWidgetValuesFrom="A,C,D,E,F">
-				<title>B</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>b1:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="b1" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>b2:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="b2" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>b3:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="b3" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>b4:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="b4" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic includeWidgetValuesFrom="A,B,D,E,F">
-				<title>C</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>c1:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="c1" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>c2:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="c2" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>c3:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="c3" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>c4:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="c4" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic includeWidgetValuesFrom="A,B,C,E,F">
-				<title>D</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>d1:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="d1" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>d2:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="d2" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>d3:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="d3" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>d4:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="d4" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic includeWidgetValuesFrom="A,B,C,D,F">
-				<title>E</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>e1:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="e1" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>e2:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="e2" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>e3:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="e3" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>e4:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="e4" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic includeWidgetValuesFrom="A,B,C,D,E">
-            <title>F</title>
-            <layout>
-               <grid-layout/>
-            </layout>
-            <composite group="true">
-               <layout>
-                  <grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-               </layout>
-               <widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-                  </layout-data>
-                  <fixed-text>Name</fixed-text>
-               </widget>
-               <widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-                  </layout-data>
-                  <fixed-text>Value</fixed-text>
-               </widget>
-               <widget type="label" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-                  </layout-data>
-                  <fixed-text>f1:</fixed-text>
-               </widget>
-               <widget type="checkbox" saveValueTo="f1" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-                  </layout-data>
-               </widget>
-               <widget type="label" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-                  </layout-data>
-                  <fixed-text>f2:</fixed-text>
-               </widget>
-               <widget type="checkbox" saveValueTo="f2" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-                  </layout-data>
-               </widget>
-               <widget type="label" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-                  </layout-data>
-                  <fixed-text>f3:</fixed-text>
-               </widget>
-               <widget type="checkbox" saveValueTo="f3" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-                  </layout-data>
-               </widget>
-               <widget type="label" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-                  </layout-data>
-                  <fixed-text>f4:</fixed-text>
-               </widget>
-               <widget type="checkbox" saveValueTo="f4" style="SWT.LEFT">
-                  <layout-data>
-                     <grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-                  </layout-data>
-               </widget>
-            </composite>
-         </dynamic>
-		</launch-tab>
-	</control-data>
-	<monitor-data schedulerType="Tabbed">
-		<driver>
-			<name></name>
-		</driver>
-	</monitor-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/sharedvar-example.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/sharedvar-example.xml
deleted file mode 100644
index 794e360..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/sharedvar-example.xml
+++ /dev/null
@@ -1,554 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="miscellaneous-example">
-	<control-data>
-		<property name="a1" visible="true" translateBooleanAs="1,0"/>
-		<property name="a2" visible="true" translateBooleanAs="1,0"/>
-		<property name="a3" visible="true" translateBooleanAs="1,0"/>
-		<property name="a4" visible="true" translateBooleanAs="1,0"/>
-		<property name="b1" visible="true" translateBooleanAs="1,0"/>
-		<property name="b2" visible="true" translateBooleanAs="1,0"/>
-		<property name="b3" visible="true" translateBooleanAs="1,0"/>
-		<property name="b4" visible="true" translateBooleanAs="1,0"/>
-		<property name="c1" visible="true" translateBooleanAs="1,0"/>
-		<property name="c2" visible="true" translateBooleanAs="1,0"/>
-		<property name="c3" visible="true" translateBooleanAs="1,0"/>
-		<property name="c4" visible="true" translateBooleanAs="1,0"/>
-		<property name="d1" visible="true" translateBooleanAs="1,0"/>
-		<property name="d2" visible="true" translateBooleanAs="1,0"/>
-		<property name="d3" visible="true" translateBooleanAs="1,0"/>
-		<property name="d4" visible="true" translateBooleanAs="1,0"/>
-		<property name="e1" visible="true" translateBooleanAs="1,0"/>
-		<property name="e2" visible="true" translateBooleanAs="1,0"/>
-		<property name="e3" visible="true" translateBooleanAs="1,0"/>
-		<property name="e4" visible="true" translateBooleanAs="1,0"/>
-		<property name="f1" visible="true" translateBooleanAs="1,0"/>
-		<property name="f2" visible="true" translateBooleanAs="1,0"/>
-		<property name="f3" visible="true" translateBooleanAs="1,0"/>
-		<property name="f4" visible="true" translateBooleanAs="1,0"/>
-		<script>
-			<line>
-				<arg isUndefinedIfMatches="a1=">a1=${ptp_rm:a1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="a2=">a2=${ptp_rm:a2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="a3=">a3=${ptp_rm:a3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="a4=">a4=${ptp_rm:a4#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="b1=">b1=${ptp_rm:b1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="b2=">b2=${ptp_rm:b2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="b3=">b3=${ptp_rm:b3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="b4=">b4=${ptp_rm:b4#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="c1=">c1=${ptp_rm:c1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="c2=">c2=${ptp_rm:c2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="c3=">c3=${ptp_rm:c3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="c4=">c4=${ptp_rm:c4#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="d1=">d1=${ptp_rm:d1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="d2=">d2=${ptp_rm:d2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="d3=">d3=${ptp_rm:d3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="d4=">d4=${ptp_rm:d4#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="e1=">e1=${ptp_rm:e1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="e2=">e2=${ptp_rm:e2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="e3=">e3=${ptp_rm:e3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="e4=">e4=${ptp_rm:e4#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="f1=">f1=${ptp_rm:f1#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="f2=">f2=${ptp_rm:f2#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="f3=">f3=${ptp_rm:f3#value}</arg>
-			</line>
-			<line>
-				<arg isUndefinedIfMatches="f4=">f4=${ptp_rm:f4#value}</arg>
-			</line>
-		</script>
-		<submit-interactive name="submit-interactive" keepOpen="true">
-			<arg>echo</arg>
-			<arg>$VAR_a1</arg>
-			<arg>$VAR_a2</arg>
-			<arg>$VAR_a3</arg>
-			<arg>$VAR_a4</arg>
-			<arg>$VAR_b1</arg>
-			<arg>$VAR_b2</arg>
-			<arg>$VAR_b3</arg>
-			<arg>$VAR_b4</arg>
-			<arg>$VAR_c1</arg>
-			<arg>$VAR_c2</arg>
-			<arg>$VAR_c3</arg>
-			<arg>$VAR_c4</arg>
-			<arg>$VAR_d1</arg>
-			<arg>$VAR_d2</arg>
-			<arg>$VAR_d3</arg>
-			<arg>$VAR_d4</arg>
-			<arg>$VAR_e1</arg>
-			<arg>$VAR_e2</arg>
-			<arg>$VAR_e3</arg>
-			<arg>$VAR_e4</arg>
-			<arg>$VAR_f1</arg>
-			<arg>$VAR_f2</arg>
-			<arg>$VAR_f3</arg>
-			<arg>$VAR_f4</arg>
-			<environment name="VAR_a1" value="${ptp_rm:a1#value}"/>
-			<environment name="VAR_a2" value="${ptp_rm:a2#value}"/>
-			<environment name="VAR_a3" value="${ptp_rm:a3#value}"/>
-			<environment name="VAR_a4" value="${ptp_rm:a4#value}"/>
-			<environment name="VAR_b1" value="${ptp_rm:b1#value}"/>
-			<environment name="VAR_b2" value="${ptp_rm:b2#value}"/>
-			<environment name="VAR_b3" value="${ptp_rm:b3#value}"/>
-			<environment name="VAR_b4" value="${ptp_rm:b4#value}"/>
-			<environment name="VAR_c1" value="${ptp_rm:c1#value}"/>
-			<environment name="VAR_c2" value="${ptp_rm:c2#value}"/>
-			<environment name="VAR_c3" value="${ptp_rm:c3#value}"/>
-			<environment name="VAR_c4" value="${ptp_rm:c4#value}"/>
-			<environment name="VAR_d1" value="${ptp_rm:d1#value}"/>
-			<environment name="VAR_d2" value="${ptp_rm:d2#value}"/>
-			<environment name="VAR_d3" value="${ptp_rm:d3#value}"/>
-			<environment name="VAR_d4" value="${ptp_rm:d4#value}"/>
-			<environment name="VAR_e1" value="${ptp_rm:e1#value}"/>
-			<environment name="VAR_e2" value="${ptp_rm:e2#value}"/>
-			<environment name="VAR_e3" value="${ptp_rm:e3#value}"/>
-			<environment name="VAR_e4" value="${ptp_rm:e4#value}"/>
-			<environment name="VAR_f1" value="${ptp_rm:f1#value}"/>
-			<environment name="VAR_f2" value="${ptp_rm:f2#value}"/>
-			<environment name="VAR_f3" value="${ptp_rm:f3#value}"/>
-			<environment name="VAR_f4" value="${ptp_rm:f4#value}"/>
-			<stdout-parser delim="\n">
-            <target type="property">
-               <match>
-                  <expression>(${ptp_rm:a1#value}).*</expression>
-                  <set field="name">
-                     <entry valueGroup="1"/>
-                  </set>
-               </match>
-            </target>
-         </stdout-parser>
-		</submit-interactive>
-		<launch-tab>
-			<dynamic includeWidgetValuesFrom="F">
-				<title>A</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>a1:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="a1" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>a2:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="a2" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>a3:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="a3" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>a4:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="a4" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic includeWidgetValuesFrom="C,D,E">
-				<title>B</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>b1:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="b1" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>b2:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="b2" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>b3:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="b3" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>b4:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="b4" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic includeWidgetValuesFrom="E,A">
-				<title>C</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>c1:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="c1" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>c2:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="c2" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>c3:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="c3" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>c4:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="c4" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic includeWidgetValuesFrom="A">
-				<title>D</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>d1:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="d1" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>d2:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="d2" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>d3:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="d3" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>d4:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="d4" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic>
-				<title>E</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="3" makeColumnsEqualWidth="false" horizontalSpacing="10" verticalSpacing="15"/>
-					</layout>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Name</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT" foreground="SWT.COLOR_DARK_RED">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" horizontalSpan="2" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>Value</fixed-text>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>e1:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="e1" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>e2:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="e2" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>e3:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="e3" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-					<widget type="label" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.BEGINNING" grabExcessHorizontal="false"/>
-						</layout-data>
-						<fixed-text>e4:</fixed-text>
-					</widget>
-					<widget type="checkbox" saveValueTo="e4" style="SWT.LEFT">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" grabExcessHorizontal="false" horizontalSpan="2"/>
-						</layout-data>
-					</widget>
-				</composite>
-			</dynamic>
-			<dynamic includeWidgetValuesFrom="D">
-				<title>F</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout/>
-					</layout>
-					<layout-data>
-						<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.CENTER" grabExcessHorizontal="true"/>
-					</layout-data>
-					<widget type="text" readOnly="true" style="SWT.BORDER | SWT.WRAP | SWT.V_SCROLL">
-						<layout-data>
-							<grid-data heightHint="75" horizontalAlign="SWT.FILL" verticalAlign="SWT.CENTER" grabExcessHorizontal="true"/>
-						</layout-data>
-						<dynamic-text>
-							<arg>${ptp_rm:allAttributes#value}</arg>
-							<arg isUndefinedIfMatches=" destination=''"> destination='${ptp_rm:destination#value}'</arg>
-						</dynamic-text>
-					</widget>
-					<viewer name="allAttributes" style="SWT.BORDER | SWT.MULTI" sort="true" type="tree" initialAllChecked="false">
-						<layout-data>
-							<grid-data horizontalAlign="SWT.FILL" verticalAlign="SWT.CENTER" grabExcessHorizontal="true"/>
-						</layout-data>
-						<column-data name="Name" width="175" resizable="true">
-							<tooltip>Multi-select and click checkbox to apply change to all rows.</tooltip>
-						</column-data>
-						<column-data name="Value" width="200" resizable="true">
-							<tooltip>Click to activate value widget.</tooltip>
-						</column-data>
-						<items allPredefined="true">
-							<exclude>destination</exclude>
-						</items>
-						<value pattern="@name='@value'"/>
-					</viewer>
-				</composite>
-			</dynamic>
-		</launch-tab>
-	</control-data>
-	<monitor-data schedulerType="Tabbed">
-		<driver>
-			<name></name>
-		</driver>
-	</monitor-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/tokenizer-examples.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/tokenizer-examples.xml
deleted file mode 100644
index 44df013..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/tokenizer-examples.xml
+++ /dev/null
@@ -1,479 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="test-parsers">
-	<control-data>
-		<!-- EXAMPLE 1: output is a list of line-separated queue names to be assigned
-			to the known property "available-queues" -->
-		<start-up-command name="test01ParseQstat">
-			<arg/>
-			<stdout-parser delim="\n">
-				<target ref="queues">
-					<match>
-						<expression>([\w\d]+)</expression>
-						<add field="value">
-							<entry valueGroup="1"/>
-						</add>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<!-- EXAMPLE 2: output is to be searched for its final line which should
-			contain a job id of the form "[digits].[chars]" -->
-		<start-up-command name="test02JobId" waitForId="true">
-			<arg/>
-			<stdout-parser delim="\n" all="true" save="1">
-				<target ref="@jobId">
-					<match>
-						<expression>([\d]+)([.])(.+)[\s]+.*</expression>
-						<append field="name">
-							<entry valueGroup="1"/>
-							<entry valueGroup="2"/>
-							<entry valueGroup="3"/>
-						</append>
-						<set field="default">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry value="SUBMITTED"/>
-						</set>
-					</match>
-					<match>
-						<expression>([\d]+)[.].+</expression>
-						<set field="name">
-							<entry valueGroup="0"/>
-						</set>
-						<set field="default">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry value="SUBMITTED"/>
-						</set>
-					</match>
-				</target>
-				<target ref="@jobId">
-					<match>
-						<expression flags="DOTALL">.*Job not submitted.*</expression>
-						<set field="value">
-							<entry value="FAILED"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-			<stderr-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.*Job not submitted.*</expression>
-						<throw message="Job Submit Failed"/>
-					</match>
-				</target>
-			</stderr-parser>
-		</start-up-command>
-		<!-- EXAMPLE 3: indeterminate number and order of lines containing parts
-			of attribute definitions, but each line bearing a distinct
-			id (e.g., openMPI attribute discovery) -->
-		<start-up-command name="test03OpenMPI">
-			<arg/>
-			<stdout-parser delim="\n">
-				<target type="attribute">
-					<match>
-						<expression>mca:.*:param:([^:]*):value:(.*)</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="visible">
-							<entry value="true"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-					<match>
-						<expression>mca:.*:param:([^:]*):status:(.*)</expression>
-						<set field="status">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-					<match>
-						<expression>mca:.*:param:([^:]*):help:(.*)</expression>
-						<set field="tooltip">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-					<test op="EQ">
-						<value>#status</value>
-						<value>read-only</value>
-						<set field="readOnly">
-							<entry value="true"/>
-						</set>
-						<else>
-							<set field="readOnly">
-								<entry value="false"/>
-							</set>
-						</else>
-					</test>
-				</target>
-				<target type="attribute">
-					<match>
-						<expression>ompi:version:full:([\d]+)[.]([\d]+).*</expression>
-						<set field="name">
-							<entry value="ompi_major_version"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="visible">
-							<entry value="true"/>
-						</set>
-						<set field="readOnly">
-							<entry value="true"/>
-						</set>
-						<set field="name" forceNewObject="true">
-							<entry value="ompi_minor_version"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="2"/>
-						</set>
-						<set field="visible">
-							<entry value="true"/>
-						</set>
-						<set field="readOnly">
-							<entry value="true"/>
-						</set>
-					</match>
-					<test op="AND">
-						<test op="EQ">
-							<value>#name</value>
-							<value>ompi_minor_version</value>
-						</test>
-						<test op="LT">
-							<value>#value</value>
-							<value>7</value>
-						</test>
-						<throw message="Only supports Open MPI 1.7 and later"/>
-					</test>
-				</target>
-				<target type="attribute">
-					<match>
-						<expression>(.*):([^:]*)</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="2"/>
-						</set>
-						<set field="visible">
-							<entry value="false"/>
-						</set>
-						<set field="readOnly">
-							<entry value="true"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<!-- EXAMPLE 4: indeterminate number of definitions, but grouped
-			by caption; use of moveToTop to promote the target to the top of the list
-			when the caption appears -->
-		<start-up-command name="test04ImplicitWithTags">
-			<arg/>
-			<stdout-parser delim="\n">
-				<target type="property">
-					<match moveToTop="true">
-						<expression>PROPERTY</expression>
-					</match>
-					<match>
-						<expression>name:(.*)</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-					<match>
-						<expression>value:(.*)</expression>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-				</target>
-				<target type="attribute">
-					<match moveToTop="true">
-						<expression>ATTRIBUTE</expression>
-					</match>
-					<match>
-						<expression>name:(.*)</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-					<match>
-						<expression>value:(.*)</expression>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<!-- EXAMPLE 5: similar to 4, but without delimiter (implicit ordering) -->
-		<start-up-command name="test05ImplicitOrdering">
-			<arg/>
-			<stdout-parser delim="\n">
-				<target type="attribute" matchAll="true">
-					<match>
-						<expression>.+</expression>
-						<set field="name">
-							<entry valueGroup="0"/>
-						</set>
-					</match>
-					<match>
-						<expression>.*</expression>
-						<set field="type">
-							<entry valueGroup="0"/>
-						</set>
-					</match>
-					<match>
-						<expression>.*</expression>
-						<set field="description">
-							<entry valueGroup="0"/>
-						</set>
-					</match>
-					<match>
-						<expression>.*</expression>
-						<set field="tooltip">
-							<entry valueGroup="0"/>
-						</set>
-					</match>
-					<match>
-						<expression>.*</expression>
-						<set field="value">
-							<entry valueGroup="0"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<!-- EXAMPLE 6: similar to 4, but with indeterminate type order and using buffer + DOTALL | UNIX_LINES -->
-		<start-up-command name="test06ImplicitWithTagsDotall">
-			<arg/>
-			<stdout-parser maxMatchLen="32" applyToAll="true">
-				<target type="property">
-					<match>
-						<expression flags="DOTALL | UNIX_LINES">.*PROPERTY[\n]name:(\w*)[\n]value:([\d.-]*).*</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-				</target>
-				<target type="property">
-					<match>
-						<expression flags="DOTALL | UNIX_LINES">.*PROPERTY[\n]value:([\d.-]*)[\n]name:(\w*).*</expression>
-						<set field="name">
-							<entry valueGroup="2"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-				</target>
-				<target type="attribute">
-					<match>
-						<expression flags="DOTALL | UNIX_LINES">.*ATTRIBUTE[\n]name:(\w*)[\n]value:([\d.-]*).*</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-				</target>
-				<target type="attribute">
-					<match>
-						<expression flags="DOTALL | UNIX_LINES">.*ATTRIBUTE[\n]value:([\d.-]*)[\n]name:(\w*).*</expression>
-						<set field="name">
-							<entry valueGroup="2"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<!-- EXAMPLE 7: indeterminate number of property definitions, but on single line -->
-		<start-up-command name="test07PropertyDefsSingleLine">
-			<arg/>
-			<stdout-parser delim="\n">
-				<target type="property">
-					<match>
-						<expression expression="&lt;name&gt;(.*)&lt;/name&gt;&lt;value&gt;(.*)&lt;/value&gt;"/>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<!-- EXAMPLE 8: looking for values interspersed in the stream but which will
-			not exceed 32 chars -->
-		<start-up-command name="test08JobStates">
-			<arg/>
-			<stdout-parser maxMatchLen="32">
-				<target ref="jobStates">
-					<match>
-						<expression flags="DOTALL | UNIX_LINES">.*&lt;job&gt;([\d]*):([\w]*)&lt;/job&gt;.*</expression>
-						<put field="value">
-							<entry keyGroup="1" valueGroup="2"/>
-						</put>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<!-- EXAMPLE 9: successive names/values, in order, but staggered -->
-		<start-up-command name="test09Staggered">
-			<arg/>
-			<stdout-parser delim="\n">
-				<target type="property">
-					<match>
-						<expression>name:(.*)</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-					<match>
-						<expression>value:(.*)</expression>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<!-- EXAMPLE 10: forced merge -->
-		<start-up-command name="test10Merged">
-			<arg/>
-			<stdout-parser delim="\n">
-				<target type="property">
-					<match>
-						<expression>name:(.+);value:(.+)</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="value">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-					<match>
-						<expression>name:(.+);default:(.+)</expression>
-						<set field="name">
-							<entry valueGroup="1"/>
-						</set>
-						<set field="default">
-							<entry valueGroup="2"/>
-						</set>
-					</match>
-				</target>
-			</stdout-parser>
-		</start-up-command>
-		<!-- EXAMPLE 11: exit-on -->
-		<start-up-command name="test11ExitOn">
-			<arg/>
-			<stdout-parser maxMatchLen="32">
-				<target ref="jobStates">
-					<match>
-						<expression flags="DOTALL | UNIX_LINES">.*&lt;job&gt;([\d]*):([\w]*)&lt;/job&gt;.*</expression>
-						<put field="value">
-							<entry keyGroup="1" valueGroup="2"/>
-						</put>
-					</match>
-				</target>
-				<exit-on flags="DOTALL | UNIX_LINES">.*EXIT.*</exit-on>
-			</stdout-parser>
-		</start-up-command>
-		<!-- EXAMPLE 12: exit-after -->
-		<start-up-command name="test12ExitAfter">
-			<arg/>
-			<stdout-parser maxMatchLen="32">
-				<target ref="jobStates">
-					<match>
-						<expression flags="DOTALL | UNIX_LINES">.*&lt;job&gt;([\d]*):([\w]*)&lt;/job&gt;.*</expression>
-						<put field="value">
-							<entry keyGroup="1" valueGroup="2"/>
-						</put>
-					</match>
-				</target>
-				<exit-after flags="DOTALL | UNIX_LINES">.*EXIT.*</exit-after>
-			</stdout-parser>
-		</start-up-command>
-		<submit-interactive name="empty">
-			<arg/>
-		</submit-interactive>
-		<!-- EXAMPLE 13: get-status (use of tests) -->
-		<get-job-status name="get-job-status" ignoreExitStatus="true">
-			<arg>qstat</arg>
-			<arg>${ptp_rm:@jobId#name}</arg>
-			<stdout-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>[\d]+[.].+[\s]+.+[\s]+.+[\s]+.+[\s]+([A-Z])[\s]+.+</expression>
-						<set field="value">
-							<entry valueGroup="1"/>
-						</set>
-					</match>
-					<test op="EQ">
-						<value>#value</value>
-						<value>Q</value>
-						<set field="value">
-							<entry value="QUEUED_ACTIVE"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>R</value>
-						<set field="value">
-							<entry value="RUNNING"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>S</value>
-						<set field="value">
-							<entry value="SUSPENDED"/>
-						</set>
-					</test>
-					<test op="EQ">
-						<value>#value</value>
-						<value>H</value>
-						<set field="value">
-							<entry value="SYSTEM_ON_HOLD"/>
-						</set>
-					</test>
-					<else>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</else>
-				</target>
-			</stdout-parser>
-			<stderr-parser delim="\n">
-				<target ref="@jobId">
-					<match>
-						<expression>.+</expression>
-						<set field="value">
-							<entry value="COMPLETED"/>
-						</set>
-					</match>
-				</target>
-			</stderr-parser>
-		</get-job-status>
-	</control-data>
-	<monitor-data schedulerType="test">
-		<driver>
-			<name></name>
-		</driver>
-	</monitor-data>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/data/viewer-example.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/data/viewer-example.xml
deleted file mode 100644
index 2946538..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/data/viewer-example.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ******************************************************************************* -->
-<!-- * Copyright (c) 2011 University of Illinois All rights reserved. This program -->
-<!-- * and the accompanying materials are made available under the terms of the -->
-<!-- * Eclipse Public License v1.0 which accompanies this distribution, and is -->
-<!-- * available at http://www.eclipse.org/legal/epl-v10.html -->
-<!-- * -->
-<!-- * Contributors: -->
-<!-- * Albert L. Rossi - design and implementation -->
-<!-- ****************************************************************************** -->
-<resource-manager-builder xmlns="http://org.eclipse.ptp/rm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="resource_manager_type.xsd" name="viewer-example.xml">
-	<control-data>
-		<attribute name="e1" visible="true" status="valid" type="integer">
-			<description>it's "e1"</description>
-			<tooltip>use in conjunction with E1</tooltip>
-			<default>1</default>
-		</attribute>
-		<attribute name="e2" visible="true" status="valid" type="integer">
-			<description>it's "e2"</description>
-			<tooltip>use in conjunction with E2</tooltip>
-			<default>2</default>
-		</attribute>
-		<attribute name="e3" visible="true" status="valid" type="integer">
-			<description>it's "e3"</description>
-			<tooltip>use in conjunction with E3</tooltip>
-			<default>3</default>
-		</attribute>
-		<attribute name="e4" visible="true" status="unsupported" translateBooleanAs="0,4">
-			<description>it's "e4"</description>
-			<tooltip>use in conjunction with E4</tooltip>
-			<default>4</default>
-		</attribute>
-		<attribute name="e5" visible="true" status="unsupported" type="integer">
-			<description>it's "e5"</description>
-			<tooltip>use in conjunction with E5</tooltip>
-			<default>5</default>
-		</attribute>
-		<attribute name="linked" visible="false" status="valid" type="integer">
-			<description>a linked variable</description>
-			<tooltip>linked to e5</tooltip>
-			<default>6</default>
-			<link-value-to>e5</link-value-to>
-		</attribute>
-		<launch-tab>
-			<dynamic>
-				<title>Environment Table</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="1"/>
-					</layout>
-					<widget type="text" readOnly="true" style="SWT.LEFT | SWT.BORDER | SWT.WRAP | SWT.V_SCROLL">
-						<layout-data>
-							<grid-data widthHint="100" heightHint="15"/>
-						</layout-data>
-						<tooltip>${ptp_rm:linked#tooltip}</tooltip>
-						<dynamic-text>
-							<arg>${ptp_rm:linked#value}</arg>
-						</dynamic-text>
-					</widget>
-					<viewer name="environmentT1" style="SWT.BORDER | SWT.MULTI" sort="true" type="table">
-						<layout-data>
-							<grid-data widthHint="600" heightHint="200" horizontalSpan="1"/>
-						</layout-data>
-						<!-- These are the 6 attribute fields mappable to columns. In a "table viewer" the order of the columns is entirely arbitrary -->
-						<column-data name="Name" width="100"/>
-						<column-data name="Status" width="100"/>
-						<column-data name="Description" width="100"/>
-						<column-data name="Value" width="100"/>
-						<column-data name="Default" width="100"/>
-						<column-data name="Type" width="100"/>
-						<items>
-							<include>e1</include>
-							<include>e2</include>
-							<include>e3</include>
-							<include>e4</include>
-							<include>e5</include>
-						</items>
-						<value pattern="export @name='@value'" separator="; "/>
-					</viewer>
-				</composite>
-			</dynamic>
-			<dynamic>
-				<title>Environment Tree</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="1"/>
-					</layout>
-					<viewer name="environmentT2" style="SWT.BORDER | SWT.MULTI" sort="true" type="tree">
-						<layout-data>
-							<grid-data widthHint="600" heightHint="200" horizontalSpan="1"/>
-						</layout-data>
-						<column-data name="Name" width="100"/>
-						<column-data name="Description" width="100"/>
-						<column-data name="Type" width="100"/>
-						<column-data name="Status" width="100"/>
-						<column-data name="Default" width="100"/>
-						<column-data name="Value" width="100"/>
-						<items>
-							<include>e1</include>
-							<include>e2</include>
-							<include>e3</include>
-							<include>e4</include>
-							<include>e5</include>
-						</items>
-						<value pattern="export @name='@value'" separator="; "/>
-					</viewer>
-				</composite>
-			</dynamic>
-			<dynamic>
-				<title>Environment Tree Value Only</title>
-				<layout>
-					<grid-layout/>
-				</layout>
-				<composite group="true">
-					<layout>
-						<grid-layout numColumns="1"/>
-					</layout>
-					<viewer name="environmentT3" style="SWT.BORDER | SWT.MULTI" sort="true" type="tree" initialAllChecked="false">
-						<layout-data>
-							<grid-data widthHint="600" heightHint="200" horizontalSpan="1"/>
-						</layout-data>
-						<column-data name="Name" width="100"/>
-						<column-data name="Value" width="100"/>
-						<items>
-							<include>e1</include>
-							<include>e2</include>
-							<include>e3</include>
-							<include>e4</include>
-							<include>e5</include>
-						</items>
-						<value pattern="export @name='@value'" separator="; "/>
-					</viewer>
-				</composite>
-			</dynamic>
-		</launch-tab>
-	</control-data>
-	<monitor-data/>
-</resource-manager-builder>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/plugin.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/plugin.xml
deleted file mode 100644
index eb6e229..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/plugin.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.rm.jaxb.core.JAXBResourceManagerConfigurations">
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/browse-example.xml"
-            name="Browse Example">
-      </JAXBResourceManagerConfiguration>
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/button-group-example.xml"
-            name="Button Group Example">
-      </JAXBResourceManagerConfiguration>
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/control-state-example.xml"
-            name="Control State Example">
-      </JAXBResourceManagerConfiguration>
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/demo-example.xml"
-            name="Demo Example">
-      </JAXBResourceManagerConfiguration>
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/demo-example-with-action.xml"
-            name="Demo Full (with Action) Example">
-      </JAXBResourceManagerConfiguration>
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/discovered-properties-example.xml"
-            name="Discovered Properties Example">
-      </JAXBResourceManagerConfiguration>
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/namelist-example.xml"
-            name="Namelist (Input) File Example">
-      </JAXBResourceManagerConfiguration>
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/sharedvar-example.xml"
-            name="Shared Variable Example">
-      </JAXBResourceManagerConfiguration>
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/viewer-example.xml"
-            name="Viewers Example">
-      </JAXBResourceManagerConfiguration>
-      <JAXBResourceManagerConfiguration
-            configurationFile="data/sharedvar-example-2.xml"
-            name="Shared Variable Example 2">
-      </JAXBResourceManagerConfiguration>
-   </extension>
-
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/pom.xml b/rms/org.eclipse.ptp.rm.jaxb.tests/pom.xml
deleted file mode 100644
index e69f81c..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse.ptp</groupId>
-    <artifactId>ptp-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.ptp.rm.jaxb.tests</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>eclipse-test-plugin</packaging>
-</project>
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/JAXBTestsPlugin.java b/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/JAXBTestsPlugin.java
deleted file mode 100644
index 1f4cc65..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/JAXBTestsPlugin.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.jaxb.tests;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-
-import org.eclipse.core.resources.ISaveContext;
-import org.eclipse.core.resources.ISaveParticipant;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.core.Preferences;
-import org.eclipse.ptp.rm.core.RMCorePlugin;
-import org.eclipse.ptp.rm.jaxb.core.JAXBCoreConstants;
-import org.eclipse.ptp.rm.jaxb.core.JAXBInitializationUtils;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.xml.sax.SAXException;
-
-public class JAXBTestsPlugin extends Plugin {
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.jaxb.tests"; //$NON-NLS-1$
-
-	// The shared instance
-	private static JAXBTestsPlugin fPlugin;
-
-	/**
-	 * The constructor
-	 */
-	public JAXBTestsPlugin() {
-		fPlugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		ResourcesPlugin.getWorkspace().addSaveParticipant(getUniqueIdentifier(), new ISaveParticipant() {
-			public void doneSaving(ISaveContext saveContext) {
-				// Nothing
-			}
-
-			public void prepareToSave(ISaveContext saveContext) throws CoreException {
-				// Nothing
-			}
-
-			public void rollback(ISaveContext saveContext) {
-				// Nothing
-			}
-
-			public void saving(ISaveContext saveContext) throws CoreException {
-				Preferences.savePreferences(getUniqueIdentifier());
-			}
-		});
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		try {
-			Preferences.savePreferences(getUniqueIdentifier());
-			ResourcesPlugin.getWorkspace().removeSaveParticipant(getUniqueIdentifier());
-		} finally {
-			super.stop(context);
-			fPlugin = null;
-		}
-	}
-
-	/**
-	 * Raise core exception.
-	 * 
-	 * @param message
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message) {
-		return new CoreException(new Status(IStatus.ERROR, RMCorePlugin.getDefault().getBundle().getSymbolicName(), message));
-	}
-
-	/**
-	 * Raise core exception.
-	 * 
-	 * @param message
-	 * @param t
-	 * @return
-	 */
-	public static CoreException coreErrorException(String message, Throwable t) {
-		return new CoreException(new Status(IStatus.ERROR, RMCorePlugin.getDefault().getBundle().getSymbolicName(), message, t));
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static JAXBTestsPlugin getDefault() {
-		return fPlugin;
-	}
-
-	public static JAXBTestsPlugin getfPlugin() {
-		return fPlugin;
-	}
-
-	public static URL getResource(String resource) throws IOException {
-		URL url = null;
-		if (getDefault() != null) {
-			Bundle bundle = getDefault().getBundle();
-			url = FileLocator.find(bundle, new Path(JAXBCoreConstants.PATH_SEP + resource), null);
-		} else {
-			url = new File(resource).toURL();
-		}
-		return url;
-	}
-
-	/**
-	 * Generate a unique identifier
-	 * 
-	 * @return unique identifier string
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null) {
-			return PLUGIN_ID;
-		}
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	public static URL getURL(String name) throws IOException {
-		URL instance = JAXBTestsPlugin.getResource(name);
-		if (instance == null) {
-			File f = new File(name);
-			if (f.exists() && f.isFile()) {
-				instance = f.toURL();
-			} else {
-				throw new FileNotFoundException(name);
-			}
-		}
-		return instance;
-	}
-
-	/**
-	 * 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, e.getMessage(), e));
-	}
-
-	public static void validate(String xml) throws SAXException, IOException, URISyntaxException {
-		JAXBInitializationUtils.validate(getURL(xml));
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/ManagedFilesTest.java b/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/ManagedFilesTest.java
deleted file mode 100644
index 154b6a6..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/ManagedFilesTest.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.jaxb.tests;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.remote.core.RemoteServicesDelegate;
-import org.eclipse.ptp.rm.jaxb.control.JAXBControlConstants;
-import org.eclipse.ptp.rm.jaxb.control.internal.runnable.ManagedFilesJob;
-import org.eclipse.ptp.rm.jaxb.control.internal.variables.RMVariableMap;
-import org.eclipse.ptp.rm.jaxb.control.runnable.ScriptHandler;
-import org.eclipse.ptp.rm.jaxb.core.IJAXBResourceManagerControl;
-import org.eclipse.ptp.rm.jaxb.core.IVariableMap;
-import org.eclipse.ptp.rm.jaxb.core.JAXBInitializationUtils;
-import org.eclipse.ptp.rm.jaxb.core.data.AttributeType;
-import org.eclipse.ptp.rm.jaxb.core.data.ControlType;
-import org.eclipse.ptp.rm.jaxb.core.data.ManagedFileType;
-import org.eclipse.ptp.rm.jaxb.core.data.ManagedFilesType;
-import org.eclipse.ptp.rm.jaxb.core.data.PropertyType;
-import org.eclipse.ptp.rm.jaxb.core.data.ResourceManagerData;
-import org.eclipse.ptp.rm.jaxb.core.data.ScriptType;
-import org.eclipse.ptp.rmsystem.IJobStatus;
-import org.eclipse.ptp.rmsystem.IResourceManagerComponentConfiguration;
-
-public class ManagedFilesTest extends TestCase implements IJAXBResourceManagerControl {
-
-	private static final String xml = JAXBControlConstants.DATA + "test-pbs.xml"; //$NON-NLS-1$
-	private static ControlType controlData;
-	private static Map<String, Object> env;
-	private static Map<String, String> live;
-	private static boolean verbose = false;
-	private RMVariableMap rmVarMap;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.IResourceManagerControl#control(java.lang.String
-	 * , java.lang.String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void control(String jobId, String operation, IProgressMonitor monitor) throws CoreException {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerControl#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rm.jaxb.core.IJAXBResourceManagerControl#getAppendEnv()
-	 */
-	public boolean getAppendEnv() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.IResourceManagerControl#getControlConfiguration
-	 * ()
-	 */
-	public IResourceManagerComponentConfiguration getControlConfiguration() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rm.jaxb.core.IJAXBResourceManagerControl#getEnvironment()
-	 */
-	public IVariableMap getEnvironment() {
-		return rmVarMap;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.IResourceManagerControl#getJobStatus(java.lang
-	 * .String, boolean, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public IJobStatus getJobStatus(String jobId, boolean force, IProgressMonitor monitor) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.IResourceManagerControl#getJobStatus(java.lang
-	 * .String, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public IJobStatus getJobStatus(String jobId, IProgressMonitor monitor) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rm.jaxb.core.IJAXBResourceManagerControl#getLaunchEnv()
-	 */
-	public Map<String, String> getLaunchEnv() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rm.jaxb.core.IJAXBResourceManagerControl#
-	 * getRemoteServicesDelegate(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public RemoteServicesDelegate getRemoteServicesDelegate(IProgressMonitor monitor) throws CoreException {
-		RemoteServicesDelegate d = new RemoteServicesDelegate(null, null);
-		d.initialize(monitor);
-		return d;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rm.jaxb.core.IJAXBResourceManagerControl#getState()
-	 */
-	public String getState() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rm.jaxb.core.IJAXBResourceManagerControl#jobStateChanged
-	 * (java.lang.String, org.eclipse.ptp.rmsystem.IJobStatus)
-	 */
-	public void jobStateChanged(String jobId, IJobStatus status) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rm.jaxb.core.IJAXBResourceManagerControl#runActionCommand
-	 * (java.lang.String, java.lang.String,
-	 * org.eclipse.debug.core.ILaunchConfiguration)
-	 */
-	public Object runActionCommand(String action, String resetValue, ILaunchConfiguration configuration) throws CoreException {
-		return null;
-	}
-
-	@Override
-	public void setUp() {
-		try {
-			JAXBTestsPlugin.validate(xml);
-			ResourceManagerData rmdata = JAXBInitializationUtils.initializeRMData(JAXBTestsPlugin.getURL(xml));
-			controlData = rmdata.getControlData();
-			rmVarMap = new RMVariableMap();
-			JAXBInitializationUtils.initializeMap(rmdata, rmVarMap);
-			env = rmVarMap.getVariables();
-			live = new HashMap<String, String>();
-			live.put("FOO_VAR_1", "FOO_VALUE_1"); //$NON-NLS-1$ //$NON-NLS-2$
-			live.put("FOO_VAR_2", "FOO_VALUE_2"); //$NON-NLS-1$ //$NON-NLS-2$
-			live.put("FOO_VAR_3", "FOO_VALUE_3"); //$NON-NLS-1$ //$NON-NLS-2$
-		} catch (Throwable t) {
-			t.printStackTrace();
-			assertNotNull(t);
-		}
-		setTestValues();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.IResourceManagerControl#start(org.eclipse.core
-	 * .runtime.IProgressMonitor)
-	 */
-	public void start(IProgressMonitor monitor) throws CoreException {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.IResourceManagerControl#stop()
-	 */
-	public void stop() throws CoreException {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.IResourceManagerControl#submitJob(org.eclipse
-	 * .debug.core.ILaunchConfiguration, java.lang.String,
-	 * org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public String submitJob(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
-		return null;
-	}
-
-	@Override
-	public void tearDown() {
-		controlData = null;
-	}
-
-	public void testManagedFiles() {
-		composeScript();
-		if (verbose) {
-			PropertyType contents = (PropertyType) env.get(JAXBControlConstants.SCRIPT);
-			if (contents != null) {
-				System.out.println(contents.getValue());
-			}
-		}
-		ManagedFilesType files = controlData.getManagedFiles().get(0);
-		files = maybeAddManagedFileForScript(files);
-		assertNotNull(files);
-		try {
-			ManagedFilesJob job = new ManagedFilesJob(null, files, this);
-			job.schedule();
-			try {
-				job.join();
-			} catch (InterruptedException t) {
-				t.printStackTrace();
-			}
-		} catch (Throwable t) {
-			t.printStackTrace();
-			assertNotNull(t);
-		}
-	}
-
-	private void composeScript() {
-		ScriptType script = controlData.getScript();
-		assertNotNull(script);
-		ScriptHandler job = new ScriptHandler(null, script, rmVarMap, live, false);
-		job.schedule();
-		try {
-			job.join();
-		} catch (InterruptedException t) {
-			t.printStackTrace();
-		}
-
-		PropertyType contents = (PropertyType) env.get(JAXBControlConstants.SCRIPT);
-		assertNotNull(contents);
-	}
-
-	private ManagedFilesType maybeAddManagedFileForScript(ManagedFilesType files) {
-		PropertyType scriptVar = (PropertyType) rmVarMap.get(JAXBControlConstants.SCRIPT);
-		PropertyType scriptPathVar = (PropertyType) rmVarMap.get(JAXBControlConstants.SCRIPT_PATH);
-		if (scriptVar != null || scriptPathVar != null) {
-			if (files == null) {
-				files = new ManagedFilesType();
-				files.setFileStagingLocation(JAXBControlConstants.ECLIPSESETTINGS);
-			}
-			List<ManagedFileType> fileList = files.getFile();
-			ManagedFileType scriptFile = null;
-			if (!fileList.isEmpty()) {
-				for (ManagedFileType f : fileList) {
-					if (f.getName().equals(JAXBControlConstants.SCRIPT_FILE)) {
-						scriptFile = f;
-						break;
-					}
-				}
-			}
-			if (scriptFile == null) {
-				scriptFile = new ManagedFileType();
-				scriptFile.setName(JAXBControlConstants.SCRIPT_FILE);
-				fileList.add(scriptFile);
-			}
-			scriptFile.setResolveContents(false);
-			scriptFile.setUniqueIdPrefix(true);
-			if (scriptPathVar != null) {
-				scriptFile.setPath(String.valueOf(scriptPathVar.getValue()));
-				scriptFile.setDeleteSourceAfterUse(false);
-			} else {
-				scriptFile.setContents(JAXBControlConstants.OPENVRM + JAXBControlConstants.SCRIPT + JAXBControlConstants.PD
-						+ JAXBControlConstants.VALUE + JAXBControlConstants.CLOSV);
-				scriptFile.setDeleteSourceAfterUse(true);
-			}
-		}
-		return files;
-	}
-
-	private void putValue(String name, String value) {
-		PropertyType p = new PropertyType();
-		p.setName(name);
-		p.setValue(value);
-		env.put(name, p);
-	}
-
-	private void setTestValues() {
-		for (String key : env.keySet()) {
-			Object target = env.get(key);
-			String value = key + "_TEST_VALUE"; //$NON-NLS-1$
-			if (target instanceof PropertyType) {
-				((PropertyType) target).setValue(value);
-			} else if (target instanceof AttributeType) {
-				((AttributeType) target).setValue(value);
-			}
-		}
-		putValue(JAXBControlConstants.CONTROL_USER_VAR, "fooUser"); //$NON-NLS-1$
-		putValue(JAXBControlConstants.CONTROL_ADDRESS_VAR, "abe.ncsa.uiuc.edu"); //$NON-NLS-1$
-		putValue(JAXBControlConstants.DIRECTORY, "/u/ncsa/arossi/test"); //$NON-NLS-1$ 
-		putValue(JAXBControlConstants.MPI_CMD, "mpiexec"); //$NON-NLS-1$ 
-		putValue(JAXBControlConstants.MPI_ARGS, "-np 8"); //$NON-NLS-1$ 
-		putValue(JAXBControlConstants.EXEC_PATH, "/u/ncsa/arossi/test/foo"); //$NON-NLS-1$ 
-		if (verbose) {
-			RMDataTest.print(rmVarMap);
-		}
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/Messages.java b/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/Messages.java
deleted file mode 100644
index a1864e3..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/Messages.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.jaxb.tests;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.jaxb.tests.messages"; //$NON-NLS-1$
-	public static String RMVariableTest_1;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/RMDataTest.java b/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/RMDataTest.java
deleted file mode 100644
index 957c603..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/RMDataTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.jaxb.tests;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.ptp.rm.jaxb.control.internal.variables.RMVariableMap;
-import org.eclipse.ptp.rm.jaxb.core.JAXBCoreConstants;
-import org.eclipse.ptp.rm.jaxb.core.JAXBInitializationUtils;
-import org.eclipse.ptp.rm.jaxb.core.data.AttributeType;
-import org.eclipse.ptp.rm.jaxb.core.data.CommandType;
-import org.eclipse.ptp.rm.jaxb.core.data.PropertyType;
-import org.eclipse.ptp.rm.jaxb.core.data.ResourceManagerData;
-
-public class RMDataTest extends TestCase {
-
-	private static final String rmxml = JAXBCoreConstants.DATA + "test-pbs.xml"; //$NON-NLS-1$
-	private static final String tokxml = JAXBCoreConstants.DATA + "tokenizer-examples.xml"; //$NON-NLS-1$
-
-	@Override
-	public void setUp() {
-
-	}
-
-	@Override
-	public void tearDown() {
-
-	}
-
-	public void testJAXBRMInstantiation() {
-		ResourceManagerData rmdata = null;
-		try {
-			JAXBTestsPlugin.validate(rmxml);
-			rmdata = JAXBInitializationUtils.initializeRMData(JAXBTestsPlugin.getURL(rmxml));
-			if (rmdata != null) {
-				RMVariableMap map = new RMVariableMap();
-				JAXBInitializationUtils.initializeMap(rmdata, map);
-				print(map);
-				String exp = map.getString(null, "${rm:stagein#description}"); //$NON-NLS-1$
-				System.out.println(exp);
-				assertEquals(Messages.RMVariableTest_1, exp);
-			}
-		} catch (Throwable t) {
-			t.printStackTrace();
-			assert (t != null);
-		}
-	}
-
-	public void testJAXBTokenizerInstantiation() {
-		ResourceManagerData rmdata = null;
-		try {
-			JAXBTestsPlugin.validate(tokxml);
-			rmdata = JAXBInitializationUtils.initializeRMData(JAXBTestsPlugin.getURL(tokxml));
-			if (rmdata != null) {
-				List<CommandType> cmds = rmdata.getControlData().getStartUpCommand();
-				for (CommandType cmd : cmds) {
-					System.out.println(cmd.getName());
-				}
-			}
-		} catch (Throwable t) {
-			t.printStackTrace();
-			assert (t != null);
-		}
-	}
-
-	static void print(RMVariableMap map) {
-		StringBuffer buffer = new StringBuffer();
-		for (Iterator<Map.Entry<String, Object>> i = map.getVariables().entrySet().iterator(); i.hasNext();) {
-			Map.Entry<String, Object> e = i.next();
-			Object o = e.getValue();
-			if (o instanceof AttributeType) {
-				AttributeType ja = (AttributeType) o;
-				buffer.append(JAXBCoreConstants.LT).append(ja.getName()).append(JAXBCoreConstants.GTLT).append(ja.getType())
-						.append(JAXBCoreConstants.GTLT).append(ja.getDefault()).append(JAXBCoreConstants.GTLT).append(ja.getChoice())
-						.append(JAXBCoreConstants.GTLT).append(ja.getMax()).append(JAXBCoreConstants.GTLT).append(ja.getMin())
-						.append(JAXBCoreConstants.GTLT).append(ja.getValidator()).append(JAXBCoreConstants.GTLT)
-						.append(ja.getDescription()).append(JAXBCoreConstants.GTLT).append(ja.getTooltip()).append(ja.getValue())
-						.append(JAXBCoreConstants.GT).append(JAXBCoreConstants.LINE_SEP);
-			} else if (o instanceof PropertyType) {
-				PropertyType p = (PropertyType) o;
-				buffer.append(JAXBCoreConstants.LT).append(p.getName()).append(JAXBCoreConstants.GTLT).append(p.getValue())
-						.append(JAXBCoreConstants.GT).append(JAXBCoreConstants.LINE_SEP);
-			} else {
-				buffer.append(JAXBCoreConstants.LT).append(e.getKey()).append(JAXBCoreConstants.GTLT).append(e.getValue())
-						.append(JAXBCoreConstants.GT).append(JAXBCoreConstants.LINE_SEP);
-			}
-		}
-		System.out.println(buffer);
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/RMLaunchTest.java b/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/RMLaunchTest.java
deleted file mode 100644
index 941e8a3..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/RMLaunchTest.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.jaxb.tests;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-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.core.runtime.jobs.Job;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchDelegate;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.debug.core.IStreamListener;
-import org.eclipse.debug.core.model.IStreamMonitor;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.rm.jaxb.control.JAXBControlConstants;
-import org.eclipse.ptp.rm.jaxb.control.JAXBResourceManagerConfiguration;
-import org.eclipse.ptp.rm.jaxb.control.JAXBResourceManagerControl;
-import org.eclipse.ptp.rm.jaxb.core.IVariableMap;
-import org.eclipse.ptp.rm.jaxb.core.JAXBCoreConstants;
-import org.eclipse.ptp.rm.jaxb.core.data.PropertyType;
-import org.eclipse.ptp.rm.lml.monitor.core.LMLResourceManagerMonitor;
-import org.eclipse.ptp.rm.lml_jaxb.core.LMLJAXBResourceManager;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IJobStatus;
-import org.eclipse.ptp.rmsystem.ResourceManagerServiceProvider;
-
-public class RMLaunchTest extends TestCase {
-
-	private class TestLaunchConfiguration implements ILaunchConfiguration {
-
-		private final Map<String, Object> store = new TreeMap<String, Object>();
-
-		public boolean contentsEqual(ILaunchConfiguration configuration) {
-			return false;
-		}
-
-		public ILaunchConfigurationWorkingCopy copy(String name) throws CoreException {
-			return null;
-		}
-
-		public void delete() throws CoreException {
-		}
-
-		public boolean exists() {
-			return false;
-		}
-
-		@SuppressWarnings("rawtypes")
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-
-		public boolean getAttribute(String attributeName, boolean defaultValue) throws CoreException {
-			Boolean value = (Boolean) store.get(attributeName);
-			if (value == null) {
-				value = defaultValue;
-			}
-			return value;
-		}
-
-		public int getAttribute(String attributeName, int defaultValue) throws CoreException {
-			Integer value = (Integer) store.get(attributeName);
-			if (value == null) {
-				value = defaultValue;
-			}
-			return value;
-		}
-
-		@SuppressWarnings("rawtypes")
-		public List getAttribute(String attributeName, List defaultValue) throws CoreException {
-			List value = (List) store.get(attributeName);
-			if (value == null) {
-				value = defaultValue;
-			}
-			return value;
-		}
-
-		@SuppressWarnings("rawtypes")
-		public Map getAttribute(String attributeName, Map defaultValue) throws CoreException {
-			Map value = (Map) store.get(attributeName);
-			if (value == null) {
-				value = defaultValue;
-			}
-			return value;
-		}
-
-		@SuppressWarnings("rawtypes")
-		public Set getAttribute(String attributeName, Set defaultValue) throws CoreException {
-			Set value = (Set) store.get(attributeName);
-			if (value == null) {
-				value = defaultValue;
-			}
-			return value;
-		}
-
-		public String getAttribute(String attributeName, String defaultValue) throws CoreException {
-			String value = (String) store.get(attributeName);
-			if (value == null) {
-				value = defaultValue;
-			}
-			return value;
-		}
-
-		@SuppressWarnings("rawtypes")
-		public Map getAttributes() throws CoreException {
-			return store;
-		}
-
-		public String getCategory() throws CoreException {
-			return null;
-		}
-
-		public IFile getFile() {
-			return null;
-		}
-
-		public IPath getLocation() {
-			return null;
-		}
-
-		public IResource[] getMappedResources() throws CoreException {
-			return null;
-		}
-
-		public String getMemento() throws CoreException {
-			return null;
-		}
-
-		@SuppressWarnings("rawtypes")
-		public Set getModes() throws CoreException {
-			return null;
-		}
-
-		public String getName() {
-			return null;
-		}
-
-		@SuppressWarnings("rawtypes")
-		public ILaunchDelegate getPreferredDelegate(Set modes) throws CoreException {
-			return null;
-		}
-
-		public ILaunchConfigurationType getType() throws CoreException {
-			return null;
-		}
-
-		public ILaunchConfigurationWorkingCopy getWorkingCopy() throws CoreException {
-			return null;
-		}
-
-		public boolean hasAttribute(String attributeName) throws CoreException {
-			return false;
-		}
-
-		public boolean isLocal() {
-			return false;
-		}
-
-		public boolean isMigrationCandidate() throws CoreException {
-			return false;
-		}
-
-		public boolean isReadOnly() {
-			return false;
-		}
-
-		public boolean isWorkingCopy() {
-			return false;
-		}
-
-		public ILaunch launch(String mode, IProgressMonitor monitor) throws CoreException {
-			return null;
-		}
-
-		public ILaunch launch(String mode, IProgressMonitor monitor, boolean build) throws CoreException {
-			return null;
-		}
-
-		public ILaunch launch(String mode, IProgressMonitor monitor, boolean build, boolean register) throws CoreException {
-			return null;
-		}
-
-		public void migrate() throws CoreException {
-
-		}
-
-		public boolean supportsMode(String mode) throws CoreException {
-			return false;
-		}
-	}
-
-	private static final String xml = JAXBCoreConstants.DATA + "tabbed-example.xml"; //$NON-NLS-1$
-	private JAXBResourceManagerConfiguration rmConfig;
-	private LMLJAXBResourceManager rm;
-	private ILaunchConfiguration launchConfig;
-
-	@Override
-	public void setUp() {
-		/*
-		 * You will need to copy all the executables in the
-		 * org.eclipse.ptp.rm.jaxb.tests/data directory to you home; it seems
-		 * the JUnit plugin runner does not actually execute in the directory
-		 * indicated by the Run Configuration.
-		 */
-	}
-
-	@Override
-	public void tearDown() {
-	}
-
-	public void testResourceManager() {
-		Job j = new Job("testResourceManager") { //$NON-NLS-1$
-			@Override
-			protected IStatus run(IProgressMonitor monitor) {
-				try {
-					emulateConfigureWizard();
-					rm = new LMLJAXBResourceManager(rmConfig, new JAXBResourceManagerControl(rmConfig),
-							new LMLResourceManagerMonitor(rmConfig));
-					PTPCorePlugin.getDefault().getModelManager().addResourceManager(rm);
-					rm.start(monitor);
-					try {
-						Thread.sleep(2000);
-					} catch (InterruptedException ignored) {
-					}
-					emulateLaunchTab();
-					String jobId = rm.submitJob(launchConfig, ILaunchManager.RUN_MODE, monitor);
-					System.out.println("SUBMITTED: " + jobId); //$NON-NLS-1$
-					IJobStatus status = rm.getJobStatus(jobId, null);
-					System.out.println("STATUS: " + status.getState()); //$NON-NLS-1$
-					if (status != null) {
-						status.getStreamsProxy().getOutputStreamMonitor().addListener(new IStreamListener() {
-							public void streamAppended(String text, IStreamMonitor monitor) {
-								System.out.println(text);
-							}
-						});
-					}
-					rm.stop();
-				} catch (Throwable t) {
-					t.printStackTrace();
-					assertNotNull(t);
-				}
-				return Status.OK_STATUS;
-			}
-		};
-		j.schedule();
-		try {
-			j.join();
-		} catch (InterruptedException ignored) {
-		}
-	}
-
-	/*
-	 * We do here what is done through the wizard.
-	 */
-	private void emulateConfigureWizard() throws Throwable {
-		rmConfig = new JAXBResourceManagerConfiguration(AbstractResourceManagerConfiguration.BASE,
-				new ResourceManagerServiceProvider());
-		// JAXBRMConfigurationSelectionWizardPage
-		rmConfig.setRMConfigurationURL(JAXBTestsPlugin.getURL(xml));
-		// JAXBRMControlConfigurationWizardPage
-		rmConfig.getResourceManagerData();
-		// use remote = local
-		IRemoteServices localServices = PTPRemoteCorePlugin.getDefault().getDefaultServices();
-		assert (localServices != null);
-		IRemoteConnectionManager localConnectionManager = localServices.getConnectionManager();
-		assert (localConnectionManager != null);
-		IRemoteConnection localConnection = localConnectionManager.getConnection(IRemoteConnectionManager.DEFAULT_CONNECTION_NAME);
-		assert (localConnection != null);
-		rmConfig.setRemoteServicesId(localServices.getId());
-		rmConfig.setConnectionName(localConnection.getName());
-	}
-
-	@SuppressWarnings("unchecked")
-	private void emulateLaunchTab() throws Throwable {
-		launchConfig = new TestLaunchConfiguration();
-		Map<Object, Object> env = launchConfig.getAttributes();
-		Map<String, String> live = new HashMap<String, String>();
-		live.put("FOO_VAR_1", "FOO_VALUE_1"); //$NON-NLS-1$ //$NON-NLS-2$
-		live.put("FOO_VAR_2", "FOO_VALUE_2"); //$NON-NLS-1$ //$NON-NLS-2$
-		live.put("FOO_VAR_3", "FOO_VALUE_3"); //$NON-NLS-1$ //$NON-NLS-2$
-		env.put(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, live);
-		env.put(ILaunchManager.ATTR_APPEND_ENVIRONMENT_VARIABLES, true);
-		env.put(IPTPLaunchConfigurationConstants.ATTR_WORKING_DIR, "/u/ncsa/arossi/test"); //$NON-NLS-1$
-		env.put(IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH, "/u/ncsa/arossi/test/foo"); //$NON-NLS-1$
-		env.put(IPTPLaunchConfigurationConstants.ATTR_ARGUMENTS, "-v -f /u/ncsa/arossi/test/data"); //$NON-NLS-1$
-		env.put("Job_Name", "TestRMLaunch"); //$NON-NLS-1$ //$NON-NLS-2$
-		env.put("Resource_List.nodes", "1:ppn=8"); //$NON-NLS-1$ //$NON-NLS-2$
-		env.put("Resource_List.walltime", "00:10:00"); //$NON-NLS-1$ //$NON-NLS-2$
-		env.put("export_all", true); //$NON-NLS-1$
-		env.put(JAXBControlConstants.MPI_CMD, "mpiexec"); //$NON-NLS-1$ 
-		env.put(JAXBControlConstants.MPI_ARGS, "-machinefile $PBS_NODEFILE -np 8"); //$NON-NLS-1$ 
-		IVariableMap rmVarMap = rm.getJAXBConfiguration().getRMVariableMap();
-		PropertyType queues = (PropertyType) rmVarMap.getVariables().get("available_queues"); //$NON-NLS-1$ 
-		if (queues != null) {
-			List<String> q = (List<String>) queues.getValue();
-			env.put("destination", q.get(0)); //$NON-NLS-1$
-		}
-		env.put("directory", "/Users/arossi"); //$NON-NLS-1$//$NON-NLS-2$
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/StreamParserTest.java b/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/StreamParserTest.java
deleted file mode 100644
index b29aacf..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/StreamParserTest.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.jaxb.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import junit.framework.TestCase;
-
-import org.eclipse.ptp.core.Preferences;
-import org.eclipse.ptp.rm.jaxb.control.JAXBControlConstants;
-import org.eclipse.ptp.rm.jaxb.control.internal.IStreamParserTokenizer;
-import org.eclipse.ptp.rm.jaxb.control.internal.runnable.command.ConfigurableRegexTokenizer;
-import org.eclipse.ptp.rm.jaxb.control.internal.variables.RMVariableMap;
-import org.eclipse.ptp.rm.jaxb.core.JAXBCorePlugin;
-import org.eclipse.ptp.rm.jaxb.core.JAXBInitializationUtils;
-import org.eclipse.ptp.rm.jaxb.core.JAXBRMPreferenceConstants;
-import org.eclipse.ptp.rm.jaxb.core.data.AttributeType;
-import org.eclipse.ptp.rm.jaxb.core.data.CommandType;
-import org.eclipse.ptp.rm.jaxb.core.data.ControlType;
-import org.eclipse.ptp.rm.jaxb.core.data.PropertyType;
-import org.eclipse.ptp.rm.jaxb.core.data.ResourceManagerData;
-import org.eclipse.ptp.rm.jaxb.core.data.TokenizerType;
-
-public class StreamParserTest extends TestCase {
-
-	protected class Range {
-
-		private final String expression;
-		private int[] from;
-		private int[] to;
-		private int len;
-
-		public Range(String expression) {
-			assert (null != rmVarMap);
-			this.expression = rmVarMap.getString(uuid, expression);
-		}
-
-		public List<Object> findInRange(String[] values) {
-			List<Object> found = new ArrayList<Object>();
-			for (int i = 0; i < from.length; i++) {
-				if (from[i] == to[i]) {
-					found.add(values[from[i]]);
-				} else {
-					for (int j = from[i]; j < to[i]; j++) {
-						found.add(values[j]);
-					}
-				}
-			}
-			return found;
-		}
-
-		public boolean isInRange(int line) {
-			for (int i = 0; i < from.length; i++) {
-				if ((from[i] == line && line <= to[i]) || (from[i] < line && line < to[i])) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		public void setLen(int len) {
-			this.len = len;
-			parse(expression);
-		}
-
-		private int maybeInterpretLength(String n) {
-			int i = -1;
-			if (n.indexOf(JAXBControlConstants.LEN) >= 0) {
-				String[] lenExp = n.split(JAXBControlConstants.HYPH);
-				if (lenExp.length == 2) {
-					i = len - Integer.parseInt(lenExp[1]);
-				} else {
-					i = len;
-				}
-			} else {
-				i = Integer.parseInt(n.trim());
-			}
-			return i;
-		}
-
-		private void parse(String expression) {
-			List<String> from = new ArrayList<String>();
-			List<String> to = new ArrayList<String>();
-			String[] commas = expression.split(JAXBControlConstants.CM);
-			for (int i = 0; i < commas.length; i++) {
-				String[] colon = commas[i].split(JAXBControlConstants.CO);
-				if (colon.length == 2) {
-					from.add(colon[0]);
-					to.add(colon[1]);
-				} else {
-					from.add(colon[0]);
-					to.add(colon[0]);
-				}
-			}
-
-			this.from = new int[from.size()];
-			this.to = new int[from.size()];
-
-			for (int i = 0; i < this.from.length; i++) {
-				this.from[i] = maybeInterpretLength(from.get(i).trim());
-				this.to[i] = maybeInterpretLength(to.get(i).trim());
-			}
-		}
-	}
-
-	private static final String tokxml = JAXBControlConstants.DATA + "tokenizer-examples.xml"; //$NON-NLS-1$
-
-	private static InputStream getImplicitOrdering() {
-		String content = "jobAttribute_1" + JAXBControlConstants.LINE_SEP + "java.lang.String" + JAXBControlConstants.LINE_SEP + JAXBControlConstants.LINE_SEP + JAXBControlConstants.LINE_SEP + "value_1" + JAXBControlConstants.LINE_SEP //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				+ "jobAttribute_2" + JAXBControlConstants.LINE_SEP + "java.lang.String" + JAXBControlConstants.LINE_SEP + "meaingless attribute" + JAXBControlConstants.LINE_SEP //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				+ "ignore this attribute" + JAXBControlConstants.LINE_SEP + "value_2" //$NON-NLS-1$ //$NON-NLS-2$
-				+ JAXBControlConstants.LINE_SEP;
-		return new ByteArrayInputStream(content.getBytes());
-	}
-
-	private static InputStream getImplicitWithTags() {
-		String content = "JAXBRMConstants.PROPERTY" + JAXBControlConstants.LINE_SEP + "value:423.4" + JAXBControlConstants.LINE_SEP + "name:x" + JAXBControlConstants.LINE_SEP + "JAXBRMConstants.ATTRIBUTE" + JAXBControlConstants.LINE_SEP + "name:y" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-				+ JAXBControlConstants.LINE_SEP
-				+ "value:-130.42" + JAXBControlConstants.LINE_SEP + "JAXBRMConstants.PROPERTY" + JAXBControlConstants.LINE_SEP + "name:z" + JAXBControlConstants.LINE_SEP + "value:-1.7" + JAXBControlConstants.LINE_SEP; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		return new ByteArrayInputStream(content.getBytes());
-	}
-
-	private static InputStream getJobStates() {
-		String content = "blah blah xxxx blah blah xxxx blah blah xxxx blah blah xx" //$NON-NLS-1$
-				+ "<job>304823:RUNNING</job>fooblah blah xxxx\n  blah blah xxxx blah blah xxxx blah " //$NON-NLS-1$
-				+ " blah x\nx<job>312042:DONE</job>blah xxxx blah blah xxxx blah b" //$NON-NLS-1$
-				+ "blah blah xxxx foobarfoobr 231028388 <job>338831:SUJAXBRMConstants.SPENDED" //$NON-NLS-1$
-				+ "</job>fooroiqEXIT\npoiewmr<job>318388:QUEUED</job>blah blah xxxx"; //$NON-NLS-1$
-		return new ByteArrayInputStream(content.getBytes());
-	}
-
-	private static InputStream getMergedOrdering() {
-		String content = "name:foo0;value:bar0" + JAXBControlConstants.LINE_SEP + "name:foo1;value:bar1" + JAXBControlConstants.LINE_SEP + "name:foo0;default:baz0" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				+ JAXBControlConstants.LINE_SEP;
-		return new ByteArrayInputStream(content.getBytes());
-	}
-
-	private static InputStream getNoiseBeforeJobId() {
-		String content = "abe and lincoln will be down for 3 hours Saturday May 14, 2013 from 00:00:00 to 03:00:00" + JAXBControlConstants.LINE_SEP //$NON-NLS-1$
-				+ "There is currently no way to know what your shell is.  Please look in /etc/passwd" + JAXBControlConstants.LINE_SEP //$NON-NLS-1$
-				+ "To get your default account, click your heels three times and say, 'There's no place like home!'" + JAXBControlConstants.LINE_SEP //$NON-NLS-1$
-				+ "429324.honest1" + JAXBControlConstants.LINE_SEP; //$NON-NLS-1$
-		return new ByteArrayInputStream(content.getBytes());
-	}
-
-	private static InputStream getOpenMPIOut() {
-		String content = "ompi:version:full:1.8" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mca:base:param:mca_component_disable_dlopen:status:writable" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mca:base:param:mca_component_disable_dlopen:help:Whether to attempt to disable opening dynamic components or not" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mca:base:param:mca_component_disable_dlopen:deprecated:no" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mpi:base:param:mpi_param_check:value:1" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mpi:base:param:mpi_param_check:data_source:default value" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mpi:base:param:mpi_param_check:status:read-only" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mpi:base:param:mpi_param_check:help:Whether you want MPI API parameters checked at run-time or not.  Possible values are 0 (no checking) and 1 (perform checking at run-time)" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mpi:base:param:mpi_param_check:deprecated:no" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mpi:base:param:mpi_yield_when_idle:value:-1" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mpi:base:param:mpi_yield_when_idle:data_source:default value" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mpi:base:param:mpi_yield_when_idle:status:writable" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mpi:base:param:mpi_yield_when_idle:help:Yield the processor when waiting for MPI communication (for MPI processes, will default to 1 when oversubscribing nodes)" //$NON-NLS-1$
-				+ JAXBControlConstants.LINE_SEP
-				+ "mca:mpi:base:param:mpi_yield_when_idle:deprecated:no" + JAXBControlConstants.LINE_SEP //$NON-NLS-1$
-				+ "mca:mpi:base:param:mpi_event_tick_rate:value:-1" + JAXBControlConstants.LINE_SEP; //$NON-NLS-1$
-		return new ByteArrayInputStream(content.getBytes());
-	}
-
-	private static InputStream getPropertyDefs() {
-		String content = "<name>pnameA</name><value>pvalueA</value>" + JAXBControlConstants.LINE_SEP + "<name>pnameB</name><value>pvalueB</value>" //$NON-NLS-1$ //$NON-NLS-2$
-				+ JAXBControlConstants.LINE_SEP
-				+ "<name>pnameC</name><value>pvalueC</value>" + JAXBControlConstants.LINE_SEP + "<name>pnameD</name><value>pvalueD</value>" //$NON-NLS-1$ //$NON-NLS-2$
-				+ JAXBControlConstants.LINE_SEP + "<value>pvalueW</value><name>pnameW</name>" + JAXBControlConstants.LINE_SEP; //$NON-NLS-1$
-		return new ByteArrayInputStream(content.getBytes());
-	}
-
-	private static InputStream getQstat() {
-		String content = "42226.ember       g_zn_ph2         enoey             665:51:4 E normal  \n";//$NON-NLS-1$ 
-		return new ByteArrayInputStream(content.getBytes());
-	}
-
-	private static InputStream getQstatOut() {
-		String content = "normal" + JAXBControlConstants.LINE_SEP + "iacat2" + JAXBControlConstants.LINE_SEP + "indprio" + JAXBControlConstants.LINE_SEP + "lincoln_nomss" + JAXBControlConstants.LINE_SEP + "cap1" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-				+ JAXBControlConstants.LINE_SEP
-				+ "lincoln_debug" + JAXBControlConstants.LINE_SEP + "long" + JAXBControlConstants.LINE_SEP + "iacat" + JAXBControlConstants.LINE_SEP + "industrial" + JAXBControlConstants.LINE_SEP //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-				+ "lincoln" + JAXBControlConstants.LINE_SEP + "wide" + JAXBControlConstants.LINE_SEP + "nomss" + JAXBControlConstants.LINE_SEP + "debug" + JAXBControlConstants.LINE_SEP + "iacat3" + JAXBControlConstants.LINE_SEP //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-				+ "lincoln_cuda3.2" + JAXBControlConstants.LINE_SEP + "fernsler" + JAXBControlConstants.LINE_SEP; //$NON-NLS-1$ //$NON-NLS-2$
-		return new ByteArrayInputStream(content.getBytes());
-	}
-
-	private static InputStream getStaggered() {
-		String content = "value:1" + JAXBControlConstants.LINE_SEP + "value:2" + JAXBControlConstants.LINE_SEP + "name:1" + JAXBControlConstants.LINE_SEP + "name:2" + JAXBControlConstants.LINE_SEP + "name:3" + JAXBControlConstants.LINE_SEP //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-				+ "name:4" + JAXBControlConstants.LINE_SEP + "value:3" + JAXBControlConstants.LINE_SEP + "value:4" + JAXBControlConstants.LINE_SEP; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		return new ByteArrayInputStream(content.getBytes());
-	}
-
-	private String uuid;
-
-	private String lineRange;
-
-	private boolean[] oracle;
-
-	private String[] values;
-
-	private final boolean verbose = true;
-	private final boolean logging = false;
-
-	private String target;
-
-	private List<CommandType> startup;
-
-	private CommandType getStatus;
-
-	private RMVariableMap rmVarMap;
-
-	@Override
-	public void setUp() {
-		rmVarMap = new RMVariableMap();
-		String name = getName();
-		if (name.equals("testRange")) { //$NON-NLS-1$
-			// the second number is <, not <=
-			lineRange = "3,8,12:15,21, 24:29,40:N-3"; //$NON-NLS-1$
-			oracle = new boolean[] { false, false, false, true, false, false, false, false, true, false, false, false, true, true,
-					true, false, false, false, false, false, false, true, false, false, true, true, true, true, true, false, false,
-					false, false, false, false, false, false, false, false, false, true, true, true, true, true, true, true, false,
-					false, false };
-			values = new String[oracle.length];
-		} else {
-			Preferences.setBoolean(JAXBCorePlugin.getUniqueIdentifier(), JAXBRMPreferenceConstants.SEGMENT_PATTERN, logging);
-			Preferences.setBoolean(JAXBCorePlugin.getUniqueIdentifier(), JAXBRMPreferenceConstants.MATCH_STATUS, logging);
-			Preferences.setBoolean(JAXBCorePlugin.getUniqueIdentifier(), JAXBRMPreferenceConstants.ACTIONS, logging);
-			Preferences.setBoolean(JAXBCorePlugin.getUniqueIdentifier(), JAXBRMPreferenceConstants.CREATED_PROPERTIES, logging);
-			try {
-				JAXBTestsPlugin.validate(tokxml);
-				ResourceManagerData rmdata = JAXBInitializationUtils.initializeRMData(JAXBTestsPlugin.getURL(tokxml));
-				if (rmdata != null) {
-					ControlType cd = rmdata.getControlData();
-					startup = cd.getStartUpCommand();
-					getStatus = cd.getGetJobStatus();
-				}
-			} catch (Throwable t) {
-				t.printStackTrace();
-				assert (t != null);
-			}
-		}
-	}
-
-	@Override
-	public void tearDown() {
-
-	}
-
-	public void test00ParseQstat() {
-		target = "queues"; //$NON-NLS-1$
-		PropertyType p = new PropertyType();
-		p.setName(target);
-		rmVarMap.getVariables().put(target, p);
-		runTokenizer(startup.get(0).getStdoutParser(), getQstatOut());
-		p = (PropertyType) rmVarMap.getVariables().get(target);
-		assertNotNull(p);
-		assertNotNull(p.getValue());
-		if (verbose) {
-			System.out.println(target + " = " + p.getValue()); //$NON-NLS-1$
-		}
-	}
-
-	public void test01JobId() {
-		uuid = UUID.randomUUID().toString();
-		target = uuid;
-		PropertyType p = new PropertyType();
-		p.setName(target);
-		p.setValue(target);
-		rmVarMap.getVariables().put(target, p);
-		runTokenizer(startup.get(1).getStdoutParser(), getNoiseBeforeJobId());
-		p = (PropertyType) rmVarMap.getVariables().get(target);
-		assertNotNull(p);
-		assertNotNull(p.getValue());
-		if (verbose) {
-			System.out.println(target + " = " + p.getValue()); //$NON-NLS-1$
-		}
-	}
-
-	public void test02OpenMPI() {
-		target = JAXBControlConstants.ATTRIBUTE;
-		runTokenizer(startup.get(2).getStdoutParser(), getOpenMPIOut());
-		Map<String, Object> d = rmVarMap.getDiscovered();
-		for (Object o : d.values()) {
-			AttributeType ja = (AttributeType) o;
-			if (verbose) {
-				System.out.println("DISCOVERED JAXBRMConstants.ATTRIBUTE:"); //$NON-NLS-1$
-				System.out.println("name " + ja.getName()); //$NON-NLS-1$
-				System.out.println("value " + ja.getValue()); //$NON-NLS-1$
-				System.out.println("tooltip " + ja.getTooltip()); //$NON-NLS-1$
-				System.out.println("status " + ja.getStatus()); //$NON-NLS-1$
-				System.out.println("readOnly " + ja.isReadOnly()); //$NON-NLS-1$
-				System.out.println("*********************************"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public void test03ImplicitWithTags() {
-		runTokenizer(startup.get(3).getStdoutParser(), getImplicitWithTags());
-		Map<String, Object> d = rmVarMap.getDiscovered();
-		for (Object o : d.values()) {
-			if (o instanceof PropertyType) {
-				PropertyType p = (PropertyType) o;
-				if (verbose) {
-					System.out.println("DISCOVERED JAXBRMConstants.PROPERTY:"); //$NON-NLS-1$
-					System.out.println("name " + p.getName()); //$NON-NLS-1$
-					System.out.println("value " + p.getValue()); //$NON-NLS-1$
-					System.out.println("*********************************"); //$NON-NLS-1$
-				}
-			} else if (o instanceof AttributeType) {
-				AttributeType ja = (AttributeType) o;
-				if (verbose) {
-					System.out.println("DISCOVERED JAXBRMConstants.ATTRIBUTE:"); //$NON-NLS-1$
-					System.out.println("name " + ja.getName()); //$NON-NLS-1$
-					System.out.println("value " + ja.getValue()); //$NON-NLS-1$
-					System.out.println("*********************************"); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	public void test04ImplicitOrdering() {
-		target = JAXBControlConstants.ATTRIBUTE;
-		runTokenizer(startup.get(4).getStdoutParser(), getImplicitOrdering());
-		Map<String, Object> d = rmVarMap.getDiscovered();
-		for (Object o : d.values()) {
-			AttributeType ja = (AttributeType) o;
-			if (verbose) {
-				System.out.println("DISCOVERED JAXBRMConstants.ATTRIBUTE:"); //$NON-NLS-1$
-				System.out.println("name " + ja.getName()); //$NON-NLS-1$
-				System.out.println("type " + ja.getType()); //$NON-NLS-1$
-				System.out.println("tooltip " + ja.getTooltip()); //$NON-NLS-1$
-				System.out.println("description " + ja.getDescription()); //$NON-NLS-1$
-				System.out.println("value " + ja.getValue()); //$NON-NLS-1$
-				System.out.println("*********************************"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public void test05ImplicitWithTagsDotall() {
-		runTokenizer(startup.get(5).getStdoutParser(), getImplicitWithTags());
-		Map<String, Object> d = rmVarMap.getDiscovered();
-		for (Object o : d.values()) {
-			if (o instanceof PropertyType) {
-				PropertyType p = (PropertyType) o;
-				if (verbose) {
-					System.out.println("DISCOVERED JAXBRMConstants.PROPERTY:"); //$NON-NLS-1$
-					System.out.println("name " + p.getName()); //$NON-NLS-1$
-					System.out.println("value " + p.getValue()); //$NON-NLS-1$
-					System.out.println("*********************************"); //$NON-NLS-1$
-				}
-			} else if (o instanceof AttributeType) {
-				AttributeType ja = (AttributeType) o;
-				if (verbose) {
-					System.out.println("DISCOVERED JAXBRMConstants.ATTRIBUTE:"); //$NON-NLS-1$
-					System.out.println("name " + ja.getName()); //$NON-NLS-1$
-					System.out.println("value " + ja.getValue()); //$NON-NLS-1$
-					System.out.println("*********************************"); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	public void test06PropertyDefsSingleLine() {
-		target = JAXBControlConstants.PROPERTY;
-		runTokenizer(startup.get(6).getStdoutParser(), getPropertyDefs());
-		Map<String, Object> d = rmVarMap.getDiscovered();
-		for (Object o : d.values()) {
-			PropertyType p = (PropertyType) o;
-			if (verbose) {
-				System.out.println("DISCOVERED JAXBRMConstants.PROPERTY:"); //$NON-NLS-1$
-				System.out.println("name " + p.getName()); //$NON-NLS-1$
-				System.out.println("value " + p.getValue()); //$NON-NLS-1$
-				System.out.println("*********************************"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public void test07JobStates() {
-		target = "jobStates"; //$NON-NLS-1$
-		PropertyType p = new PropertyType();
-		p.setName(target);
-		rmVarMap.getVariables().put(target, p);
-		runTokenizer(startup.get(7).getStdoutParser(), getJobStates());
-		p = (PropertyType) rmVarMap.getVariables().get(target);
-		assertNotNull(p);
-		assertNotNull(p.getValue());
-		if (verbose) {
-			System.out.println(target + " = " + p.getValue()); //$NON-NLS-1$
-		}
-	}
-
-	public void test08Staggered() {
-		runTokenizer(startup.get(8).getStdoutParser(), getStaggered());
-		Map<String, Object> d = rmVarMap.getDiscovered();
-		for (Object o : d.values()) {
-			if (o instanceof PropertyType) {
-				PropertyType p = (PropertyType) o;
-				if (verbose) {
-					System.out.println("DISCOVERED JAXBRMConstants.PROPERTY:"); //$NON-NLS-1$
-					System.out.println("name " + p.getName()); //$NON-NLS-1$
-					System.out.println("value " + p.getValue()); //$NON-NLS-1$
-					System.out.println("*********************************"); //$NON-NLS-1$
-				}
-			} else if (o instanceof AttributeType) {
-				AttributeType ja = (AttributeType) o;
-				if (verbose) {
-					System.out.println("DISCOVERED JAXBRMConstants.ATTRIBUTE:"); //$NON-NLS-1$
-					System.out.println("name " + ja.getName()); //$NON-NLS-1$
-					System.out.println("value " + ja.getValue()); //$NON-NLS-1$
-					System.out.println("*********************************"); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-
-	public void test09Merged() {
-		target = JAXBControlConstants.PROPERTY;
-		runTokenizer(startup.get(9).getStdoutParser(), getMergedOrdering());
-		Map<String, Object> d = rmVarMap.getDiscovered();
-		for (Object o : d.values()) {
-			PropertyType p = (PropertyType) o;
-			if (verbose) {
-				System.out.println("DISCOVERED JAXBRMConstants.PROPERTY:"); //$NON-NLS-1$
-				System.out.println("name " + p.getName()); //$NON-NLS-1$
-				System.out.println("value " + p.getValue()); //$NON-NLS-1$
-				System.out.println("default " + p.getDefault()); //$NON-NLS-1$
-				System.out.println("*********************************"); //$NON-NLS-1$
-			}
-		}
-	}
-
-	public void test10ExitOn() {
-		target = "jobStates"; //$NON-NLS-1$
-		PropertyType p = new PropertyType();
-		p.setName(target);
-		rmVarMap.getVariables().put(target, p);
-		runTokenizer(startup.get(10).getStdoutParser(), getJobStates());
-		p = (PropertyType) rmVarMap.getVariables().get(target);
-		assertNotNull(p);
-		assertNotNull(p.getValue());
-		if (verbose) {
-			System.out.println(target + " = " + p.getValue()); //$NON-NLS-1$
-		}
-	}
-
-	public void test11ExitAfter() {
-		target = "jobStates"; //$NON-NLS-1$
-		PropertyType p = new PropertyType();
-		p.setName(target);
-		rmVarMap.getVariables().put(target, p);
-		runTokenizer(startup.get(11).getStdoutParser(), getJobStates());
-		p = (PropertyType) rmVarMap.getVariables().get(target);
-		assertNotNull(p);
-		assertNotNull(p.getValue());
-		if (verbose) {
-			System.out.println(target + " = " + p.getValue()); //$NON-NLS-1$
-		}
-	}
-
-	public void test12GetStatus() {
-		target = "42226";//$NON-NLS-1$
-		uuid = target;
-		PropertyType p = new PropertyType();
-		p.setName(target);
-		rmVarMap.getVariables().put(target, p);
-		runTokenizer(getStatus.getStdoutParser(), getQstat());
-		p = (PropertyType) rmVarMap.getVariables().get(this.target);
-		assertNotNull(p);
-		System.out.println(p.getName() + JAXBControlConstants.CM + JAXBControlConstants.SP + p.getValue());
-	}
-
-	public void testRange() {
-		Range range = new Range(lineRange);
-		range.setLen(50);
-		int trues = 0;
-
-		for (int i = 0; i < 50; i++) {
-			boolean b = range.isInRange(i);
-			if (oracle[i]) {
-				trues++;
-			}
-			if (verbose) {
-				System.out.println(" line " + i + " in range: " + b + ", should be " + oracle[i]); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-			assertEquals(oracle[i], b);
-			values[i] = "" + oracle[i]; //$NON-NLS-1$
-		}
-
-		List<Object> valid = range.findInRange(values);
-		for (Object o : valid) {
-			assertEquals("true", o); //$NON-NLS-1$
-			assertEquals(trues, valid.size());
-		}
-	}
-
-	private void runTokenizer(TokenizerType tokenizer, InputStream stream) {
-		IStreamParserTokenizer t = new ConfigurableRegexTokenizer(tokenizer);
-		t.initialize(uuid, rmVarMap, null);
-		t.setInputStream(stream);
-		Thread thr = new Thread(t);
-		thr.start();
-		try {
-			thr.join();
-		} catch (InterruptedException ignored) {
-		}
-		Throwable throwable = t.getInternalError();
-		if (throwable != null) {
-			throwable.printStackTrace();
-		}
-		assertNull(throwable);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/messages.properties b/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/messages.properties
deleted file mode 100644
index cceb691..0000000
--- a/rms/org.eclipse.ptp.rm.jaxb.tests/src/org/eclipse/ptp/rm/jaxb/tests/messages.properties
+++ /dev/null
@@ -1 +0,0 @@
-RMVariableTest_1=The list of files to be staged in prior to job execution.
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/.classpath b/rms/org.eclipse.ptp.rm.pbs.core.server/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/.cvsignore b/rms/org.eclipse.ptp.rm.pbs.core.server/.cvsignore
deleted file mode 100644
index cce2db4..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-pbs_proxy.jar
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/.project b/rms/org.eclipse.ptp.rm.pbs.core.server/.project
deleted file mode 100644
index 7235f72..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs.core.server.server</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.pbs.core.server/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6401daa..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Aug 31 20:51:32 CDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.pbs.core.server/META-INF/MANIFEST.MF
deleted file mode 100644
index 5d64c0b..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.pbs.core.server;singleton:=true
-Bundle-Version: 5.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.pbs.core.server.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.rm.pbs.jproxy
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.ptp.rm.pbs.core.server;x-friends:="org.eclipse.ptp.rm.pbs.core"
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/META-INF/eclipse.inf b/rms/org.eclipse.ptp.rm.pbs.core.server/META-INF/eclipse.inf
deleted file mode 100644
index ec09bc3..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/META-INF/eclipse.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-# exclude children from packing and signing
-jarprocessor.exclude.children=true
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/about.html b/rms/org.eclipse.ptp.rm.pbs.core.server/about.html
deleted file mode 100644
index 3106f3a..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<title>About</title>

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

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

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

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

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

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

-

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

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

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

-

-</body>

-</html>
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/build.properties b/rms/org.eclipse.ptp.rm.pbs.core.server/build.properties
deleted file mode 100644
index d45769e..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               pbs_proxy.jar
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/plugin.properties b/rms/org.eclipse.ptp.rm.pbs.core.server/plugin.properties
deleted file mode 100644
index d96323f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP PBS Core Server
-pluginProvider=Eclipse.org
-failMsg=Java 1.5
-PBSProxyServer.name=PBS Proxy Server
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/plugin.xml b/rms/org.eclipse.ptp.rm.pbs.core.server/plugin.xml
deleted file mode 100644
index bb457e7..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/plugin.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-    <extension
-           point="org.eclipse.ptp.remote.core.remoteServer">
-        <remoteServer
-              class="org.eclipse.ptp.rm.pbs.core.server.PBSProxyServerRunner"
-              continuous="true"
-              id="org.eclipse.ptp.rm.pbs.PBSProxyServer"
-              launchCommand="java -Xms64m -Xmx128m -Xss2m ${javaargs} -jar ${payload} ${payload_args}"
-              name="%PBSProxyServer.name"
-              payload="pbs_proxy.jar"
-              verifyLaunchCommand="java -version"
-              verifyLaunchFailMessage="Minimum Java 1.5 is required"
-              verifyLaunchPattern="^(java version )(.)(1\.[5-9]|[2-9]\.).*$">
-        </remoteServer>
-     </extension>
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/src/org/eclipse/ptp/rm/pbs/core/server/Activator.java b/rms/org.eclipse.ptp.rm.pbs.core.server/src/org/eclipse/ptp/rm/pbs/core/server/Activator.java
deleted file mode 100644
index 220e7e1..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/src/org/eclipse/ptp/rm/pbs/core/server/Activator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.server;
-
-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
-	private static final String PLUGIN_ID = "org.eclipse.ptp.rm.pbs.core.server"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Generate a unique identifier
-	 * 
-	 * @return unique identifier string
-	 * @since 5.0
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null) {
-			return PLUGIN_ID;
-		}
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core.server/src/org/eclipse/ptp/rm/pbs/core/server/PBSProxyServerRunner.java b/rms/org.eclipse.ptp.rm.pbs.core.server/src/org/eclipse/ptp/rm/pbs/core/server/PBSProxyServerRunner.java
deleted file mode 100644
index 3295849..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core.server/src/org/eclipse/ptp/rm/pbs/core/server/PBSProxyServerRunner.java
+++ /dev/null
@@ -1,90 +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
- *******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.server;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.remote.core.server.AbstractRemoteServerRunner;
-
-public class PBSProxyServerRunner extends AbstractRemoteServerRunner {
-	public static final String SERVER_ID = "org.eclipse.ptp.rm.pbs.PBSProxyServer"; //$NON-NLS-1$
-
-	private static final String SUCCESS_STRING = "PBSProxyRuntimeServer started"; //$NON-NLS-1$
-
-	public PBSProxyServerRunner() {
-		super("PBS Proxy Server"); //$NON-NLS-1$
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remote.launch.core.AbstractRemoteServerRunner#doFinishServer
-	 * ()
-	 */
-	@Override
-	protected void doServerFinished(IProgressMonitor monitor) {
-		if (monitor != null) {
-			monitor.done();
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remote.launch.core.AbstractRemoteServerRunner#doRestartServer
-	 * ()
-	 */
-	@Override
-	protected boolean doServerStarting(IProgressMonitor monitor) {
-		if (monitor != null) {
-			monitor.done();
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remote.launch.core.AbstractRemoteServerRunner#doStartServer
-	 * ()
-	 */
-	@Override
-	protected boolean doServerStarted(IProgressMonitor monitor) {
-		if (monitor != null) {
-			monitor.done();
-		}
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remote.launch.core.AbstractRemoteServerRunner#
-	 * doVerifyServerRunningFromStderr(java.lang.String)
-	 */
-	@Override
-	protected boolean doVerifyServerRunningFromStderr(String output) {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.remote.launch.core.AbstractRemoteServerRunner#
-	 * doVerifyServerRunningFromStdout(java.lang.String)
-	 */
-	@Override
-	protected boolean doVerifyServerRunningFromStdout(String output) {
-		if (output.startsWith(SUCCESS_STRING)) {
-			return true;
-		}
-		return false;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/.classpath b/rms/org.eclipse.ptp.rm.pbs.core/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/.cvsignore b/rms/org.eclipse.ptp.rm.pbs.core/.cvsignore
deleted file mode 100644
index cce2db4..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-pbs_proxy.jar
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/.project b/rms/org.eclipse.ptp.rm.pbs.core/.project
deleted file mode 100644
index 1b67cd1..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.pbs.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6401daa..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Aug 31 20:51:32 CDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.pbs.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 1abb5a1..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/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.pbs.core;singleton:=true
-Bundle-Version: 5.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.pbs.core.Activator
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.ptp.core,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.rm.core,
- org.eclipse.ptp.rm.pbs.core.server,
- org.eclipse.ptp.proxy.protocol,
- org.eclipse.ptp.services.core
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.rm.pbs.core;x-friends:="org.eclipse.ptp.rm.pbs.ui",
- org.eclipse.ptp.rm.pbs.core.attributes;x-friends:="org.eclipse.ptp.rm.pbs.ui",
- org.eclipse.ptp.rm.pbs.core.rmsystem;x-friends:="org.eclipse.ptp.rm.pbs.ui",
- org.eclipse.ptp.rm.pbs.core.rtsystem;x-friends:="org.eclipse.ptp.rm.pbs.ui",
- org.eclipse.ptp.rm.pbs.core.templates;x-friends:="org.eclipse.ptp.rm.pbs.ui"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: com.ibm.icu.text
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/about.html b/rms/org.eclipse.ptp.rm.pbs.core/about.html
deleted file mode 100644
index 3106f3a..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<title>About</title>

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

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

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

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

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

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

-

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

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

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

-

-</body>

-</html>
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/about.ini b/rms/org.eclipse.ptp.rm.pbs.core/about.ini
deleted file mode 100644
index 5bd1def..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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=ptp_logo_icon32.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.pbs.core/about.mappings b/rms/org.eclipse.ptp.rm.pbs.core/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.core/about.properties b/rms/org.eclipse.ptp.rm.pbs.core/about.properties
deleted file mode 100644
index c9f6fcb..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/about.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#################################################################################
-# Copyright (c) 2010 University of Illinois 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
-#################################################################################
-
-
-# NLS_MESSAGEFORMAT_NONE
-# NLS_ENCODING=UTF-8
-
-blurb=PTP Resource Manager for PBS (Legacy)\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-Copyright (c) 2010 University of Illinois and others.  All rights reserved.\n\
-Visit http://www.eclipse.org/ptp\n
-
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/build.properties b/rms/org.eclipse.ptp.rm.pbs.core/build.properties
deleted file mode 100644
index 0ba23b0..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               data/,\
-               ptp_logo_icon32.png
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Pro.job_attributes.xml b/rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Pro.job_attributes.xml
deleted file mode 100644
index 2c24928..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Pro.job_attributes.xml
+++ /dev/null
@@ -1,406 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pbs-job-attributes>
-	<pbs-job-attribute name="Account_Name" minSet="true">
-		<attribute-definition id="PBSJOB_Account_Name"
-			type="string" display="true">
-			<description>Account to which to charge this job.</description>
-		</attribute-definition>
-		<qsub-flag>-A </qsub-flag>
-		<tooltip>Format: string</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Checkpoint">
-		<attribute-definition id="PBSJOB_Checkpoint"
-			type="choice" display="true">
-			<description>Determines when checkpointing (if supported) will be
-				performed by PBS on behalf of the job.</description>
-			<default>u</default>
-		</attribute-definition>
-		<choice>,u,n,s,c,c=????</choice>
-		<qsub-flag>-c </qsub-flag>
-		<tooltip>Format: the strings "n" (no checkpointing), "s" (to be
-			performed only when the server executing the job is shutdown), "c"
-			(to be performed at the default minimum time for the server executing
-			the job), "c=mmmm" (to be performed at an interval of minutes which
-			is the integer number of minutes of CPU time used by the job; value
-			must be greater than zero); default value: "u", which is unspecified.
-		</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="depend">
-		<attribute-definition id="PBSJOB_depend" type="string"
-			display="true">
-			<description>The type of inter-job dependencies specified by the job
-				owner.</description>
-		</attribute-definition>
-		<qsub-flag>-W depend=</qsub-flag>
-		<tooltip>Format: "type:jobid[,jobid...]"; default value: no
-			dependencies.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="destination" minSet="true">
-		<attribute-definition id="PBSJOB_destination"
-			type="string" display="true">
-			<description>Designation of the queue to which to submit the job.
-			</description>
-		</attribute-definition>
-		<qsub-flag>-q </qsub-flag>
-		<tooltip>Format: queue[@server].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="directive">
-		<attribute-definition id="PBSJOB_directive" type="string"
-			display="true">
-			<description>Defines the prefix that declares a directive to the qsub
-				command within the script file.</description>
-		</attribute-definition>
-		<qsub-flag>-C </qsub-flag>
-		<tooltip>See the paragraph on script directives in the Extended
-			Description section. If the option is presented with a
-			directive_prefix argument that is the null string, qsub will not scan
-			the script file for directives.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Error_Path">
-		<attribute-definition id="PBSJOB_Error_Path"
-			type="string" display="true">
-			<description>The final path name for the file containing the job's
-				standard error stream.</description>
-		</attribute-definition>
-		<qsub-flag>-e </qsub-flag>
-		<tooltip>Format: "[hostname:]pathname". If the option is not
-			specified, the default file name for the standard error stream will
-			be used. The default name has the following form: job_name.eSeq_num
-			where job_name is the name of the job, see -N option, and Seq_num is
-			the job number assigned when the job is submitted; default value:
-			(job_name).e(job_number).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="export_all" minSet="true">
-		<attribute-definition id="PBSJOB_export_all"
-			type="boolean" display="true">
-			<description>Declares that all environment variables in the qsub
-				command's environment are to be exported to the batch job.
-			</description>
-			<default>true</default>
-		</attribute-definition>
-		<qsub-flag>-V </qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="group_list">
-		<attribute-definition id="PBSJOB_group_list"
-			type="string" display="true">
-			<description>A list of group_names@hosts which determines the group
-				under which the job is run on a given host.</description>
-		</attribute-definition>
-		<qsub-flag>-W group_list=</qsub-flag>
-		<tooltip>Format: group_name[@host][,group_name[@host]...]. When a job
-			is to be placed into execution, the server will select a group name
-			according to the following ordered set of rules: 1) Select the group
-			name from the list for which the associated host name matches the
-			name of the execution host; 2) Select the group name which has no
-			associated host name, the wildcard name; 3) Use the login group for
-			the username under which the job will be run.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Hold_Types">
-		<attribute-definition id="PBSJOB_Hold_Types"
-			type="choice" display="true">
-			<description>The set of holds currently applied to the job.
-			</description>
-		</attribute-definition>
-		<choice>,u,s,o</choice>
-		<qsub-flag>-h </qsub-flag>
-		<tooltip>If the set is not null, the job will not be scheduled for
-			execution and is said to be in the hold state. Note, the hold state
-			takes precedence over the wait state. Format: string made up of the
-			letters 'u', 's', 'o'; default value: no hold.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Job_Name" minSet="true">
-		<attribute-definition id="PBSJOB_Job_Name" type="string"
-			display="true">
-			<description>The name assigned to the job by the qsub or qalter
-				command.</description>
-		</attribute-definition>
-		<qsub-flag>-N </qsub-flag>
-		<tooltip>Format: string up to 15 characters, first character must be
-			alphabetic; default value: the base name of the job script or STDIN.
-		</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Join_Path">
-		<attribute-definition id="PBSJOB_Join_Path" type="boolean"
-			display="true">
-			<description>Merge stdout and stderr into stdout.</description>
-			<default>false</default>
-		</attribute-definition>
-		<qsub-flag>-j </qsub-flag>
-		<tooltip>Format: boolean, values accepted are "True", "TRUE", "true",
-			"Y", "y", "1", "False", "FALSE", "false", "N", "n", "0"; default
-			value: false.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Keep_Files">
-		<attribute-definition id="PBSJOB_Keep_Files"
-			type="choice" display="true">
-			<description>Retain these streams on the execution host upon job
-				termination.</description>
-		</attribute-definition>
-		<choice>,o,e,oe,eo</choice>
-		<qsub-flag>-k </qsub-flag>
-		<tooltip>Format: "o", "e", "oe" or "eo"; default value: no keep,
-			return files to submission host.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Mail_Points">
-		<attribute-definition id="PBSJOB_Mail_Points"
-			type="choice" display="true">
-			<description>Identifies at which state changes the server will send
-				mail about the job.</description>
-			<default>a</default>
-		</attribute-definition>
-		<choice>,a,b</choice>
-		<qsub-flag>-m </qsub-flag>
-		<tooltip>Format: string made up of the letters 'a' for abort, 'b' for
-			beginning, and default value: 'a', send on job abort.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Mail_Users">
-		<attribute-definition id="PBSJOB_Mail_Users"
-			type="string" display="true">
-			<description>The set of users to whom mail may be sent when the job
-				makes certain state changes.</description>
-		</attribute-definition>
-		<qsub-flag>-M </qsub-flag>
-		<tooltip>Format: "user@host[,user@host]";
-			default value: job owner
-			only.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Output_Path">
-		<attribute-definition id="PBSJOB_Output_Path"
-			type="string" display="true">
-			<description>The final path name for the file containing the job's
-				standard output stream.</description>
-		</attribute-definition>
-		<qsub-flag>-o </qsub-flag>
-		<tooltip>Format: "[hostname:]pathname". If the option is not
-			specified, the default file name for the standard error stream will
-			be used. The default name has the following form: job_name.oSeq_num
-			where job_name is the name of the job, see -N option, and Seq_num is
-			the job number assigned when the job is submitted; default value:
-			(job_name).o(job_number). </tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Priority">
-		<attribute-definition id="PBSJOB_Priority" type="string"
-			display="true">
-			<description>The job scheduling priority assigned by the user.
-			</description>
-		</attribute-definition>
-		<qsub-flag>-p </qsub-flag>
-		<tooltip>Format: "[+|-]nnnnn"; default value: undefined.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Rerunnable">
-		<attribute-definition id="PBSJOB_Rerunnable"
-			type="choice" display="true">
-			<description>The rerunnable flag assigned by the user.</description>
-			<default>y</default>
-		</attribute-definition>
-		<choice>,n,y</choice>
-		<qsub-flag>-r </qsub-flag>
-		<tooltip>Format: "y" or "n", see Join_Path; default value: y, job is
-			rerunable.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.arch">
-		<attribute-definition id="PBSJOB_Resource_List.arch"
-			type="string" display="true">
-			<description>Specifies the administrator defined system architecture
-				requried.</description>
-		</attribute-definition>
-		<qsub-flag>-l arch=</qsub-flag>
-		<tooltip>This defaults to whatever the PBS_MACH string is set to in
-			"local.mk". Units: string.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.cput">
-		<attribute-definition id="PBSJOB_Resource_List.cput"
-			type="string" display="true">
-			<description>Maximum amount of CPU time used by all processes in the
-				job.</description>
-		</attribute-definition>
-		<qsub-flag>-l cput=</qsub-flag>
-		<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.file">
-		<attribute-definition id="PBSJOB_Resource_List.file"
-			type="string" display="true">
-			<description>The largest size of any single file that may be created
-				by the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l file=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.host">
-		<attribute-definition id="PBSJOB_Resource_List.host"
-			type="string" display="true">
-			<description>Name of host on which job should be run.</description>
-		</attribute-definition>
-		<qsub-flag>-l host=</qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.mem">
-		<attribute-definition id="PBSJOB_Resource_List.mem"
-			type="string" display="true">
-			<description>Maximum amount of memory used by all concurrent
-				processes in the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l mem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.ncpus" minSet="true">
-		<attribute-definition id="PBSJOB_Resource_List.ncpus"
-			type="integer" display="true">
-			<description>Total number of cpus/cores to be allocated to the job.
-			</description>
-			<default>1</default>
-			<min>1</min>
-		</attribute-definition>
-		<qsub-flag>-l ncpus=</qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.nice">
-		<attribute-definition id="PBSJOB_Resource_List.nice"
-			type="integer" display="true">
-			<description>The nice value under which the job is to be run.
-			</description>
-			<default>0</default>
-			<min>0</min>
-			<max>10</max>
-		</attribute-definition>
-		<qsub-flag>-l nice=</qsub-flag>
-		<tooltip>0 to 10.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.nodes" minSet="true">
-		<attribute-definition id="PBSJOB_Resource_List.nodes"
-			type="string" display="true">
-			<description>Number and/or type of nodes to be reserved for exclusive
-				use by the job.</description>
-			<default>1</default>
-		</attribute-definition>
-		<qsub-flag>-l nodes=</qsub-flag>
-		<tooltip>The value is one or more node_specs joined with the '+'
-			character, "node_spec[+node_spec...]. Each node_spec is a number of
-			nodes required of the type declared in the node_spec and a name or
-			one or more properity or properities desired for the nodes. The
-			number, the name, and each properity in the node_spec are separated
-			by a colon ':'. If no number is specified, one (1) is assumed. Units:
-			string. The name of a node is its hostname. The properties of nodes
-			are: ppn=# requested; defaults to 1; or an arbitrary string defined
-			by system administrator. Example: To ask for 2 processors on each of
-			two blue nodes and three processors on one red node: -l
-			nodes=2:blue:ppn=2+red:ppn=3.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.ompthreads">
-		<attribute-definition id="PBSJOB_Resource_List.ompthreads"
-			type="integer" display="true">
-			<description>Number of threads per processor for Open MP jobs.
-			</description>
-			<default>1</default>
-			<min>1</min>
-		</attribute-definition>
-		<qsub-flag>-l ompthreads=</qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.pcput">
-		<attribute-definition id="PBSJOB_Resource_List.pcput"
-			type="string" display="true">
-			<description>Maximum amount of CPU time used by any single process in
-				the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l pcput=</qsub-flag>
-		<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.pmem">
-		<attribute-definition id="PBSJOB_Resource_List.pmem"
-			type="string" display="true">
-			<description>Maximum amount of physical memory (workingset) used by
-				any single process of the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l pmem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.pvmem">
-		<attribute-definition id="PBSJOB_Resource_List.pvmem"
-			type="string" display="true">
-			<description>Maximum amount of virtual memory used by any single
-				process in the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l pvmem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.vmem">
-		<attribute-definition id="PBSJOB_Resource_List.vmem"
-			type="string" display="true">
-			<description>Maximum amount of virtual memory used by all concurrent
-				processes in the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l vmem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.walltime" minSet="true">
-		<attribute-definition id="PBSJOB_Resource_List.walltime"
-			type="string" display="true">
-			<description>Maximum amount of real time during which the job can be
-				in the running state.</description>
-			<default>00:30:00</default>
-		</attribute-definition>
-		<qsub-flag>-l walltime=</qsub-flag>
-		<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Shell_Path_List">
-		<attribute-definition id="PBSJOB_Shell_Path_List"
-			type="string" display="true">
-			<description>A set of absolute paths of the program to process the
-				job's script file.</description>
-		</attribute-definition>
-		<qsub-flag>-S </qsub-flag>
-		<tooltip>Format: path[@host][,path[@host]...]. If this is null, then
-			the user's login shell on the host of execution will be used. Default
-			value: null, login shell.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="stagein">
-		<attribute-definition id="PBSJOB_stagein" type="string"
-			display="true">
-			<description>The list of files to be staged in prior to job
-				execution.</description>
-		</attribute-definition>
-		<qsub-flag>-W stagein=</qsub-flag>
-		<tooltip>Format: local_path@remote_host:remote_path.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="stageout">
-		<attribute-definition id="PBSJOB_stageout" type="string"
-			display="true">
-			<description>The list of files to be staged out after job execution.
-			</description>
-		</attribute-definition>
-		<qsub-flag>-W stageout=</qsub-flag>
-		<tooltip>Format: local_path@remote_host:remote_path.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="User_List">
-		<attribute-definition id="PBSJOB_User_List" type="string"
-			display="true">
-			<description>The list of user@hosts which determines the user name
-				under which the job is run on a given host.</description>
-		</attribute-definition>
-		<qsub-flag>-u </qsub-flag>
-		<tooltip>When a job is to be placed into execution, the server will
-			select a user name from the list according to the following ordered
-			set of rules: 1) Select the user name from the list for which the
-			associated host name matches the name of the execution host; 2)
-			Select the user name which has no associated host name, the wild card
-			name; 3) Use the Job_Owner as the user name. Default value: job owner
-			name.
-      </tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Variable_List">
-		<attribute-definition id="PBSJOB_Variable_List"
-			type="string" display="true">
-			<description>This is the list of environment variables passed with
-				the Queue Job batch request.</description>
-		</attribute-definition>
-		<qsub-flag>-v </qsub-flag>
-	</pbs-job-attribute>
-</pbs-job-attributes>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Torque_SMP.job_attributes.xml b/rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Torque_SMP.job_attributes.xml
deleted file mode 100644
index 39abfae..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Torque_SMP.job_attributes.xml
+++ /dev/null
@@ -1,386 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pbs-job-attributes>
-	<pbs-job-attribute name="Account_Name" minSet="true">
-		<attribute-definition id="PBSJOB_Account_Name"
-			type="string" display="true">
-			<description>Account to which to charge this job.</description>
-		</attribute-definition>
-		<qsub-flag>-A </qsub-flag>
-		<tooltip>Format: string</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Checkpoint">
-		<attribute-definition id="PBSJOB_Checkpoint"
-			type="choice" display="true">
-			<description>Determines when checkpointing (if supported) will be
-				performed by PBS on behalf of the job.</description>
-			<default>u</default>
-		</attribute-definition>
-		<choice>,u,n,s,c,c=????</choice>
-		<qsub-flag>-c </qsub-flag>
-		<tooltip>Format: the strings "n" (no checkpointing), "s" (to be
-			performed only when the server executing the job is shutdown), "c"
-			(to be performed at the default minimum time for the server executing
-			the job), "c=mmmm" (to be performed at an interval of minutes which
-			is the integer number of minutes of CPU time used by the job; value
-			must be greater than zero); default value: "u", which is unspecified.
-		</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="depend">
-		<attribute-definition id="PBSJOB_depend" type="string"
-			display="true">
-			<description>The type of inter-job dependencies specified by the job
-				owner.</description>
-		</attribute-definition>
-		<qsub-flag>-W depend=</qsub-flag>
-		<tooltip>Format: "type:jobid[,jobid...]"; default value: no
-			dependencies.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="destination" minSet="true">
-		<attribute-definition id="PBSJOB_destination"
-			type="string" display="true">
-			<description>Designation of the queue to which to submit the job.
-			</description>
-		</attribute-definition>
-		<qsub-flag>-q </qsub-flag>
-		<tooltip>Format: queue[@server].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="directive">
-		<attribute-definition id="PBSJOB_directive" type="string"
-			display="true">
-			<description>Defines the prefix that declares a directive to the qsub
-				command within the script file.</description>
-		</attribute-definition>
-		<qsub-flag>-C </qsub-flag>
-		<tooltip>See the paragraph on script directives in the Extended
-			Description section. If the option is presented with a
-			directive_prefix argument that is the null string, qsub will not scan
-			the script file for directives.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Error_Path">
-		<attribute-definition id="PBSJOB_Error_Path"
-			type="string" display="true">
-			<description>The final path name for the file containing the job's
-				standard error stream.</description>
-		</attribute-definition>
-		<qsub-flag>-e </qsub-flag>
-		<tooltip>Format: "[hostname:]pathname". If the option is not
-			specified, the default file name for the standard error stream will
-			be used. The default name has the following form: job_name.eSeq_num
-			where job_name is the name of the job, see -N option, and Seq_num is
-			the job number assigned when the job is submitted; default value:
-			(job_name).e(job_number).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="export_all" minSet="true">
-		<attribute-definition id="PBSJOB_export_all"
-			type="boolean" display="true">
-			<description>Declares that all environment variables in the qsub
-				command's environment are to be exported to the batch job.
-			</description>
-			<default>true</default>
-		</attribute-definition>
-		<qsub-flag>-V </qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="group_list">
-		<attribute-definition id="PBSJOB_group_list"
-			type="string" display="true">
-			<description>A list of group_names@hosts which determines the group
-				under which the job is run on a given host.</description>
-		</attribute-definition>
-		<qsub-flag>-W group_list=</qsub-flag>
-		<tooltip>Format: group_name[@host][,group_name[@host]...]. When a job
-			is to be placed into execution, the server will select a group name
-			according to the following ordered set of rules: 1) Select the group
-			name from the list for which the associated host name matches the
-			name of the execution host; 2) Select the group name which has no
-			associated host name, the wildcard name; 3) Use the login group for
-			the username under which the job will be run.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Hold_Types">
-		<attribute-definition id="PBSJOB_Hold_Types"
-			type="choice" display="true">
-			<description>The set of holds currently applied to the job.
-			</description>
-		</attribute-definition>
-		<choice>,u,s,o</choice>
-		<qsub-flag>-h </qsub-flag>
-		<tooltip>If the set is not null, the job will not be scheduled for
-			execution and is said to be in the hold state. Note, the hold state
-			takes precedence over the wait state. Format: string made up of the
-			letters 'u', 's', 'o'; default value: no hold.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Job_Name" minSet="true">
-		<attribute-definition id="PBSJOB_Job_Name" type="string"
-			display="true">
-			<description>The name assigned to the job by the qsub or qalter
-				command.</description>
-		</attribute-definition>
-		<qsub-flag>-N </qsub-flag>
-		<tooltip>Format: string up to 15 characters, first character must be
-			alphabetic; default value: the base name of the job script or STDIN.
-		</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Join_Path">
-		<attribute-definition id="PBSJOB_Join_Path" type="boolean"
-			display="true">
-			<description>Merge stdout and stderr into stdout.</description>
-			<default>false</default>
-		</attribute-definition>
-		<qsub-flag>-j </qsub-flag>
-		<tooltip>Format: boolean, values accepted are "True", "TRUE", "true",
-			"Y", "y", "1", "False", "FALSE", "false", "N", "n", "0"; default
-			value: false.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Keep_Files">
-		<attribute-definition id="PBSJOB_Keep_Files"
-			type="choice" display="true">
-			<description>Retain these streams on the execution host upon job
-				termination.</description>
-		</attribute-definition>
-		<choice>,o,e,oe,eo</choice>
-		<qsub-flag>-k </qsub-flag>
-		<tooltip>Format: "o", "e", "oe" or "eo"; default value: no keep,
-			return files to submission host.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Mail_Points">
-		<attribute-definition id="PBSJOB_Mail_Points"
-			type="choice" display="true">
-			<description>Identifies at which state changes the server will send
-				mail about the job.</description>
-			<default>a</default>
-		</attribute-definition>
-		<choice>,a,b</choice>
-		<qsub-flag>-m </qsub-flag>
-		<tooltip>Format: string made up of the letters 'a' for abort, 'b' for
-			beginning, and default value: 'a', send on job abort.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Mail_Users">
-		<attribute-definition id="PBSJOB_Mail_Users"
-			type="string" display="true">
-			<description>The set of users to whom mail may be sent when the job
-				makes certain state changes.</description>
-		</attribute-definition>
-		<qsub-flag>-M </qsub-flag>
-		<tooltip>Format: "user@host[,user@host]";
-			default value: job owner
-			only.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Output_Path">
-		<attribute-definition id="PBSJOB_Output_Path"
-			type="string" display="true">
-			<description>The final path name for the file containing the job's
-				standard output stream.</description>
-		</attribute-definition>
-		<qsub-flag>-o </qsub-flag>
-		<tooltip>Format: "[hostname:]pathname". If the option is not
-			specified, the default file name for the standard error stream will
-			be used. The default name has the following form: job_name.oSeq_num
-			where job_name is the name of the job, see -N option, and Seq_num is
-			the job number assigned when the job is submitted; default value:
-			(job_name).o(job_number). </tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Priority">
-		<attribute-definition id="PBSJOB_Priority" type="string"
-			display="true">
-			<description>The job scheduling priority assigned by the user.
-			</description>
-		</attribute-definition>
-		<qsub-flag>-p </qsub-flag>
-		<tooltip>Format: "[+|-]nnnnn"; default value: undefined.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Rerunnable">
-		<attribute-definition id="PBSJOB_Rerunnable"
-			type="choice" display="true">
-			<description>The rerunnable flag assigned by the user.</description>
-			<default>y</default>
-		</attribute-definition>
-		<choice>,n,y</choice>
-		<qsub-flag>-r </qsub-flag>
-		<tooltip>Format: "y" or "n", see Join_Path; default value: y, job is
-			rerunable.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.arch">
-		<attribute-definition id="PBSJOB_Resource_List.arch"
-			type="string" display="true">
-			<description>Specifies the administrator defined system architecture
-				requried.</description>
-		</attribute-definition>
-		<qsub-flag>-l arch=</qsub-flag>
-		<tooltip>This defaults to whatever the PBS_MACH string is set to in
-			"local.mk". Units: string.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.cput">
-		<attribute-definition id="PBSJOB_Resource_List.cput"
-			type="string" display="true">
-			<description>Maximum amount of CPU time used by all processes in the
-				job.</description>
-		</attribute-definition>
-		<qsub-flag>-l cput=</qsub-flag>
-		<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.file">
-		<attribute-definition id="PBSJOB_Resource_List.file"
-			type="string" display="true">
-			<description>The largest size of any single file that may be created
-				by the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l file=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.host">
-		<attribute-definition id="PBSJOB_Resource_List.host"
-			type="string" display="true">
-			<description>Name of host on which job should be run.</description>
-		</attribute-definition>
-		<qsub-flag>-l host=</qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.mem">
-		<attribute-definition id="PBSJOB_Resource_List.mem"
-			type="string" display="true">
-			<description>Maximum amount of memory used by all concurrent
-				processes in the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l mem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.ncpus" minSet="true">
-		<attribute-definition id="PBSJOB_Resource_List.ncpus"
-			type="integer" display="true">
-			<description>Total number of cpus/cores to be allocated to the job.
-			</description>
-			<default>1</default>
-			<min>1</min>
-		</attribute-definition>
-		<qsub-flag>-l ncpus=</qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.nice">
-		<attribute-definition id="PBSJOB_Resource_List.nice"
-			type="integer" display="true">
-			<description>The nice value under which the job is to be run.
-			</description>
-			<default>0</default>
-			<min>0</min>
-			<max>10</max>
-		</attribute-definition>
-		<qsub-flag>-l nice=</qsub-flag>
-		<tooltip>0 to 10.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.ompthreads">
-		<attribute-definition id="PBSJOB_Resource_List.ompthreads"
-			type="integer" display="true">
-			<description>Number of threads per processor for Open MP jobs.
-			</description>
-			<default>1</default>
-			<min>1</min>
-		</attribute-definition>
-		<qsub-flag>-l ompthreads=</qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.pcput">
-		<attribute-definition id="PBSJOB_Resource_List.pcput"
-			type="string" display="true">
-			<description>Maximum amount of CPU time used by any single process in
-				the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l pcput=</qsub-flag>
-		<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.pmem">
-		<attribute-definition id="PBSJOB_Resource_List.pmem"
-			type="string" display="true">
-			<description>Maximum amount of physical memory (workingset) used by
-				any single process of the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l pmem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.pvmem">
-		<attribute-definition id="PBSJOB_Resource_List.pvmem"
-			type="string" display="true">
-			<description>Maximum amount of virtual memory used by any single
-				process in the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l pvmem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.vmem">
-		<attribute-definition id="PBSJOB_Resource_List.vmem"
-			type="string" display="true">
-			<description>Maximum amount of virtual memory used by all concurrent
-				processes in the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l vmem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.walltime" minSet="true">
-		<attribute-definition id="PBSJOB_Resource_List.walltime"
-			type="string" display="true">
-			<description>Maximum amount of real time during which the job can be
-				in the running state.</description>
-			<default>00:30:00</default>
-		</attribute-definition>
-		<qsub-flag>-l walltime=</qsub-flag>
-		<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Shell_Path_List">
-		<attribute-definition id="PBSJOB_Shell_Path_List"
-			type="string" display="true">
-			<description>A set of absolute paths of the program to process the
-				job's script file.</description>
-		</attribute-definition>
-		<qsub-flag>-S </qsub-flag>
-		<tooltip>Format: path[@host][,path[@host]...]. If this is null, then
-			the user's login shell on the host of execution will be used. Default
-			value: null, login shell.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="stagein">
-		<attribute-definition id="PBSJOB_stagein" type="string"
-			display="true">
-			<description>The list of files to be staged in prior to job
-				execution.</description>
-		</attribute-definition>
-		<qsub-flag>-W stagein=</qsub-flag>
-		<tooltip>Format: local_path@remote_host:remote_path.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="stageout">
-		<attribute-definition id="PBSJOB_stageout" type="string"
-			display="true">
-			<description>The list of files to be staged out after job execution.
-			</description>
-		</attribute-definition>
-		<qsub-flag>-W stageout=</qsub-flag>
-		<tooltip>Format: local_path@remote_host:remote_path.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="User_List">
-		<attribute-definition id="PBSJOB_User_List" type="string"
-			display="true">
-			<description>The list of user@hosts which determines the user name
-				under which the job is run on a given host.</description>
-		</attribute-definition>
-		<qsub-flag>-u </qsub-flag>
-		<tooltip>When a job is to be placed into execution, the server will
-			select a user name from the list according to the following ordered
-			set of rules: 1) Select the user name from the list for which the
-			associated host name matches the name of the execution host; 2)
-			Select the user name which has no associated host name, the wild card
-			name; 3) Use the Job_Owner as the user name. Default value: job owner
-			name.
-      </tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Variable_List">
-		<attribute-definition id="PBSJOB_Variable_List"
-			type="string" display="true">
-			<description>This is the list of environment variables passed with
-				the Queue Job batch request.</description>
-		</attribute-definition>
-		<qsub-flag>-v </qsub-flag>
-	</pbs-job-attribute>
-</pbs-job-attributes>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Torque_Standard.job_attributes.xml b/rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Torque_Standard.job_attributes.xml
deleted file mode 100644
index 2c97c78..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/data/PBS_Torque_Standard.job_attributes.xml
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pbs-job-attributes>
-	<pbs-job-attribute name="Account_Name" minSet="true">
-		<attribute-definition id="PBSJOB_Account_Name"
-			type="string" display="true">
-			<description>Account to which to charge this job.</description>
-		</attribute-definition>
-		<qsub-flag>-A </qsub-flag>
-		<tooltip>Format: string</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Checkpoint">
-		<attribute-definition id="PBSJOB_Checkpoint"
-			type="choice" display="true">
-			<description>Determines when checkpointing (if supported) will be
-				performed by PBS on behalf of the job.</description>
-			<default>u</default>
-		</attribute-definition>
-		<choice>,u,n,s,c,c=????</choice>
-		<qsub-flag>-c </qsub-flag>
-		<tooltip>Format: the strings "n" (no checkpointing), "s" (to be
-			performed only when the server executing the job is shutdown), "c"
-			(to be performed at the default minimum time for the server executing
-			the job), "c=mmmm" (to be performed at an interval of minutes which
-			is the integer number of minutes of CPU time used by the job; value
-			must be greater than zero); default value: "u", which is unspecified.
-		</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="depend">
-		<attribute-definition id="PBSJOB_depend" type="string"
-			display="true">
-			<description>The type of inter-job dependencies specified by the job
-				owner.</description>
-		</attribute-definition>
-		<qsub-flag>-W depend=</qsub-flag>
-		<tooltip>Format: "type:jobid[,jobid...]"; default value: no
-			dependencies.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="destination" minSet="true">
-		<attribute-definition id="PBSJOB_destination"
-			type="string" display="true">
-			<description>Designation of the queue to which to submit the job.
-			</description>
-		</attribute-definition>
-		<qsub-flag>-q </qsub-flag>
-		<tooltip>Format: queue[@server].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="directive">
-		<attribute-definition id="PBSJOB_directive" type="string"
-			display="true">
-			<description>Defines the prefix that declares a directive to the qsub
-				command within the script file.</description>
-		</attribute-definition>
-		<qsub-flag>-C </qsub-flag>
-		<tooltip>See the paragraph on script directives in the Extended
-			Description section. If the option is presented with a
-			directive_prefix argument that is the null string, qsub will not scan
-			the script file for directives.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Error_Path">
-		<attribute-definition id="PBSJOB_Error_Path"
-			type="string" display="true">
-			<description>The final path name for the file containing the job's
-				standard error stream.</description>
-		</attribute-definition>
-		<qsub-flag>-e </qsub-flag>
-		<tooltip>Format: "[hostname:]pathname". If the option is not
-			specified, the default file name for the standard error stream will
-			be used. The default name has the following form: job_name.eSeq_num
-			where job_name is the name of the job, see -N option, and Seq_num is
-			the job number assigned when the job is submitted; default value:
-			(job_name).e(job_number).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="export_all" minSet="true">
-		<attribute-definition id="PBSJOB_export_all"
-			type="boolean" display="true">
-			<description>Declares that all environment variables in the qsub
-				command's environment are to be exported to the batch job.
-			</description>
-			<default>true</default>
-		</attribute-definition>
-		<qsub-flag>-V </qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="group_list">
-		<attribute-definition id="PBSJOB_group_list"
-			type="string" display="true">
-			<description>A list of group_names@hosts which determines the group
-				under which the job is run on a given host.</description>
-		</attribute-definition>
-		<qsub-flag>-W group_list=</qsub-flag>
-		<tooltip>Format: group_name[@host][,group_name[@host]...]. When a job
-			is to be placed into execution, the server will select a group name
-			according to the following ordered set of rules: 1) Select the group
-			name from the list for which the associated host name matches the
-			name of the execution host; 2) Select the group name which has no
-			associated host name, the wildcard name; 3) Use the login group for
-			the username under which the job will be run.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Hold_Types">
-		<attribute-definition id="PBSJOB_Hold_Types"
-			type="choice" display="true">
-			<description>The set of holds currently applied to the job.
-			</description>
-		</attribute-definition>
-		<choice>,u,s,o</choice>
-		<qsub-flag>-h </qsub-flag>
-		<tooltip>If the set is not null, the job will not be scheduled for
-			execution and is said to be in the hold state. Note, the hold state
-			takes precedence over the wait state. Format: string made up of the
-			letters 'u', 's', 'o'; default value: no hold.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Job_Name" minSet="true">
-		<attribute-definition id="PBSJOB_Job_Name" type="string"
-			display="true">
-			<description>The name assigned to the job by the qsub or qalter
-				command.</description>
-		</attribute-definition>
-		<qsub-flag>-N </qsub-flag>
-		<tooltip>Format: string up to 15 characters, first character must be
-			alphabetic; default value: the base name of the job script or STDIN.
-		</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Join_Path">
-		<attribute-definition id="PBSJOB_Join_Path" type="boolean"
-			display="true">
-			<description>Merge stdout and stderr into stdout.</description>
-			<default>false</default>
-		</attribute-definition>
-		<qsub-flag>-j </qsub-flag>
-		<tooltip>Format: boolean, values accepted are "True", "TRUE", "true",
-			"Y", "y", "1", "False", "FALSE", "false", "N", "n", "0"; default
-			value: false.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Keep_Files">
-		<attribute-definition id="PBSJOB_Keep_Files"
-			type="choice" display="true">
-			<description>Retain these streams on the execution host upon job
-				termination.</description>
-		</attribute-definition>
-		<choice>,o,e,oe,eo</choice>
-		<qsub-flag>-k </qsub-flag>
-		<tooltip>Format: "o", "e", "oe" or "eo"; default value: no keep,
-			return files to submission host.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Mail_Points">
-		<attribute-definition id="PBSJOB_Mail_Points"
-			type="choice" display="true">
-			<description>Identifies at which state changes the server will send
-				mail about the job.</description>
-			<default>a</default>
-		</attribute-definition>
-		<choice>,a,b</choice>
-		<qsub-flag>-m </qsub-flag>
-		<tooltip>Format: string made up of the letters 'a' for abort, 'b' for
-			beginning, and default value: 'a', send on job abort.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Mail_Users">
-		<attribute-definition id="PBSJOB_Mail_Users"
-			type="string" display="true">
-			<description>The set of users to whom mail may be sent when the job
-				makes certain state changes.</description>
-		</attribute-definition>
-		<qsub-flag>-M </qsub-flag>
-		<tooltip>Format: "user@host[,user@host]";
-			default value: job owner
-			only.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Output_Path">
-		<attribute-definition id="PBSJOB_Output_Path"
-			type="string" display="true">
-			<description>The final path name for the file containing the job's
-				standard output stream.</description>
-		</attribute-definition>
-		<qsub-flag>-o </qsub-flag>
-		<tooltip>Format: "[hostname:]pathname". If the option is not
-			specified, the default file name for the standard error stream will
-			be used. The default name has the following form: job_name.oSeq_num
-			where job_name is the name of the job, see -N option, and Seq_num is
-			the job number assigned when the job is submitted; default value:
-			(job_name).o(job_number). </tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Priority">
-		<attribute-definition id="PBSJOB_Priority" type="string"
-			display="true">
-			<description>The job scheduling priority assigned by the user.
-			</description>
-		</attribute-definition>
-		<qsub-flag>-p </qsub-flag>
-		<tooltip>Format: "[+|-]nnnnn"; default value: undefined.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Rerunnable">
-		<attribute-definition id="PBSJOB_Rerunnable"
-			type="choice" display="true">
-			<description>The rerunnable flag assigned by the user.</description>
-			<default>y</default>
-		</attribute-definition>
-		<choice>,n,y</choice>
-		<qsub-flag>-r </qsub-flag>
-		<tooltip>Format: "y" or "n", see Join_Path; default value: y, job is
-			rerunable.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.arch">
-		<attribute-definition id="PBSJOB_Resource_List.arch"
-			type="string" display="true">
-			<description>Specifies the administrator defined system architecture
-				requried.</description>
-		</attribute-definition>
-		<qsub-flag>-l arch=</qsub-flag>
-		<tooltip>This defaults to whatever the PBS_MACH string is set to in
-			"local.mk". Units: string.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.cput">
-		<attribute-definition id="PBSJOB_Resource_List.cput"
-			type="string" display="true">
-			<description>Maximum amount of CPU time used by all processes in the
-				job.</description>
-		</attribute-definition>
-		<qsub-flag>-l cput=</qsub-flag>
-		<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.file">
-		<attribute-definition id="PBSJOB_Resource_List.file"
-			type="string" display="true">
-			<description>The largest size of any single file that may be created
-				by the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l file=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.host">
-		<attribute-definition id="PBSJOB_Resource_List.host"
-			type="string" display="true">
-			<description>Name of host on which job should be run.</description>
-		</attribute-definition>
-		<qsub-flag>-l host=</qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.mem">
-		<attribute-definition id="PBSJOB_Resource_List.mem"
-			type="string" display="true">
-			<description>Maximum amount of memory used by all concurrent
-				processes in the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l mem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.nice">
-		<attribute-definition id="PBSJOB_Resource_List.nice"
-			type="integer" display="true">
-			<description>The nice value under which the job is to be run.
-			</description>
-			<default>0</default>
-			<min>0</min>
-			<max>10</max>
-		</attribute-definition>
-		<qsub-flag>-l nice=</qsub-flag>
-		<tooltip>0 to 10.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.nodes" minSet="true">
-		<attribute-definition id="PBSJOB_Resource_List.nodes"
-			type="string" display="true">
-			<description>Number and/or type of nodes to be reserved for exclusive
-				use by the job.</description>
-			<default>1</default>
-		</attribute-definition>
-		<qsub-flag>-l nodes=</qsub-flag>
-		<tooltip>The value is one or more node_specs joined with the '+'
-			character, "node_spec[+node_spec...]. Each node_spec is a number of
-			nodes required of the type declared in the node_spec and a name or
-			one or more properity or properities desired for the nodes. The
-			number, the name, and each properity in the node_spec are separated
-			by a colon ':'. If no number is specified, one (1) is assumed. Units:
-			string. The name of a node is its hostname. The properties of nodes
-			are: ppn=# requested; defaults to 1; or an arbitrary string defined
-			by system administrator. Example: To ask for 2 processors on each of
-			two blue nodes and three processors on one red node: -l
-			nodes=2:blue:ppn=2+red:ppn=3.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.ompthreads">
-		<attribute-definition id="PBSJOB_Resource_List.ompthreads"
-			type="integer" display="true">
-			<description>Number of threads per processor for Open MP jobs.
-			</description>
-			<default>1</default>
-			<min>1</min>
-		</attribute-definition>
-		<qsub-flag>-l ompthreads=</qsub-flag>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.pcput">
-		<attribute-definition id="PBSJOB_Resource_List.pcput"
-			type="string" display="true">
-			<description>Maximum amount of CPU time used by any single process in
-				the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l pcput=</qsub-flag>
-		<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.pmem">
-		<attribute-definition id="PBSJOB_Resource_List.pmem"
-			type="string" display="true">
-			<description>Maximum amount of physical memory (workingset) used by
-				any single process of the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l pmem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.pvmem">
-		<attribute-definition id="PBSJOB_Resource_List.pvmem"
-			type="string" display="true">
-			<description>Maximum amount of virtual memory used by any single
-				process in the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l pvmem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.vmem">
-		<attribute-definition id="PBSJOB_Resource_List.vmem"
-			type="string" display="true">
-			<description>Maximum amount of virtual memory used by all concurrent
-				processes in the job.</description>
-		</attribute-definition>
-		<qsub-flag>-l vmem=</qsub-flag>
-		<tooltip>Format: integer[suffix]; the suffix is a multiplier in bytes
-			or words (word size of the host): b (bytes), w (words), kb/kw (kilo),
-			mb/mw (mega), gb/bw (giga).</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Resource_List.walltime" minSet="true">
-		<attribute-definition id="PBSJOB_Resource_List.walltime"
-			type="string" display="true">
-			<description>Maximum amount of real time during which the job can be
-				in the running state.</description>
-			<default>00:30:00</default>
-		</attribute-definition>
-		<qsub-flag>-l walltime=</qsub-flag>
-		<tooltip>Format: [[hours:]minutes:]seconds[.milliseconds].</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Shell_Path_List">
-		<attribute-definition id="PBSJOB_Shell_Path_List"
-			type="string" display="true">
-			<description>A set of absolute paths of the program to process the
-				job's script file.</description>
-		</attribute-definition>
-		<qsub-flag>-S </qsub-flag>
-		<tooltip>Format: path[@host][,path[@host]...]. If this is null, then
-			the user's login shell on the host of execution will be used. Default
-			value: null, login shell.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="stagein">
-		<attribute-definition id="PBSJOB_stagein" type="string"
-			display="true">
-			<description>The list of files to be staged in prior to job
-				execution.</description>
-		</attribute-definition>
-		<qsub-flag>-W stagein=</qsub-flag>
-		<tooltip>Format: local_path@remote_host:remote_path.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="stageout">
-		<attribute-definition id="PBSJOB_stageout" type="string"
-			display="true">
-			<description>The list of files to be staged out after job execution.
-			</description>
-		</attribute-definition>
-		<qsub-flag>-W stageout=</qsub-flag>
-		<tooltip>Format: local_path@remote_host:remote_path.</tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="User_List">
-		<attribute-definition id="PBSJOB_User_List" type="string"
-			display="true">
-			<description>The list of user@hosts which determines the user name
-				under which the job is run on a given host.</description>
-		</attribute-definition>
-		<qsub-flag>-u </qsub-flag>
-		<tooltip>When a job is to be placed into execution, the server will
-			select a user name from the list according to the following ordered
-			set of rules: 1) Select the user name from the list for which the
-			associated host name matches the name of the execution host; 2)
-			Select the user name which has no associated host name, the wild card
-			name; 3) Use the Job_Owner as the user name. Default value: job owner
-			name.
-      </tooltip>
-	</pbs-job-attribute>
-	<pbs-job-attribute name="Variable_List">
-		<attribute-definition id="PBSJOB_Variable_List"
-			type="string" display="true">
-			<description>This is the list of environment variables passed with
-				the Queue Job batch request.</description>
-		</attribute-definition>
-		<qsub-flag>-v </qsub-flag>
-	</pbs-job-attribute>
-</pbs-job-attributes>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/plugin.properties b/rms/org.eclipse.ptp.rm.pbs.core/plugin.properties
deleted file mode 100644
index f10f91f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP PBS Core
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/plugin.xml b/rms/org.eclipse.ptp.rm.pbs.core/plugin.xml
deleted file mode 100644
index 3dbbf53..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/plugin.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.ptp.services.core.providers">
-      <provider
-            class="org.eclipse.ptp.rmsystem.ResourceManagerServiceProvider"
-            id="org.eclipse.ptp.rm.pbs.resourceManager"
-            name="PBS (Legacy)"
-            serviceId="org.eclipse.ptp.core.LaunchService">
-      </provider>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.core.resourceManagers">
-      <resourceManager
-            class="org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManagerFactory"
-            id="org.eclipse.ptp.rm.pbs.resourceManager">
-         <resourceManagerControl
-             class="org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManagerFactory"
-             id="org.eclipse.ptp.rm.pbs.control">
-         </resourceManagerControl>
-         <resourceManagerMonitor
-            class="org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManagerFactory"
-            id="org.eclipse.ptp.rm.pbs.monitor">
-         </resourceManagerMonitor>
-      </resourceManager>
-   </extension>
-   <extension
-         point="org.eclipse.ptp.core.runtimeSystems">
-      <runtimeSystem
-            class="org.eclipse.ptp.rm.pbs.core.rtsystem.PBSRuntimeSystemFactory"
-            id="org.eclipse.ptp.rm.pbs.resourceManager">
-      </runtimeSystem>
-   </extension>
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/ptp_logo_icon32.png b/rms/org.eclipse.ptp.rm.pbs.core/ptp_logo_icon32.png
deleted file mode 100644
index e8ec572..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/ptp_logo_icon32.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/Activator.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/Activator.java
deleted file mode 100644
index ec405f7..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/Activator.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	private static final String PLUGIN_ID = "org.eclipse.ptp.rm.pbs.core"; //$NON-NLS-1$
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Generate a unique identifier
-	 * 
-	 * @return unique identifier string
-	 * @since 5.0
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null) {
-			return PLUGIN_ID;
-		}
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/ConfigUtils.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/ConfigUtils.java
deleted file mode 100644
index 0529f39..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/ConfigUtils.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois 
- * All rights reserved. This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0 which accompanies this
- * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- *                  - modified; eliminated unused methods 05/11/2010
- *                  - removed all static final strings into the non-nls
- *                    interface (09/14/2010)
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core;
-
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IPResourceManager;
-import org.eclipse.ptp.rm.pbs.core.attributes.AttributePlaceholder;
-import org.eclipse.ptp.rm.pbs.core.messages.Messages;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManager;
-
-/**
- * Various utilities for configuring attributes.
- * 
- * @author arossi
- * @since 5.0
- */
-public class ConfigUtils implements IPBSNonNLSConstants {
-	public static class PrefixFilter implements FilenameFilter {
-		private final String prefix;
-
-		public PrefixFilter(String prefix) {
-			this.prefix = prefix;
-		}
-
-		public boolean accept(File dir, String name) {
-			return name.startsWith(prefix);
-		}
-
-	}
-
-	public static class SuffixFilter implements FilenameFilter {
-		private final String suffix;
-
-		public SuffixFilter(String suffix) {
-			this.suffix = suffix;
-		}
-
-		public boolean accept(File dir, String name) {
-			return name.endsWith(suffix);
-		}
-	}
-
-	private ConfigUtils() {
-	}
-
-	/**
-	 * General-purpose method for creating an attribute placeholder. Checks the
-	 * key (name) against the known PBS Job Attribute definitions. If valid,
-	 * constructs an attribute and sets it on the placeholder.
-	 * 
-	 * @param key
-	 *            name of the attribute
-	 * @param value
-	 *            of the attribute (can be <code>null</code>)
-	 * @param toolTip
-	 *            from the definition file, or special internal designation
-	 * @param defs
-	 *            list of all static (known) attribute definitions
-	 * @return the constructed placeholder
-	 * @throws IllegalValueException
-	 */
-	public static AttributePlaceholder getAttributePlaceholder(String key, String value, String toolTip,
-			Map<String, IAttributeDefinition<?, ?, ?>> defs) throws IllegalValueException {
-		AttributePlaceholder ap = new AttributePlaceholder();
-		ap.setName(key);
-		if (!ZEROSTR.equals(toolTip))
-			ap.setToolTip(toolTip);
-		if (defs != null) {
-			IAttributeDefinition<?, ?, ?> def = defs.get(key);
-			if (def == null)
-				throw new IllegalValueException(Messages.PBSAttributeNotFound + key);
-			/*
-			 * creates with default value; we save this in the placeholder
-			 */
-			IAttribute<?, ?, ?> attr = def.create();
-			ap.setAttribute(attr);
-			String defaultValue = attr.getValueAsString();
-			ap.setDefaultString(defaultValue);
-			if (value != null)
-				if (!ZEROSTR.equals(value) || (attr instanceof StringAttribute && !ZEROSTR.equals(defaultValue)))
-					attr.setValueAsString(value);
-		}
-		return ap;
-	}
-
-	/**
-	 * For refreshing queue (destination) info from the RM Model definition
-	 */
-	public static String[] getCurrentQueues(PBSResourceManager rmc) {
-		IPResourceManager rm = (IPResourceManager) rmc.getAdapter(IPResourceManager.class);
-		String[] items = new String[0];
-		if (rm != null) {
-			IPQueue[] queues = rm.getQueues();
-			if (queues != null && queues.length > 0) {
-				List<String> queueNames = new ArrayList<String>();
-				for (IPQueue q : queues) {
-					String qname = q.getName();
-					if (qname.length() > 0)
-						queueNames.add(qname);
-				}
-				items = queueNames.toArray(new String[0]);
-			}
-		}
-		return items;
-	}
-
-	public static String readFull(final File file, int bffr_sz) throws Throwable {
-		int read = 0;
-		byte[] bytes = new byte[bffr_sz];
-		FileInputStream stream = null;
-		StringBuffer sb = new StringBuffer();
-		try {
-			stream = new FileInputStream(file);
-			while (true) {
-				try {
-					read = stream.read(bytes, 0, bytes.length);
-				} catch (EOFException eof) {
-					break;
-				}
-				if (read == -1)
-					break;
-				if (read > 0)
-					sb.append(new String(bytes, 0, read));
-			}
-		} finally {
-			if (stream != null)
-				try {
-					stream.close();
-				} catch (IOException t) {
-				}
-		}
-		return sb.toString();
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/IPBSNonNLSConstants.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/IPBSNonNLSConstants.java
deleted file mode 100644
index a9d4383..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/IPBSNonNLSConstants.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - original API
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core;
-
-/**
- * Gathers all internal, unmodifiable string constants into a single place for
- * convenience and code clarity.
- * 
- * @since 5.0
- */
-public interface IPBSNonNLSConstants {
-
-	/* CHARACTERS */
-	String ZEROSTR = ""; //$NON-NLS-1$
-	String SP = " ";//$NON-NLS-1$
-	String EQ = "=";//$NON-NLS-1$
-	String QT = "\"";//$NON-NLS-1$
-	String QM = "?";//$NON-NLS-1$
-	String PD = "#";//$NON-NLS-1$
-	String CM = ",";//$NON-NLS-1$
-	String CO = ":";//$NON-NLS-1$
-	String SC = ";";//$NON-NLS-1$
-	String LT = "<"; //$NON-NLS-1$
-	String LTS = "</";//$NON-NLS-1$
-	String GT = ">";//$NON-NLS-1$
-	String BKESC = "\\\\";//$NON-NLS-1$
-	String BKBKESC = "\\\\\\\\";//$NON-NLS-1$
-	String DLESC = "\\$";//$NON-NLS-1$
-	String DLESCESC = "\\\\\\$";//$NON-NLS-1$
-	String SPESC = "\\\\s";//$NON-NLS-1$
-	String LNSEPESC = "\\\\n";//$NON-NLS-1$
-	String TBESC = "\\t";//$NON-NLS-1$
-	String TBESCESC = "\\\\t";//$NON-NLS-1$
-	String LINE_SEP = System.getProperty("line.separator"); //$NON-NLS-1$
-	String REMOTE_LINE_SEP = "\n"; //$NON-NLS-1$
-	String REMOTE_PATH_SEP = "/"; //$NON-NLS-1$
-	String PATH_SEP = System.getProperty("file.separator"); //$NON-NLS-1$
-
-	String TRUE = "true";//$NON-NLS-1$
-	String FALSE = "false";//$NON-NLS-1$
-	String YES = "yes";;//$NON-NLS-1$
-	String NO = "no";;//$NON-NLS-1$
-
-	/* BATCH SCRIPT TEMPLATE */
-	String MARKER = "@";//$NON-NLS-1$
-	String END_MARKER = ".*@";//$NON-NLS-1$
-	String PBS = "PBS";//$NON-NLS-1$
-	String PBSDIRECTIVE = PD + PBS + SP;
-	String TAG_INTERNAL = "INTERNAL_EXTENSION";//$NON-NLS-1$
-	String TAG_MPICMD = "mpiCommand";//$NON-NLS-1$
-	String TAG_MPIOPT = "mpiOptions";//$NON-NLS-1$
-	String TAG_SCRIPT = "script";//$NON-NLS-1$
-	String TAG_PRECMD = "prependedBash";//$NON-NLS-1$
-	String TAG_PSTCMD = "postpendedBash";//$NON-NLS-1$
-	String MPICORES_FLAG = "-n";//$NON-NLS-1$
-	String MPIOPT_DEFAULT = MPICORES_FLAG + " 1";//$NON-NLS-1$
-	String MPICMD_DEFAULT = "mpiexec";//$NON-NLS-1$
-	String MPICMDS[] = { ZEROSTR, MPICMD_DEFAULT, "mpirun" };//$NON-NLS-1$
-
-	String TAG_ENV = "env";//$NON-NLS-1$
-	String TAG_EXPORT = "export";//$NON-NLS-1$
-	String TAG_EXECMD = "executablePath";//$NON-NLS-1$
-	String TAG_PRARGS = "progArgs";//$NON-NLS-1$
-
-	/*
-	 * PBS ATTRIBUTES WHICH MUST BE KNOWN AHEAD OF MODEL DEFINITION
-	 */
-	String TAG_CHGDIR = "directory";//$NON-NLS-1$
-	String TAG_QUEUE = "destination";//$NON-NLS-1$
-	String TAG_EXPORT_ENV = "export_all";//$NON-NLS-1$
-	String TAG_NCPUS = "Resource_List.ncpus";//$NON-NLS-1$
-	String TAG_NODES = "Resource_List.nodes";//$NON-NLS-1$
-	String TAG_PPN = "ppn";//$NON-NLS-1$
-	String TAG_NDSEP = "[+]";//$NON-NLS-1$
-	String ENV_PLACEHOLDER = MARKER + TAG_ENV + MARKER;
-	String EXECMD_PLACEHOLDER = MARKER + TAG_EXECMD + MARKER;
-	String MPICMD_PLACEHOLDER = MARKER + TAG_MPICMD + MARKER;
-	String MPIOPT_PLACEHOLDER = MARKER + TAG_MPIOPT + MARKER;
-	String PRECMD_PLACEHOLDER = MARKER + TAG_PRECMD + MARKER;
-	String PSTCMD_PLACEHOLDER = MARKER + TAG_PSTCMD + MARKER;
-	String PRARGS_PLACEHOLDER = MARKER + TAG_PRARGS + MARKER;
-	String CHGDIR_CMD = "cd " + MARKER + TAG_CHGDIR + MARKER;//$NON-NLS-1$
-
-	/* ATTRIBUTE DATA TAGS */
-	String ATTRIBUTES = "pbs-job-attributes"; //$NON-NLS-1$
-	String ATTRIBUTE = "pbs-job-attribute"; //$NON-NLS-1$
-	String DEFINITION = "attribute-definition"; //$NON-NLS-1$
-	String FLAG = "qsub-flag"; //$NON-NLS-1$
-	String TOOLTIP = "tooltip"; //$NON-NLS-1$
-	String DEFAULT = "default"; //$NON-NLS-1$
-	String MINSET = "minSet"; //$NON-NLS-1$
-	String DESCRIPTION = "description"; //$NON-NLS-1$
-	String ID = "id"; //$NON-NLS-1$
-	String NAME = "name"; //$NON-NLS-1$
-	String TYPE = "type"; //$NON-NLS-1$
-	String DISPLAY = "display"; //$NON-NLS-1$
-	String MIN = "min"; //$NON-NLS-1$
-	String MAX = "max"; //$NON-NLS-1$
-	String FORMAT = "format";//$NON-NLS-1$
-	String BOOLEAN = "boolean"; //$NON-NLS-1$
-	String STRING = "string"; //$NON-NLS-1$
-	String DOUBLE = "double"; //$NON-NLS-1$
-	String DATE = "date"; //$NON-NLS-1$
-	String INTEGER = "integer"; //$NON-NLS-1$
-	String CHOICE = "choice";//$NON-NLS-1$
-
-	/* DISPLAY */
-	String COURIER = "Courier";//$NON-NLS-1$
-
-	/* FIXED PATHS & FILE NAMES */
-	String SRC = "src";//$NON-NLS-1$
-	String DATA = "data";//$NON-NLS-1$
-	String TEMPLATE_SUFFIX = "_template";//$NON-NLS-1$
-	String FULL_TEMPLATE = "full" + TEMPLATE_SUFFIX;//$NON-NLS-1$
-	String MIN_TEMPLATE = "min" + TEMPLATE_SUFFIX;//$NON-NLS-1$
-	String TMP_ATTR_XML = "all_job_attributes.xml";//$NON-NLS-1$
-	String RM_CONFIG_PROPS = "rm_configurations.properties";//$NON-NLS-1$
-
-	/* SERIALIZATION */
-	String INDENTATION = "{http://xml.apache.org/xslt}indent-amount";//$NON-NLS-1$
-	String INDENT_SPACES = "3";//$NON-NLS-1$
-
-	/* RM & LAUNCH CONFIGURATION */
-	String TEMPLATE_PREFIX = "TMPL_";//$NON-NLS-1$
-	String TEMPLATE_NAMES = TEMPLATE_PREFIX + "names";//$NON-NLS-1$
-	String CURR_TEMPLATE = "_current" + TEMPLATE_SUFFIX; //$NON-NLS-1$
-	String PROXY_CONFIG_TYPE = "PROXYTYPE";//$NON-NLS-1$
-
-	/* INTERNAL JOBS */
-	String TEMPLATE_CHANGE = "template change";//$NON-NLS-1$
-	String REPOPULATE_TEMPLATES = "repopulate templates";//$NON-NLS-1$
-	String EDIT_TEMPLATES = "edit templates";//$NON-NLS-1$
-	String GET_ATTRIBUTES = "getAttributes";//$NON-NLS-1$
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/AttributePlaceholder.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/AttributePlaceholder.java
deleted file mode 100644
index 76d3354..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/AttributePlaceholder.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.attributes;
-
-import org.eclipse.ptp.core.attributes.IAttribute;
-
-/**
- * Wrapper around IAttribute. Allows for associating toolTip and for recording
- * whether the attribute has been selected for inclusion by the user.
- * 
- * @author arossi
- * @since 5.0
- */
-public class AttributePlaceholder {
-	private IAttribute<?, ?, ?> attribute;
-	private String defaultString;
-	private String name;
-	private String toolTip;
-
-	public IAttribute<?, ?, ?> getAttribute() {
-		return attribute;
-	}
-
-	public String getDefaultString() {
-		return defaultString;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String getToolTip() {
-		return toolTip;
-	}
-
-	public void setAttribute(IAttribute<?, ?, ?> attribute) {
-		this.attribute = attribute;
-	}
-
-	public void setDefaultString(String defaultString) {
-		this.defaultString = defaultString;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setToolTip(String toolTip) {
-		this.toolTip = toolTip;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/IPBSJobAttributeData.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/IPBSJobAttributeData.java
deleted file mode 100644
index f8fb36c..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/IPBSJobAttributeData.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - original API
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.attributes;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-
-/**
- * Defines data structure wrapping attribute definition with additional
- * information.
- * 
- * @since 5.0
- */
-public interface IPBSJobAttributeData {
-	void deserialize(InputStream inputStream) throws Throwable;
-
-	Map<String, IAttributeDefinition<?, ?, ?>> getAttributeDefinitionMap() throws Throwable;
-
-	Map<String, String[]> getConstrained() throws Throwable;
-
-	Map<String, String> getMinSet() throws Throwable;
-
-	Properties getPBSQsubFlags() throws Throwable;
-
-	Properties getToolTips() throws Throwable;
-
-	void serialize(OutputStream outputStream) throws Throwable;
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/PBSXMLJobAttributeData.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/PBSXMLJobAttributeData.java
deleted file mode 100644
index a47b8c6..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/attributes/PBSXMLJobAttributeData.java
+++ /dev/null
@@ -1,428 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.attributes;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.TreeMap;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.ptp.core.attributes.BooleanAttributeDefinition;
-import org.eclipse.ptp.core.attributes.DateAttributeDefinition;
-import org.eclipse.ptp.core.attributes.DoubleAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.icu.text.DateFormat;
-
-/**
- * Abstraction of Job Attribute XML. Serializes and deserializes; maintains
- * mappings of definitions, string constraints, qsub flags and tooltips. <br>
- * 
- * This implementation of IPBSJobAttributeData is currently used for both
- * initial configuration and storage; eventually initialization will take place
- * solely via the model definition.
- * 
- * @author arossi
- * @since 5.0
- */
-public class PBSXMLJobAttributeData implements IPBSJobAttributeData, IPBSNonNLSConstants {
-
-	protected Map<String, IAttributeDefinition<?, ?, ?>> definitions;
-	protected Map<String, String[]> constrained;
-	protected Properties flags;
-	protected Properties tooltips;
-	protected Map<String, String> minSet;
-
-	public void deserialize(InputStream inputStream) throws Throwable {
-		clearAll();
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setValidating(false);
-		Document doc = factory.newDocumentBuilder().parse(inputStream);
-		if (doc != null)
-			parseDocument(doc);
-	}
-
-	public Map<String, IAttributeDefinition<?, ?, ?>> getAttributeDefinitionMap() throws Throwable {
-		return definitions;
-	}
-
-	public Map<String, String[]> getConstrained() throws Throwable {
-		return constrained;
-	}
-
-	public Map<String, String> getMinSet() throws Throwable {
-		if (minSet == null)
-			minSet = new HashMap<String, String>();
-		return minSet;
-	}
-
-	public Properties getPBSQsubFlags() throws Throwable {
-		return flags;
-	}
-
-	public Properties getToolTips() throws Throwable {
-		return tooltips;
-	}
-
-	public void serialize(OutputStream outputStream) throws Throwable {
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setValidating(false);
-		Document doc = factory.newDocumentBuilder().newDocument();
-		Element top = doc.createElement(ATTRIBUTES);
-		for (String name : definitions.keySet())
-			appendJobAttribute(name, doc, top);
-		doc.appendChild(top);
-		serialize(doc, outputStream);
-	}
-
-	private void appendAttributeDefinition(BooleanAttributeDefinition definition, Document doc, Element parent) {
-		Element child = doc.createElement(DEFINITION);
-		setCommonAttributes(definition.getId(), BOOLEAN, definition.getDisplay(), child);
-		appendDescription(definition, doc, child);
-		parent.appendChild(child);
-	}
-
-	private void appendAttributeDefinition(DateAttributeDefinition definition, Document doc, Element parent) {
-		Element child = doc.createElement(DEFINITION);
-		setCommonAttributes(definition.getId(), DATE, definition.getDisplay(), child);
-		appendDescription(definition, doc, child);
-		DateFormat df = definition.getDateFormat();
-		if (df != null) {
-			Element format = doc.createElement(DATE);
-			format.setTextContent(df.toString());
-			child.appendChild(format);
-		}
-		appendMinMax(definition.getMinDate(), definition.getMaxDate(), doc, child);
-		parent.appendChild(child);
-	}
-
-	private void appendAttributeDefinition(DoubleAttributeDefinition definition, Document doc, Element parent) {
-		Element child = doc.createElement(DEFINITION);
-		setCommonAttributes(definition.getId(), DOUBLE, definition.getDisplay(), child);
-		appendDescription(definition, doc, child);
-		appendMinMax(definition.getMinValue(), definition.getMaxValue(), doc, child);
-		parent.appendChild(child);
-	}
-
-	private void appendAttributeDefinition(IntegerAttributeDefinition definition, Document doc, Element parent) {
-		Element child = doc.createElement(DEFINITION);
-		setCommonAttributes(definition.getId(), INTEGER, definition.getDisplay(), child);
-		appendDescription(definition, doc, child);
-		appendMinMax(definition.getMinValue(), definition.getMaxValue(), doc, child);
-		parent.appendChild(child);
-	}
-
-	private void appendAttributeDefinition(StringAttributeDefinition definition, Document doc, Element parent) {
-		Element child = doc.createElement(DEFINITION);
-		String name = definition.getName();
-		String[] choices = constrained.get(name);
-		Element choice = null;
-		String type = STRING;
-		if (choices != null && choices.length > 0) {
-			type = CHOICE;
-			choice = doc.createElement(CHOICE);
-			StringBuffer sb = new StringBuffer(choices[0]);
-			for (int i = 1; i < choices.length; i++)
-				sb.append(CM).append(choices[i]);
-			choice.setTextContent(sb.toString());
-		}
-		setCommonAttributes(definition.getId(), type, definition.getDisplay(), child);
-		appendDescription(definition, doc, child);
-		parent.appendChild(child);
-		if (choice != null)
-			parent.appendChild(choice);
-	}
-
-	private void appendDescription(IAttributeDefinition<?, ?, ?> definition, Document doc, Element parent) {
-		String d = definition.getDescription();
-		if (d != null) {
-			Element description = doc.createElement(DESCRIPTION);
-			description.setTextContent(d);
-			parent.appendChild(description);
-		}
-	}
-
-	private void appendJobAttribute(String name, Document doc, Element parent) throws Throwable {
-		String tooltip = tooltips.getProperty(name);
-		if (TAG_INTERNAL.equals(tooltip))
-			return;
-
-		Element jobAttribute = doc.createElement(ATTRIBUTE);
-		jobAttribute.setAttribute(NAME, name);
-		if (minSet.containsKey(name))
-			jobAttribute.setAttribute(MINSET, TRUE);
-		IAttributeDefinition<?, ?, ?> attribute = definitions.get(name);
-		if (attribute instanceof BooleanAttributeDefinition)
-			appendAttributeDefinition((BooleanAttributeDefinition) attribute, doc, jobAttribute);
-		else if (attribute instanceof DateAttributeDefinition)
-			appendAttributeDefinition((DateAttributeDefinition) attribute, doc, jobAttribute);
-		else if (attribute instanceof DoubleAttributeDefinition)
-			appendAttributeDefinition((DoubleAttributeDefinition) attribute, doc, jobAttribute);
-		else if (attribute instanceof IntegerAttributeDefinition)
-			appendAttributeDefinition((IntegerAttributeDefinition) attribute, doc, jobAttribute);
-		else if (attribute instanceof StringAttributeDefinition)
-			appendAttributeDefinition((StringAttributeDefinition) attribute, doc, jobAttribute);
-		appendQsubFlag(name, doc, jobAttribute);
-		appendTooltip(tooltip, doc, jobAttribute);
-		parent.appendChild(jobAttribute);
-	}
-
-	private void appendMinMax(Object min, Object max, Document doc, Element child) {
-		if (min != null) {
-			Element e = doc.createElement(MIN);
-			e.setTextContent(min.toString());
-			child.appendChild(e);
-		}
-		if (max != null) {
-			Element e = doc.createElement(MAX);
-			e.setTextContent(max.toString());
-			child.appendChild(e);
-		}
-	}
-
-	private void appendQsubFlag(String name, Document doc, Element parent) {
-		String flag = flags.getProperty(name);
-		Element e = doc.createElement(FLAG);
-		e.setTextContent(flag);
-		parent.appendChild(e);
-	}
-
-	private void appendTooltip(String tooltip, Document doc, Element parent) throws IllegalValueException {
-		Element e = doc.createElement(TOOLTIP);
-		e.setTextContent(tooltip);
-		parent.appendChild(e);
-	}
-
-	private void clearAll() {
-		if (definitions == null)
-			definitions = new TreeMap<String, IAttributeDefinition<?, ?, ?>>();
-		else
-			definitions.clear();
-		if (flags == null)
-			flags = new Properties();
-		else
-			flags.clear();
-		if (tooltips == null)
-			tooltips = new Properties();
-		else
-			tooltips.clear();
-		if (constrained == null)
-			constrained = new HashMap<String, String[]>();
-		else
-			constrained.clear();
-		if (minSet == null)
-			minSet = new HashMap<String, String>();
-		else
-			minSet.clear();
-	}
-
-	private Element getSingletonElement(Element element, String name) {
-		NodeList nodelist = element.getElementsByTagName(name);
-		if (nodelist != null) {
-			Node node = nodelist.item(0);
-			if (node != null)
-				if (node.getNodeType() == Node.ELEMENT_NODE)
-					return (Element) node;
-		}
-		return null;
-	}
-
-	private void handleAttributeDefinition(String name, Element child) throws ParseException, IllegalValueException {
-		String description = null;
-		Element e = getSingletonElement(child, DESCRIPTION);
-		if (e != null)
-			description = e.getTextContent().trim();
-		String id = child.getAttribute(ID);
-		String type = child.getAttribute(TYPE);
-		String displayStr = child.getAttribute(DISPLAY);
-		boolean display = displayStr == null ? false : Boolean.valueOf(displayStr).booleanValue();
-
-		String defaultValue = null;
-		e = getSingletonElement(child, DEFAULT);
-		if (e != null)
-			defaultValue = e.getTextContent();
-
-		if (BOOLEAN.equals(type))
-			handleBooleanAttribute(id, name, display, description, defaultValue);
-		else if (STRING.equals(type))
-			handleStringAttribute(id, name, display, description, defaultValue);
-		else if (CHOICE.equals(type)) {
-			e = getSingletonElement((Element) child.getParentNode(), CHOICE);
-			if (e != null)
-				constrained.put(name, e.getTextContent().split(CM));
-			handleStringAttribute(id, name, display, description, defaultValue);
-		} else {
-			String min = null;
-			String max = null;
-			e = getSingletonElement(child, MIN);
-			if (e != null)
-				min = e.getTextContent().trim();
-			e = getSingletonElement(child, MAX);
-			if (e != null)
-				max = e.getTextContent().trim();
-
-			if (DATE.equals(type)) {
-				String format = null;
-				e = getSingletonElement(child, FORMAT);
-				if (e != null)
-					format = e.getTextContent().trim();
-				handleDateAttribute(id, name, display, description, defaultValue, format, min, max);
-			} else if (DOUBLE.equals(type))
-				handleDoubleAttribute(id, name, display, description, defaultValue, min, max);
-			else if (INTEGER.equals(type))
-				handleIntegerAttribute(id, name, display, description, defaultValue, min, max);
-		}
-	}
-
-	private void handleBooleanAttribute(String id2, String name2, boolean display, String description2, String defaultValue) {
-		boolean dval = defaultValue == null ? false : Boolean.valueOf(defaultValue).booleanValue();
-		definitions.put(name2, new BooleanAttributeDefinition(id2, name2, description2, display, dval));
-	}
-
-	private void handleDateAttribute(String id2, String name2, boolean display, String description2, String defaultValue,
-			String format2, String min2, String max2) throws ParseException, IllegalValueException {
-		DateFormat df = DateFormat.getPatternInstance(format2);
-		Date dval = defaultValue == null ? null : df.parse(defaultValue);
-		Date min = min2 == null ? null : df.parse(min2);
-		Date max = max2 == null ? null : df.parse(max2);
-		if (min != null && max != null) {
-			if (dval == null)
-				dval = min;
-			definitions.put(name2, new DateAttributeDefinition(id2, name2, description2, display, dval, df, min, max));
-		} else
-			definitions.put(name2, new DateAttributeDefinition(id2, name2, description2, display, dval, df));
-	}
-
-	private void handleDoubleAttribute(String id2, String name2, boolean display, String description2, String defaultValue,
-			String min2, String max2) throws IllegalValueException {
-		Double dval = defaultValue == null ? null : new Double(defaultValue);
-		Double min = min2 == null ? null : new Double(min2);
-		Double max = max2 == null ? null : new Double(max2);
-		if (min != null) {
-			if (max == null)
-				max = Double.MAX_VALUE;
-		} else if (max != null)
-			if (min == null)
-				max = Double.MIN_VALUE;
-		if (min != null && max != null) {
-			if (dval == null)
-				dval = min;
-			definitions.put(name2, new DoubleAttributeDefinition(id2, name2, description2, display, dval, min, max));
-		} else
-			definitions.put(name2, new DoubleAttributeDefinition(id2, name2, description2, display, dval));
-	}
-
-	private void handleIntegerAttribute(String id2, String name2, boolean display, String description2, String defaultValue,
-			String min2, String max2) throws IllegalValueException {
-		Integer dval = defaultValue == null ? null : new Integer(defaultValue);
-		Integer min = min2 == null ? null : new Integer(min2);
-		Integer max = max2 == null ? null : new Integer(max2);
-		if (min != null) {
-			if (max == null)
-				max = Integer.MAX_VALUE;
-		} else if (max != null)
-			if (min == null)
-				max = Integer.MIN_VALUE;
-		if (min != null && max != null) {
-			if (dval == null)
-				dval = min;
-			definitions.put(name2, new IntegerAttributeDefinition(id2, name2, description2, display, dval, min, max));
-		} else
-			definitions.put(name2, new IntegerAttributeDefinition(id2, name2, description2, display, dval));
-	}
-
-	private void handleJobAttributeDefinitionElement(Element element) throws ParseException, IllegalValueException {
-		String name = element.getAttribute(NAME);
-		String isMinSet = element.getAttribute(MINSET);
-		if (TRUE.equals(isMinSet))
-			minSet.put(name, null);
-		Element child = getSingletonElement(element, TOOLTIP);
-		if (child != null)
-			try {
-				handleTooltip(name, child);
-			} catch (IllegalValueException ive) {
-				return;
-			}
-		child = getSingletonElement(element, DEFINITION);
-		if (child != null)
-			handleAttributeDefinition(name, child);
-		child = getSingletonElement(element, FLAG);
-		if (child != null)
-			handleQsubFlag(name, child);
-
-	}
-
-	private void handleQsubFlag(String name, Element child) {
-		flags.put(name, child.getTextContent());
-	}
-
-	private void handleStringAttribute(String id2, String name2, boolean display, String description2, String defaultValue) {
-		definitions.put(name2, new StringAttributeDefinition(id2, name2, description2, display, defaultValue));
-	}
-
-	private void handleTooltip(String name, Element child) throws IllegalValueException {
-		if (TAG_INTERNAL.equals(child.getTextContent()))
-			throw new IllegalValueException(TAG_INTERNAL);
-		tooltips.put(name, child.getTextContent());
-	}
-
-	private void parseDocument(Document doc) throws ParseException, IllegalValueException {
-		NodeList attributeDefinitions = doc.getElementsByTagName(ATTRIBUTE);
-		for (int i = 0; i < attributeDefinitions.getLength(); i++) {
-			Node node = attributeDefinitions.item(i);
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				Element e = (Element) node;
-				handleJobAttributeDefinitionElement(e);
-			}
-		}
-	}
-
-	private void serialize(Document doc, OutputStream out) throws Exception {
-		TransformerFactory tfactory = TransformerFactory.newInstance();
-		Transformer serializer;
-		try {
-			serializer = tfactory.newTransformer();
-			// Setup indenting to "pretty print"
-			serializer.setOutputProperty(OutputKeys.INDENT, YES);
-			serializer.setOutputProperty(INDENTATION, INDENT_SPACES);
-			serializer.transform(new DOMSource(doc), new StreamResult(out));
-		} catch (TransformerException e) {
-			// this is fatal, just dump the stack and throw a runtime exception
-			e.printStackTrace();
-			throw new RuntimeException(e);
-		}
-	}
-
-	private void setCommonAttributes(String id, String type, boolean display, Element child) {
-		child.setAttribute(ID, id);
-		child.setAttribute(TYPE, type);
-		child.setAttribute(DISPLAY, ZEROSTR + display);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/Messages.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/Messages.java
deleted file mode 100644
index ffdda16..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/Messages.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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
- *	Albert L. Rossi (NCSA) - Updated attributes (bug 310189)
- * 				 			Updated attributes 04/30/2010
- * 						    Updated attributes 05/11/2010
- *    Benjamin Lindner (ben@benlabs.net) - Attribute Definitions and Mapping (bug 316671)
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * NLS definitions for attributes.
- * 
- * @author arossi
- */
-public class Messages extends NLS {
-	public static String PBSProxyRuntimeClient_0;
-	public static String PBSProxyRuntimeClient_1;
-	public static String PBSProxyRuntimeClient_2;
-	public static String PBSProxyRuntimeClient_3;
-	public static String PBSProxyRuntimeClient_4;
-	public static String PBSProxyRuntimeClient_5;
-	public static String PBSProxyRuntimeClient_6;
-	public static String PBSProxyRuntimeClient_7;
-	public static String PBSAttributeNotFound;
-	public static String PBSBatchScriptTemplate_parseError;
-	public static String PBSBatchScriptTemplateManager_zerostringError;
-	public static String PBSBatchScriptTemplateManager_removeError;
-	public static String PBSBatchScriptTemplateManager_illegalArgument;
-	public static String PBSBatchScriptTemplateManager_storeError;
-	public static String PBSResourceManagerConfiguration_PBSResourceManager;
-
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.pbs.core.messages.messages"; //$NON-NLS-1$
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-		// Prevent instances.
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/messages.properties b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/messages.properties
deleted file mode 100644
index 6a6c8e3..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/messages/messages.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-PBSProxyRuntimeClient_0=Initializing remote services
-PBSProxyRuntimeClient_1=Could not find remote servers ID: {0}
-PBSProxyRuntimeClient_2=No such connection: {0}
-PBSProxyRuntimeClient_3=Opening session
-PBSProxyRuntimeClient_4=Creating session
-PBSProxyRuntimeClient_5=Launching server
-PBSProxyRuntimeClient_6=Starting runtime system
-PBSProxyRuntimeClient_7=Failed to start proxy: {0}
-
-PBSAttributeNotFound=could not find attribute definition for 
-
-PBSBatchScriptTemplate_parseError=: does not parse
-
-PBSBatchScriptTemplateManager_zerostringError=Template is an empty string.
-PBSBatchScriptTemplateManager_removeError=: is protected and cannot be removed
-PBSBatchScriptTemplateManager_illegalArgument=Please provide a non-empty string as name
-PBSBatchScriptTemplateManager_storeError=: is for read-only purposes and cannot be modified; please create a modifiable template from the full template
-PBSResourceManagerConfiguration_PBSResourceManager=PBS Resource Manager
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManager.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManager.java
deleted file mode 100644
index 3d40e6f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManager.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.rmsystem;
-
-import org.eclipse.ptp.rm.pbs.core.templates.PBSBatchScriptTemplateManager;
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerConfiguration;
-import org.eclipse.ptp.rtsystem.AbstractRuntimeResourceManager;
-import org.eclipse.ptp.rtsystem.AbstractRuntimeResourceManagerControl;
-import org.eclipse.ptp.rtsystem.AbstractRuntimeResourceManagerMonitor;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-
-public class PBSResourceManager extends AbstractRuntimeResourceManager {
-	private PBSBatchScriptTemplateManager fTemplateManager = null;
-
-	/**
-	 * @since 5.0
-	 */
-	public PBSResourceManager(AbstractResourceManagerConfiguration config, AbstractRuntimeResourceManagerControl control,
-			AbstractRuntimeResourceManagerMonitor monitor) {
-		super(config, control, monitor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rtsystem.AbstractRuntimeResourceManager#getRuntimeSystem
-	 * ()
-	 */
-	@Override
-	public IRuntimeSystem getRuntimeSystem() {
-		return super.getRuntimeSystem();
-	}
-
-	/**
-	 * @since 5.0
-	 */
-	public PBSBatchScriptTemplateManager getTemplateManager() {
-		if (fTemplateManager == null) {
-			try {
-				fTemplateManager = new PBSBatchScriptTemplateManager(this);
-			} catch (Throwable e) {
-				e.printStackTrace();
-			}
-		}
-		return fTemplateManager;
-	}
-
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerConfiguration.java
deleted file mode 100644
index 4f4b609..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerConfiguration.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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 
- *     Albert L. Rossi (NCSA) - full implementation (bug 310188)
- *     						  - modifications to store template and memento
- *     							(05/11/2010)
- *                            - modifications to use new interface methods and
- *                              constants (09/14/2010)
- *******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.rmsystem;
-
-import org.eclipse.ptp.rm.core.rmsystem.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.core.messages.Messages;
-import org.eclipse.ptp.services.core.IServiceProvider;
-
-/**
- * Service provider for PBS batch scheduler.
- */
-public class PBSResourceManagerConfiguration extends AbstractRemoteResourceManagerConfiguration implements IPBSNonNLSConstants {
-
-	public PBSResourceManagerConfiguration(String namespace, IServiceProvider provider) {
-		super(namespace, provider);
-		setDescription(Messages.PBSResourceManagerConfiguration_PBSResourceManager);
-	}
-
-	/**
-	 * @since 5.0
-	 */
-	public void addTemplate(String name, String serialized) {
-		addTemplateName(name);
-		putString(TEMPLATE_PREFIX + name, serialized);
-	}
-
-	/**
-	 * @return name of the current template for this resource manager (set in
-	 *         the edit wizard).
-	 * @since 5.0
-	 */
-	public String getCurrentTemplateName() {
-		return getString(getResourceManagerId() + CURR_TEMPLATE, ZEROSTR);
-	}
-
-	/**
-	 * @since 5.0
-	 */
-	public String getProxyConfiguration() {
-		return getString(PROXY_CONFIG_TYPE, ZEROSTR);
-	}
-
-	/**
-	 * @since 5.0
-	 */
-	public String getTemplate(String name) {
-		return getString(TEMPLATE_PREFIX + name, null);
-	}
-
-	/**
-	 * @since 5.0
-	 */
-	public String[] getTemplateNames() {
-		String nameList = getString(TEMPLATE_NAMES, null);
-		if (nameList == null) {
-			return new String[0];
-		}
-		return nameList.split(CM);
-	}
-
-	/**
-	 * @since 5.0
-	 */
-	public String getValidAttributeSet() {
-		return getString(ATTRIBUTES, null);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.services.core.IServiceProvider#isConfigured()
-	 */
-	@Override
-	public boolean isConfigured() {
-		return true;
-	}
-
-	/**
-	 * @since 5.0
-	 */
-	public void removeTemplate(String name) {
-		putString(TEMPLATE_PREFIX + name, null);
-		String nameList = getString(TEMPLATE_NAMES, null);
-		if (nameList != null) {
-			String[] names = nameList.split(CM);
-			for (int i = 0; i < names.length; i++) {
-				if (names[i].equals(name)) {
-					names[i] = null;
-					break;
-				}
-			}
-			StringBuffer sb = new StringBuffer();
-			if (names.length > 0) {
-				if (names[0] != null) {
-					sb.append(names[0]);
-				}
-				for (int i = 1; i < names.length; i++) {
-					if (names[i] != null) {
-						sb.append(CM).append(names[i]);
-					}
-				}
-			}
-			putString(TEMPLATE_NAMES, sb.toString());
-		}
-	}
-
-	/**
-	 * @since 5.0
-	 */
-	public void removeValidAttributeSet() {
-		putString(ATTRIBUTES, null);
-	}
-
-	/**
-	 * @param name
-	 *            of the current template for this resource manager (set in the
-	 *            edit wizard).
-	 * @since 5.0
-	 */
-	public void setCurrentTemplateName(String name) {
-		putString(getResourceManagerId() + CURR_TEMPLATE, name);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.IResourceManagerConfiguration#setDefaultNameAndDesc
-	 * ()
-	 */
-	public void setDefaultNameAndDesc() {
-		String name = PBS;
-		String conn = getConnectionName();
-		if (conn != null && !conn.equals(ZEROSTR)) {
-			name += MARKER + conn;
-		}
-		setName(name);
-		setDescription(Messages.PBSResourceManagerConfiguration_PBSResourceManager);
-	}
-
-	/**
-	 * @since 5.0
-	 */
-	public void setProxyConfiguration(String type) {
-		putString(PROXY_CONFIG_TYPE, type);
-	}
-
-	/**
-	 * @since 5.0
-	 */
-	public void setValidAttributeSet(String serialized) {
-		putString(ATTRIBUTES, serialized);
-	}
-
-	private void addTemplateName(String name) {
-		String nameList = getString(TEMPLATE_NAMES, null);
-		if (nameList == null) {
-			putString(TEMPLATE_NAMES, name);
-			return;
-		}
-
-		String[] names = nameList.split(CM);
-		for (String nm : names) {
-			if (name.equals(nm)) {
-				return;
-			}
-		}
-		putString(TEMPLATE_NAMES, nameList + CM + name);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerControl.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerControl.java
deleted file mode 100644
index 1de2860..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerControl.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.rmsystem;
-
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolResourceManagerControl;
-
-/**
- * @since 5.0
- */
-public class PBSResourceManagerControl extends AbstractToolResourceManagerControl {
-	public PBSResourceManagerControl(PBSResourceManagerConfiguration config) {
-		super(config);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerFactory.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerFactory.java
deleted file mode 100644
index f317ca4..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerFactory.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.rmsystem;
-
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManager;
-import org.eclipse.ptp.rmsystem.IResourceManagerComponentConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerControl;
-import org.eclipse.ptp.rmsystem.IResourceManagerMonitor;
-import org.eclipse.ptp.services.core.IServiceProvider;
-
-/**
- * @since 5.0
- */
-public class PBSResourceManagerFactory extends AbstractResourceManagerFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#create(org.eclipse
-	 * .ptp.rmsystem.IResourceManagerConfiguration,
-	 * org.eclipse.ptp.rmsystem.IResourceManagerControl,
-	 * org.eclipse.ptp.rmsystem.IResourceManagerMonitor)
-	 */
-	@Override
-	public IResourceManager create(IResourceManagerConfiguration configuration, IResourceManagerControl control,
-			IResourceManagerMonitor monitor) {
-		// TODO Auto-generated method stub
-		return new PBSResourceManager((PBSResourceManagerConfiguration) configuration, (PBSResourceManagerControl) control,
-				(PBSResourceManagerMonitor) monitor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#createConfiguration
-	 * (org.eclipse.ptp.services.core.IServiceProvider)
-	 */
-	@Override
-	public IResourceManagerConfiguration createConfiguration(IServiceProvider provider) {
-		return new PBSResourceManagerConfiguration(PBSResourceManagerConfiguration.BASE, provider);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#createControl
-	 * (org.eclipse.ptp.rmsystem.IResourceManagerComponentConfiguration)
-	 */
-	@Override
-	public IResourceManagerControl createControl(IResourceManagerComponentConfiguration configuration) {
-		// TODO Auto-generated method stub
-		return new PBSResourceManagerControl((PBSResourceManagerConfiguration) configuration);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#
-	 * createControlConfiguration
-	 * (org.eclipse.ptp.services.core.IServiceProvider)
-	 */
-	@Override
-	public IResourceManagerComponentConfiguration createControlConfiguration(IServiceProvider provider) {
-		return new PBSResourceManagerConfiguration(PBSResourceManagerConfiguration.BASE, provider);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#createMonitor
-	 * (org.eclipse.ptp.rmsystem.IResourceManagerComponentConfiguration)
-	 */
-	@Override
-	public IResourceManagerMonitor createMonitor(IResourceManagerComponentConfiguration configuration) {
-		// TODO Auto-generated method stub
-		return new PBSResourceManagerMonitor((PBSResourceManagerConfiguration) configuration);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#
-	 * createMonitorConfiguration
-	 * (org.eclipse.ptp.services.core.IServiceProvider)
-	 */
-	@Override
-	public IResourceManagerComponentConfiguration createMonitorConfiguration(IServiceProvider provider) {
-		return new PBSResourceManagerConfiguration(PBSResourceManagerConfiguration.BASE, provider);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerMonitor.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerMonitor.java
deleted file mode 100644
index bad79e6..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rmsystem/PBSResourceManagerMonitor.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.rmsystem;
-
-import org.eclipse.ptp.rm.core.rmsystem.AbstractToolResourceManagerMonitor;
-
-/**
- * @since 5.0
- */
-public class PBSResourceManagerMonitor extends AbstractToolResourceManagerMonitor {
-	public PBSResourceManagerMonitor(PBSResourceManagerConfiguration config) {
-		super(config);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSProxyRuntimeClient.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSProxyRuntimeClient.java
deleted file mode 100644
index dc2feeb..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSProxyRuntimeClient.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.pbs.core.rtsystem;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ptp.core.PTPCorePlugin;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.IRemoteProxyOptions;
-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.core.server.RemoteServerManager;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractRemoteProxyRuntimeClient;
-import org.eclipse.ptp.rm.pbs.core.messages.Messages;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManagerConfiguration;
-import org.eclipse.ptp.rm.pbs.core.server.PBSProxyServerRunner;
-
-/**
- * @since 4.0
- */
-public class PBSProxyRuntimeClient extends AbstractRemoteProxyRuntimeClient {
-	private PBSProxyServerRunner fServerRunner = null;
-
-	public PBSProxyRuntimeClient(PBSResourceManagerConfiguration config, int baseModelId) {
-		super(config, baseModelId);
-	}
-
-	/**
-	 * Shut down remote proxy.
-	 * 
-	 * Calls shutdown() to stop the state machine, then sessionFinish() to close
-	 * down the connection.
-	 * 
-	 * @param monitor
-	 * @throws IOException
-	 */
-	@Override
-	public void shutdown() throws IOException {
-		super.shutdown();
-		synchronized (this) {
-			if (fServerRunner != null) {
-				fServerRunner.cancel();
-			}
-		}
-	}
-
-	/**
-	 * Start the remote connection.
-	 * 
-	 * @param monitor
-	 *            progress monitor
-	 * @throws IOException
-	 */
-	@Override
-	public void startup(IProgressMonitor monitor) throws IOException {
-		SubMonitor subMon = SubMonitor.convert(monitor, 15);
-
-		if (getDebugOptions().CLIENT_TRACING) {
-			System.out.println(toString()
-					+ " - firing up proxy, waiting for connection.  Please wait!  This can take a minute . . ."); //$NON-NLS-1$
-			System.out.println("PROXY_SERVER path = '" + getConfiguration().getName() + "'"); //$NON-NLS-1$  //$NON-NLS-2$
-		}
-
-		try {
-			subMon.subTask(Messages.PBSProxyRuntimeClient_0);
-
-			/*
-			 * This can fail if we are restarting the RM from saved information
-			 * and the saved remote services provider is no longer available...
-			 */
-			IRemoteServices remoteServices = PTPRemoteCorePlugin.getDefault().getRemoteServices(
-					getConfiguration().getRemoteServicesId(), subMon.newChild(3));
-			if (remoteServices == null) {
-				throw new IOException(NLS.bind(Messages.PBSProxyRuntimeClient_1, getConfiguration().getRemoteServicesId()));
-			}
-
-			subMon.worked(5);
-
-			if (getConfiguration().testOption(IRemoteProxyOptions.MANUAL_LAUNCH)) {
-				// TODO: implement manual launch
-			} else {
-				IRemoteConnectionManager connMgr = remoteServices.getConnectionManager();
-				IRemoteConnection conn = connMgr.getConnection(getConfiguration().getConnectionName());
-				if (conn == null) {
-					throw new IOException(NLS.bind(Messages.PBSProxyRuntimeClient_2, getConfiguration().getConnectionName()));
-				}
-
-				subMon.subTask(Messages.PBSProxyRuntimeClient_3);
-
-				if (!conn.isOpen()) {
-					conn.open(subMon.newChild(4));
-				}
-				if (monitor.isCanceled()) {
-					return;
-				}
-
-				subMon.subTask(Messages.PBSProxyRuntimeClient_4);
-
-				sessionCreate();
-
-				subMon.worked(1);
-
-				String args = ""; //$NON-NLS-1$
-
-				if (getConfiguration().testOption(IRemoteProxyOptions.PORT_FORWARDING)) {
-					int remotePort;
-					try {
-						remotePort = conn.forwardRemotePort("localhost", getSessionPort(), subMon.newChild(1)); //$NON-NLS-1$
-					} catch (RemoteConnectionException e) {
-						throw new IOException(e.getMessage());
-					}
-					if (subMon.isCanceled()) {
-						sessionFinish();
-						return;
-					}
-					args = "--host=localhost --port=" + remotePort; //$NON-NLS-1$
-				} else {
-					args = "--host=" + getConfiguration().getLocalAddress(); //$NON-NLS-1$
-					args += " --port=" + getSessionPort(); //$NON-NLS-1$
-				}
-
-				if (getDebugOptions().SERVER_DEBUG_LEVEL > 0) {
-					// args += " --debug=" + getDebugOptions().SERVER_DEBUG_LEVEL; //$NON-NLS-1$
-				}
-
-				if (getDebugOptions().CLIENT_TRACING) {
-					System.out.println("Server args: " + args.toString()); //$NON-NLS-1$
-				}
-
-				subMon.subTask(Messages.PBSProxyRuntimeClient_5);
-
-				PBSProxyServerRunner runner = (PBSProxyServerRunner) RemoteServerManager.getServer(PBSProxyServerRunner.SERVER_ID,
-						conn);
-				runner.setVariable("payload_args", args); //$NON-NLS-1$
-				runner.setVariable("javaargs", getConfiguration().getInvocationOptionsStr()); //$NON-NLS-1$
-				runner.setWorkDir(new Path(conn.getWorkingDirectory()).append(".eclipsesettings").toString()); //$NON-NLS-1$
-				runner.startServer(subMon);
-
-				synchronized (this) {
-					fServerRunner = runner;
-				}
-
-				subMon.worked(2);
-			}
-
-			subMon.subTask(Messages.PBSProxyRuntimeClient_6);
-			super.startup();
-			subMon.worked(2);
-
-		} catch (IOException e) {
-			try {
-				sessionFinish();
-			} catch (IOException e1) {
-				PTPCorePlugin.log(e1);
-			}
-			throw new IOException(NLS.bind(Messages.PBSProxyRuntimeClient_7, e.getMessage()));
-		} catch (RemoteConnectionException e) {
-			try {
-				sessionFinish();
-			} catch (IOException e1) {
-				PTPCorePlugin.log(e1);
-			}
-			throw new IOException(NLS.bind(Messages.PBSProxyRuntimeClient_7, e.getMessage()));
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-			synchronized (this) {
-				fServerRunner = null;
-			}
-		}
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystem.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystem.java
deleted file mode 100644
index 5d9e646..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystem.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.pbs.core.rtsystem;
-
-import 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.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.rm.core.rtsystem.AbstractRemoteProxyRuntimeSystem;
-import org.eclipse.ptp.rm.pbs.core.Activator;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManager;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManagerConfiguration;
-import org.eclipse.ptp.rm.pbs.core.templates.PBSBatchScriptTemplate;
-
-/**
- * @since 4.0
- */
-public class PBSRuntimeSystem extends AbstractRemoteProxyRuntimeSystem {
-	private final PBSResourceManager fRM;
-
-	/**
-	 * @since 5.0
-	 */
-	public PBSRuntimeSystem(PBSResourceManager rm, PBSProxyRuntimeClient proxy) {
-		super(proxy);
-		fRM = rm;
-	}
-
-	/**
-	 * Sends only the realized script as attribute.<br>
-	 */
-	@Override
-	public List<IAttribute<?, ?, ?>> getAttributes(ILaunchConfiguration configuration, String mode) throws CoreException {
-		List<IAttribute<?, ?, ?>> attrs = super.getAttributes(configuration, mode);
-
-		PBSResourceManagerConfiguration rmConfig = (PBSResourceManagerConfiguration) fRM.getConfiguration();
-		String current = rmConfig.getCurrentTemplateName();
-		PBSBatchScriptTemplate template = fRM.getTemplateManager().loadTemplate(current, configuration);
-		try {
-			template.configure();
-			attrs.add(template.createScriptAttribute());
-		} catch (Throwable t) {
-			IStatus status = new Status(Status.ERROR, Activator.getUniqueIdentifier(), IPBSNonNLSConstants.GET_ATTRIBUTES, t);
-			throw new CoreException(status);
-		}
-		System.out.println(attrs);
-		return attrs;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystemFactory.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystemFactory.java
deleted file mode 100644
index 976b568..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/rtsystem/PBSRuntimeSystemFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.rtsystem;
-
-import org.eclipse.ptp.core.elements.IPResourceManager;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManager;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManager;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-import org.eclipse.ptp.rtsystem.IRuntimeSystemFactory;
-
-public class PBSRuntimeSystemFactory implements IRuntimeSystemFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rtsystem.IRuntimeSystemFactory#create(org.eclipse.ptp
-	 * .rmsystem.IResourceManager)
-	 */
-	public IRuntimeSystem create(IResourceManager rm) {
-		IPResourceManager prm = (IPResourceManager) rm.getAdapter(IPResourceManager.class);
-		int baseId = 0;
-		try {
-			baseId = Integer.parseInt(prm.getID());
-		} catch (NumberFormatException e) {
-			// Ignore
-		}
-		PBSProxyRuntimeClient runtimeProxy = new PBSProxyRuntimeClient((PBSResourceManagerConfiguration) rm.getConfiguration(),
-				baseId);
-		return new PBSRuntimeSystem((PBSResourceManager) rm, runtimeProxy);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/IPBSAttributeToTemplateConverter.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/IPBSAttributeToTemplateConverter.java
deleted file mode 100644
index 7c2cc3a..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/IPBSAttributeToTemplateConverter.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - original API
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.templates;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.rm.pbs.core.attributes.IPBSJobAttributeData;
-
-/**
- * Layer between the valid attribute definition access/storage and the creation
- * of the batch script template used to build the UI widgets.
- * 
- * @since 5.0
- */
-public interface IPBSAttributeToTemplateConverter {
-
-	String generateFullBatchScriptTemplate() throws Throwable;
-
-	String generateMinBatchScriptTemplate() throws Throwable;
-
-	IPBSJobAttributeData getData();
-
-	void initialize() throws Throwable;
-
-	void setAttributeDefinitions(IAttributeDefinition<?, ?, ?>[] defs);
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSAttributeToTemplateConverterFactory.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSAttributeToTemplateConverterFactory.java
deleted file mode 100644
index 80fab85..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSAttributeToTemplateConverterFactory.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - original API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.templates;
-
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManagerConfiguration;
-
-/**
- * @since 5.0
- */
-public class PBSAttributeToTemplateConverterFactory implements IPBSNonNLSConstants {
-
-	public static IPBSAttributeToTemplateConverter getConverter(PBSResourceManagerConfiguration config) {
-		PBSXMLAttributeToTemplateConverter pbsConverter = new PBSXMLAttributeToTemplateConverter();
-		pbsConverter.setResourcePath(config.getProxyConfiguration());
-		return pbsConverter;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBaseAttributeToTemplateConverter.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBaseAttributeToTemplateConverter.java
deleted file mode 100644
index 70d1b7c..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBaseAttributeToTemplateConverter.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.templates;
-
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.core.attributes.IPBSJobAttributeData;
-
-/**
- * Provides the method for taking attribute definitions and qsub flags and
- * turning them into the full base template.
- * 
- * @author arossi
- * @since 5.0
- * 
- */
-public abstract class PBSBaseAttributeToTemplateConverter implements IPBSAttributeToTemplateConverter, IPBSNonNLSConstants {
-
-	private static class AttributeNameSorter<T> implements Comparator<String> {
-		public int compare(String s1, String s2) {
-			if (TAG_QUEUE.equals(s1))
-				return -1;
-			if (TAG_QUEUE.equals(s2))
-				return 1;
-			return s1.compareTo(s2);
-		}
-	}
-
-	private static final String[] HEADER = { "#!/bin/bash", //$NON-NLS-1$
-			ZEROSTR, "#####################################################################", //$NON-NLS-1$
-			"## Template for PBS Batch Script Generated by PBS Resource Manager",//$NON-NLS-1$
-			"## ",//$NON-NLS-1$
-			"## This template contains all the Job Attributes recognized as valid",//$NON-NLS-1$
-			"## by a given PBS proxy instance.",//$NON-NLS-1$
-			"## ",//$NON-NLS-1$
-			"## Placeholders (@NAME@) are included for the PBS Job Attribute ",//$NON-NLS-1$
-			"## names as specified by qsub, plus the following internal variables:",//$NON-NLS-1$
-			"##",//$NON-NLS-1$
-			"## - env                     : place for defining extra environment",//$NON-NLS-1$
-			"##                             variables (NB: should not be removed)",//$NON-NLS-1$
-			"## - prependedBash           : dynamically change arbitrary bash ",//$NON-NLS-1$
-			"##                             commands which should precede the ",//$NON-NLS-1$
-			"##                             execution of the main application code",//$NON-NLS-1$
-			"## - mpiCommand mpiOptions   : run under MPI",//$NON-NLS-1$
-			"## - executablePath progArgs : the actual application",//$NON-NLS-1$
-			"## - postpendedBash          : dynamically change arbitrary bash ",//$NON-NLS-1$
-			"##                             commands which should follow the ",//$NON-NLS-1$
-			"##                             execution of the main application code",//$NON-NLS-1$
-			"##",//$NON-NLS-1$
-			"## A template can also directly contain arbitrary shell scripting (not ",//$NON-NLS-1$
-			"## to be replaced via the 'prepended' and 'postpended' placeholders);",//$NON-NLS-1$
-			"## these lines will remain fixed and will not be exposed through",//$NON-NLS-1$
-			"## the Launch Tab for modification (they can however be altered by ",//$NON-NLS-1$
-			"## using the Resource Manager Properties \"Edit\" Tab).",//$NON-NLS-1$
-			"##",//$NON-NLS-1$
-			"## NOTE: We advise removing either the ncpus or the nodes resource,",//$NON-NLS-1$
-			"##       depending on the PBS configuration (nodes is more common);",//$NON-NLS-1$
-			"##       otherwise, the correct value must be set on both redundantly",//$NON-NLS-1$
-			"##       in order for the MPI computation to be correct (and ",//$NON-NLS-1$
-			"##       some systems might reject a script with both set).",//$NON-NLS-1$
-			"#####################################################################"//$NON-NLS-1$
-	};
-
-	private static final String[] FOOTER = { ENV_PLACEHOLDER, PRECMD_PLACEHOLDER, CHGDIR_CMD,
-			MPICMD_PLACEHOLDER + SP + MPIOPT_PLACEHOLDER + SP + EXECMD_PLACEHOLDER + SP + PRARGS_PLACEHOLDER, PSTCMD_PLACEHOLDER };
-
-	private static AttributeNameSorter<String> sorter = new AttributeNameSorter<String>();
-
-	protected IPBSJobAttributeData data;
-	protected IAttributeDefinition<?, ?, ?>[] defs;
-
-	public String generateFullBatchScriptTemplate() throws Throwable {
-		return generateBaseTemplate(false);
-	}
-
-	public String generateMinBatchScriptTemplate() throws Throwable {
-		return generateBaseTemplate(true);
-	}
-
-	public IPBSJobAttributeData getData() {
-		return data;
-	}
-
-	public void initialize() throws Throwable {
-		initializeInternal();
-		addInternalDefinitions();
-	}
-
-	public void setAttributeDefinitions(IAttributeDefinition<?, ?, ?>[] defs) {
-		this.defs = defs;
-	}
-
-	protected abstract void initializeInternal() throws Throwable;
-
-	/*
-	 * Non-standard attribute definitions used for internal processing of the
-	 * batch template.
-	 */
-	private void addInternalDefinitions() throws Throwable {
-		Map<String, IAttributeDefinition<?, ?, ?>> definitions = data.getAttributeDefinitionMap();
-		Properties ttips = data.getToolTips();
-		if (definitions == null || ttips == null)
-			return;
-		definitions.put(TAG_MPIOPT, new StringAttributeDefinition(TAG_MPIOPT, TAG_MPIOPT, ZEROSTR, true, MPIOPT_DEFAULT));
-		ttips.setProperty(TAG_MPIOPT, TAG_INTERNAL);
-		definitions.put(TAG_SCRIPT, new StringAttributeDefinition(TAG_SCRIPT, TAG_SCRIPT, ZEROSTR, true, null));
-		ttips.setProperty(TAG_SCRIPT, TAG_INTERNAL);
-		definitions.put(TAG_MPICMD, new StringAttributeDefinition(TAG_MPICMD, TAG_MPICMD, ZEROSTR, true, MPICMD_DEFAULT));
-		ttips.setProperty(TAG_MPICMD, TAG_INTERNAL);
-		definitions.put(TAG_PRECMD, new StringAttributeDefinition(TAG_PRECMD, TAG_PRECMD, ZEROSTR, true, null));
-		ttips.setProperty(TAG_PRECMD, TAG_INTERNAL);
-		definitions.put(TAG_PSTCMD, new StringAttributeDefinition(TAG_PSTCMD, TAG_PSTCMD, ZEROSTR, true, null));
-		ttips.setProperty(TAG_PSTCMD, TAG_INTERNAL);
-	}
-
-	/*
-	 * Composes the flag translations into the space between the header and
-	 * footer of the template file.
-	 * 
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rm.pbs.ui.IPBSAttributeToTemplateConverter#
-	 * generateFullBatchScriptTemplate()
-	 */
-	private String generateBaseTemplate(boolean minimal) throws Throwable {
-		Properties flags = data.getPBSQsubFlags();
-		if (flags == null)
-			return null;
-
-		Map<String, String> minSet = data.getMinSet();
-
-		String[] sorted = flags.keySet().toArray(new String[0]);
-		Arrays.sort(sorted, sorter);
-
-		StringBuffer template = new StringBuffer();
-
-		for (int i = 0; i < HEADER.length; i++)
-			template.append(HEADER[i]).append(REMOTE_LINE_SEP);
-
-		for (int i = 0; i < sorted.length; i++)
-			if (!minimal || minSet.containsKey(sorted[i])) {
-				String flag = flags.getProperty(sorted[i]);
-				template.append(PBSDIRECTIVE).append(flag).append(MARKER).append(sorted[i]).append(MARKER).append(REMOTE_LINE_SEP);
-			}
-
-		for (int i = 0; i < FOOTER.length; i++)
-			template.append(FOOTER[i]).append(REMOTE_LINE_SEP);
-
-		return template.toString();
-	}
-
-	public static Comparator<String> getSorter() {
-		return sorter;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBatchScriptTemplate.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBatchScriptTemplate.java
deleted file mode 100644
index 22e71d5..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBatchScriptTemplate.java
+++ /dev/null
@@ -1,627 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- *                    This is the second version of this data structure
- *                    (05/11/2010)
- *                    Third revision. (09/14/2010) -- removed Ben's changes,
- *                    added use of the new converter class.
- ******************************************************************************/
-
-/*******************************************************************************
- * Copyright (c) 2010 The University of Tennessee,
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Benjamin Lindner (ben@benlabs.net) - Attribute Definitions and Mapping (bug 316671)
-
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.pbs.core.templates;
-
-import java.io.BufferedReader;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.attributes.BooleanAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.rm.pbs.core.ConfigUtils;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.core.attributes.AttributePlaceholder;
-import org.eclipse.ptp.rm.pbs.core.messages.Messages;
-
-/**
- * Encapsulates the template used to generate a full (realized) PBS script. <br>
- * 
- * The object is populated by reading in a template file; if a launch
- * configuration is also provided, attribute values that are in the
- * configuration are set.<br>
- * 
- * Configuration can take place through:
- * 
- * @see org.eclipse.ptp.rm.pbs.ui.managers.PBSBatchScriptTemplateManager
- * 
- * @author arossi
- * @since 5.0
- * 
- */
-public class PBSBatchScriptTemplate implements IPBSNonNLSConstants {
-	public static final int BUFFER_SIZE = 16 * 1024;
-
-	private ILaunchConfiguration configuration;
-	private final Map<String, AttributePlaceholder> internalAttributes;
-	private String name;
-	private final Map<String, AttributePlaceholder> pbsJobAttributes;
-	private final StringBuffer text;
-	private final IPBSAttributeToTemplateConverter converter;
-
-	public PBSBatchScriptTemplate(IPBSAttributeToTemplateConverter converter) {
-		this.converter = converter;
-		pbsJobAttributes = new HashMap<String, AttributePlaceholder>();
-		internalAttributes = new TreeMap<String, AttributePlaceholder>();
-		text = new StringBuffer();
-	}
-
-	/**
-	 * Potentially sets the values on existing attribute placeholders from the
-	 * stored values in the configuration.
-	 * 
-	 * @throws CoreException
-	 * @throws IllegalValueException
-	 */
-	public void configure() throws CoreException, IllegalValueException {
-		for (Iterator<AttributePlaceholder> i = pbsJobAttributes.values().iterator(); i.hasNext();)
-			maybeSetValue(i.next());
-		for (Iterator<AttributePlaceholder> i = internalAttributes.values().iterator(); i.hasNext();)
-			maybeSetValue(i.next());
-	}
-
-	/**
-	 * Creates the script (with escaped whitespace and line-breaks) and packs it
-	 * into an attribute.
-	 * 
-	 * @return
-	 * @throws Throwable
-	 */
-	public IAttribute<?, ?, ?> createScriptAttribute() throws Throwable {
-		Map<String, IAttributeDefinition<?, ?, ?>> defs = converter.getData().getAttributeDefinitionMap();
-		IAttributeDefinition<?, ?, ?> def = defs.get(TAG_SCRIPT);
-		IAttribute<?, ?, ?> attr = def.create();
-		String value = denormalize(realize());
-		attr.setValueAsString(value);
-		return attr;
-	}
-
-	public ILaunchConfiguration getConfiguration() {
-		return configuration;
-	}
-
-	public IPBSAttributeToTemplateConverter getConverter() {
-		return converter;
-	}
-
-	public Map<String, AttributePlaceholder> getInternalAttributes() {
-		return internalAttributes;
-	}
-
-	public AttributePlaceholder getMpiCommand() {
-		return internalAttributes.get(TAG_MPICMD);
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public Map<String, AttributePlaceholder> getPbsJobAttributes() {
-		return pbsJobAttributes;
-	}
-
-	public AttributePlaceholder getPostpendedBashCommands() {
-		return internalAttributes.get(TAG_PSTCMD);
-	}
-
-	public AttributePlaceholder getPrependedBashCommands() {
-		return internalAttributes.get(TAG_PRECMD);
-	}
-
-	public String getText() {
-		return text.toString();
-	}
-
-	/**
-	 * Reads in the template and parses it line by line, creating placeholder
-	 * objects for all the <code>@placeholder@</code> strings in the template.
-	 * 
-	 * @param input
-	 *            stream for reading the template
-	 * @throws Throwable
-	 */
-	public void load(InputStream input) throws Throwable {
-		clearAll();
-		Map<String, IAttributeDefinition<?, ?, ?>> defs = converter.getData().getAttributeDefinitionMap();
-		if (defs == null)
-			return;
-		BufferedReader br = null;
-		String line = null;
-		AttributePlaceholder ap = null;
-		boolean processedExecLine = false;
-		String separator = LINE_SEP;
-		try {
-			br = new BufferedReader(new InputStreamReader(input), BUFFER_SIZE);
-			while (true) {
-				ap = null;
-				try {
-					line = br.readLine();
-				} catch (EOFException eof) {
-					break;
-				}
-				if (line == null)
-					break;
-				text.append(line).append(separator);
-				if (line.startsWith(PBSDIRECTIVE) && line.indexOf(MARKER) >= 0) {
-					ap = handlePBSJobAttribute(line, defs);
-					if (ap != null) {
-						pbsJobAttributes.put(ap.getName(), ap);
-						continue;
-					}
-				} else if (line.startsWith(PD))
-					continue;
-
-				if (processedExecLine) {
-					ap = handleInternalPlaceholder(line, PSTCMD_PLACEHOLDER, defs);
-					if (ap != null)
-						internalAttributes.put(TAG_PSTCMD, ap);
-					continue;
-				}
-				ap = handleInternalPlaceholder(line, PRECMD_PLACEHOLDER, defs);
-				if (ap != null) {
-					internalAttributes.put(TAG_PRECMD, ap);
-					continue;
-				}
-				ap = handleInternalPlaceholder(line, MPICMD_PLACEHOLDER, defs);
-				if (ap != null)
-					internalAttributes.put(TAG_MPICMD, ap);
-				ap = handleInternalPlaceholder(line, MPIOPT_PLACEHOLDER, defs);
-				if (ap != null)
-					internalAttributes.put(TAG_MPIOPT, ap);
-				if (line.contains(EXECMD_PLACEHOLDER))
-					processedExecLine = true;
-			}
-			if (configuration != null)
-				configure();
-		} finally {
-			if (br != null)
-				try {
-					br.close();
-				} catch (IOException ignore) {
-				}
-		}
-	}
-
-	/**
-	 * Takes the original template and substitutes the attribute values for the
-	 * <code>@placeholder@</code> strings, or eliminates them (or the entire PBS
-	 * directive line in the case of Job Attributes) if their value is empty.
-	 * 
-	 * @return the script with all placeholders replaced
-	 * @throws CoreException
-	 */
-	public String realize() throws CoreException {
-		String template = text.toString();
-
-		if (configuration != null) {
-			template = captureEnvironment(template);
-			template = maybeReplaceChdir(template);
-			template = maybeReplaceExec(template);
-			template = maybeReplaceArgs(template);
-		}
-
-		for (Iterator<AttributePlaceholder> i = pbsJobAttributes.values().iterator(); i.hasNext();) {
-			AttributePlaceholder ap = i.next();
-			String name = ap.getName();
-			if (TAG_EXPORT_ENV.equals(name)) {
-				if ((Boolean) ap.getAttribute().getValue())
-					template = replaceWithValue(name, ZEROSTR, template);
-				else
-					template = removeLine(name, template);
-				continue;
-			}
-			String value = ap.getAttribute().getValueAsString();
-			if (ZEROSTR.equals(value))
-				template = removeLine(name, template);
-			else
-				template = replaceWithValue(name, value, template);
-		}
-
-		for (Iterator<AttributePlaceholder> i = internalAttributes.values().iterator(); i.hasNext();) {
-			AttributePlaceholder ap = i.next();
-			String name = ap.getName();
-			String value = ap.getAttribute().getValueAsString();
-			if (ZEROSTR.equals(value))
-				template = removePlaceholder(name, template);
-			else
-				template = replaceWithValue(name, value, template);
-		}
-
-		return template;
-	}
-
-	/**
-	 * Writes the current attribute values to the passed in launch
-	 * configuration. Also updates the internal configuration object by
-	 * replacing it with the parameter.
-	 * 
-	 * @param config
-	 *            to which to save the values.
-	 */
-	public void saveValues(ILaunchConfigurationWorkingCopy config) {
-		for (Iterator<AttributePlaceholder> i = pbsJobAttributes.values().iterator(); i.hasNext();) {
-			AttributePlaceholder ap = i.next();
-			IAttribute<?, ?, ?> attr = ap.getAttribute();
-			if (attr == null)
-				continue;
-			String id = attr.getDefinition().getId();
-			Object value = attr.getValue();
-			if (value instanceof Boolean)
-				config.setAttribute(id, (Boolean) value);
-			else if (value instanceof Integer)
-				config.setAttribute(id, (Integer) value);
-			else if (value instanceof String)
-				config.setAttribute(id, (String) value);
-		}
-
-		for (Iterator<AttributePlaceholder> i = internalAttributes.values().iterator(); i.hasNext();) {
-			AttributePlaceholder ap = i.next();
-			IAttribute<?, ?, ?> attr = ap.getAttribute();
-			if (attr == null)
-				continue;
-			String id = attr.getDefinition().getId();
-			Object value = attr.getValue();
-			if (value instanceof Boolean)
-				config.setAttribute(id, (Boolean) value);
-			else if (value instanceof Integer)
-				config.setAttribute(id, (Integer) value);
-			else if (value instanceof String)
-				config.setAttribute(id, (String) value);
-		}
-		configuration = config;
-	}
-
-	public void setConfiguration(ILaunchConfiguration configuration) {
-		this.configuration = configuration;
-	}
-
-	/**
-	 * Adds the MPI command attribute and determines the value of the "-n"
-	 * argument (<code>@mpiOptions@</code>).
-	 * 
-	 * @param command
-	 *            which MPI command to use
-	 * @param selected
-	 *            map of current attribute choices
-	 * @throws Throwable
-	 */
-	public void setMPIAttributes(String command) throws Throwable {
-		AttributePlaceholder mpiExec = internalAttributes.get(TAG_MPICMD);
-		AttributePlaceholder mpiOpt = internalAttributes.get(TAG_MPIOPT);
-		Map<String, IAttributeDefinition<?, ?, ?>> defs = converter.getData().getAttributeDefinitionMap();
-
-		if (mpiExec == null) {
-			mpiExec = ConfigUtils.getAttributePlaceholder(TAG_MPICMD, ZEROSTR, TAG_INTERNAL, defs);
-			if (mpiExec != null)
-				internalAttributes.put(TAG_MPICMD, mpiExec);
-		}
-
-		if (mpiExec != null)
-			mpiExec.getAttribute().setValueAsString(command);
-
-		if (mpiOpt == null) {
-			mpiOpt = ConfigUtils.getAttributePlaceholder(TAG_MPIOPT, ZEROSTR, TAG_INTERNAL, defs);
-			if (mpiOpt != null)
-				internalAttributes.put(TAG_MPIOPT, mpiOpt);
-		}
-
-		String cores = null;
-		if (ZEROSTR.equals(command))
-			cores = ZEROSTR;
-		else {
-			AttributePlaceholder ap = pbsJobAttributes.get(TAG_NCPUS);
-			if (ap != null)
-				cores = ap.getAttribute().getValueAsString();
-			else {
-				ap = pbsJobAttributes.get(TAG_NODES);
-				if (ap != null)
-					cores = computeMPICoresFromNodesString(ap.getAttribute().getValueAsString());
-			}
-			cores = MPICORES_FLAG + SP + cores;
-		}
-
-		if (mpiOpt != null)
-			mpiOpt.getAttribute().setValueAsString(cores);
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/*
-	 * Adds additional environment variables set by the user. These are added as
-	 * export commands to the bash script.
-	 */
-	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private String captureEnvironment(String template) throws CoreException {
-		Map vars = configuration.getAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, (Map) null);
-		if (vars == null || vars.isEmpty())
-			template = removeLine(TAG_ENV, template);
-		else {
-			StringBuffer sb = new StringBuffer();
-			for (Iterator<Entry> i = vars.entrySet().iterator(); i.hasNext();) {
-				Entry entry = i.next();
-				sb.append(TAG_EXPORT).append(SP).append(entry.getKey()).append(EQ).append(entry.getValue()).append(LINE_SEP);
-			}
-			template = replaceWithValue(TAG_ENV, sb.toString(), template);
-		}
-		return template;
-	}
-
-	/*
-	 * For potential re-use.
-	 */
-	private void clearAll() {
-		pbsJobAttributes.clear();
-		internalAttributes.clear();
-		text.setLength(0);
-	}
-
-	/*
-	 * Creates the internal attribute placeholder, setting its tooltip to the
-	 * internal tag.
-	 */
-	private AttributePlaceholder handleInternalPlaceholder(String line, String marker,
-			Map<String, IAttributeDefinition<?, ?, ?>> defs) throws IllegalValueException {
-		AttributePlaceholder ap = internalAttributes.get(marker);
-		if (ap != null)
-			return null;
-		if (line.contains(marker)) {
-			String name = marker.substring(1, marker.length() - 1);
-			ap = ConfigUtils.getAttributePlaceholder(name, ZEROSTR, TAG_INTERNAL, defs);
-		}
-		return ap;
-	}
-
-	/*
-	 * Creates the pbs job attribute placeholder. Sets tooltip for eventual
-	 * display (on the name label).
-	 */
-	private AttributePlaceholder handlePBSJobAttribute(String line, Map<String, IAttributeDefinition<?, ?, ?>> defs)
-			throws Throwable {
-		String name = extractPBSAttributeName(line);
-		Properties tooltips = converter.getData().getToolTips();
-		return ConfigUtils.getAttributePlaceholder(name, ZEROSTR, tooltips.getProperty(name), defs);
-	}
-
-	/*
-	 * Specific routine for handling <code>@progArgs@</code>, the program
-	 * arguments.
-	 */
-	private String maybeReplaceArgs(String template) throws CoreException {
-		if (configuration == null)
-			return template;
-
-		String args = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_ARGUMENTS, ZEROSTR);
-
-		if (ZEROSTR.equals(args))
-			return removePlaceholder(TAG_PRARGS, template);
-		return replaceWithValue(TAG_PRARGS, args, template);
-	}
-
-	/*
-	 * Specific routine for handling <code>@directory@</code>, the working
-	 * directory.
-	 */
-	private String maybeReplaceChdir(String template) throws CoreException {
-		if (configuration == null)
-			return template;
-		String wdir = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_WORKING_DIR, ZEROSTR);
-
-		// do what the launch manager does
-		if (ZEROSTR.equals(wdir)) {
-			String exec = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH, ZEROSTR);
-			if (!ZEROSTR.equals(exec))
-				// TODO: not platform independent - needs IRemotePath
-				wdir = new Path(exec).removeLastSegments(1).toString();
-		}
-
-		if (ZEROSTR.equals(wdir))
-			return removeLine(TAG_CHGDIR, template);
-		return replaceWithValue(TAG_CHGDIR, wdir, template);
-	}
-
-	/*
-	 * Specific routine for handling <code>@executablePath@</code>, the full
-	 * path to the executable.
-	 */
-	private String maybeReplaceExec(String template) throws CoreException {
-		if (configuration == null)
-			return template;
-		String value = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH, ZEROSTR);
-		if (ZEROSTR.equals(value))
-			return removePlaceholder(TAG_EXECMD, template);
-		return replaceWithValue(TAG_EXECMD, value, template);
-	}
-
-	/*
-	 * General purpose routine for setting the value on the placeholder from the
-	 * passed in configuration. Currently accepts only three types: Boolean,
-	 * Integer and String.
-	 */
-	private void maybeSetValue(AttributePlaceholder ap) throws CoreException, IllegalValueException {
-		if (configuration == null || ap == null)
-			return;
-		IAttribute<?, ?, ?> attr = ap.getAttribute();
-		if (attr == null)
-			return;
-		String id = attr.getDefinition().getId();
-		Object value = null;
-		if (attr instanceof StringAttribute) {
-			value = configuration.getAttribute(id, ap.getDefaultString());
-			if (ZEROSTR.equals(value))
-				value = null;
-		} else if (attr instanceof BooleanAttribute)
-			value = configuration.getAttribute(id, new Boolean(ap.getDefaultString()));
-		else if (attr instanceof IntegerAttribute)
-			value = configuration.getAttribute(id, new Integer(ap.getDefaultString()));
-		if (value != null)
-			attr.setValueAsString(value.toString());
-	}
-
-	/*
-	 * Eliminates the entire line on which an empty attribute placeholder
-	 * occurs.
-	 */
-	private String removeLine(String name, String script) {
-		StringBuffer p = new StringBuffer();
-		p.append(LINE_SEP).append(END_MARKER).append(name).append(END_MARKER).append(LINE_SEP);
-		Matcher m = Pattern.compile(p.toString()).matcher(script);
-		if (m.find())
-			return m.replaceAll(LINE_SEP);
-		return script;
-	}
-
-	/*
-	 * Eliminates an empty attribute placeholder.
-	 */
-	private String removePlaceholder(String name, String script) {
-		name = MARKER + name + MARKER + SP;
-		Matcher m = Pattern.compile(name).matcher(script);
-		if (m.find())
-			return m.replaceAll(ZEROSTR);
-		name = name.trim();
-		m = Pattern.compile(name).matcher(script);
-		if (m.find())
-			return m.replaceAll(ZEROSTR);
-		return script;
-	}
-
-	/*
-	 * Replaces attribute placeholder with the given value.
-	 */
-	private String replaceWithValue(String name, String value, String script) {
-		Matcher m = Pattern.compile(MARKER + name + MARKER).matcher(script);
-		if (m.find()) {
-			value = value.replaceAll(BKESC, BKBKESC); // \ -> \\
-			value = value.replaceAll(DLESC, DLESCESC); // $ -> \$
-			return m.replaceAll(value);
-		}
-		return script;
-	}
-
-	/*
-	 * Computes the total MPI nodes by parsing the node_specification string.
-	 * 
-	 * Sample request:
-	 * 
-	 * nodes=2:blue:ppn=2+red:ppn=3.
-	 * 
-	 * PBS allows the default for nodes (the number at the beginning of the
-	 * spec) and ppn to be 1.
-	 * 
-	 * Note: the current approach may not be entirely correct and may need
-	 * modification ...
-	 */
-	private static String computeMPICoresFromNodesString(String value) {
-		int cores = 0;
-		try {
-			String[] nodeSpec = value.split(TAG_NDSEP);
-			for (int i = 0; i < nodeSpec.length; i++) {
-				int nodes = 1;
-				int ppn = 1;
-				String[] part = nodeSpec[i].split(CO);
-				for (int j = 0; j < part.length; j++) {
-					try {
-						nodes = Integer.parseInt(part[j]);
-					} catch (NumberFormatException nfe) {
-					}
-					if (part[j].startsWith(TAG_PPN)) {
-						String[] ppnDef = part[j].split(EQ);
-						if (ppnDef.length > 1)
-							ppn = Integer.parseInt(ppnDef[1]);
-					}
-				}
-				cores += (nodes * ppn);
-			}
-		} catch (Throwable t) {
-			t.printStackTrace();
-		}
-
-		return ZEROSTR + cores;
-	}
-
-	/*
-	 * Escaping to conform with the parsing of the proxy protocol.
-	 */
-	private static String denormalize(String content) {
-		content = content.replaceAll(BKESC, BKBKESC);
-		content = content.replaceAll(LINE_SEP, LNSEPESC);
-		content = content.replaceAll(TBESC, TBESCESC);
-		content = content.replaceAll(SP, SPESC);
-		return content;
-	}
-
-	/*
-	 * Finds the PBS Job Attribute name from a line containing the corresponding
-	 * placeholder.
-	 */
-	private static String extractPBSAttributeName(String line) throws ParseException {
-		StringBuffer name = new StringBuffer();
-		boolean firstAt = false;
-		boolean lastAt = false;
-		for (int i = 0; i < line.length(); i++) {
-			char c = line.charAt(i);
-			switch (c) {
-			case '@':
-				if (firstAt)
-					lastAt = true;
-				firstAt = true;
-				break;
-			default:
-				if (firstAt)
-					name.append(c);
-			}
-			if (lastAt)
-				break;
-		}
-
-		if ((!firstAt && !lastAt) || (firstAt && lastAt))
-			return name.toString();
-		throw new ParseException(line + Messages.PBSBatchScriptTemplate_parseError, 0);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBatchScriptTemplateManager.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBatchScriptTemplateManager.java
deleted file mode 100644
index 782237d..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSBatchScriptTemplateManager.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - implementation
- *  				- reworked 05/11/2010
- *                  - version 5.0: now writes to the resourceManager config
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.templates;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.rm.pbs.core.ConfigUtils;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.core.messages.Messages;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManager;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManagerConfiguration;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-
-/**
- * Controls the selection and configuration of batch script templates.
- * 
- * @see org.eclipse.ptp.rm.pbs.core.templates.PBSBatchScriptTemplate
- * 
- * @author arossi
- * @since 5.0
- * 
- */
-public class PBSBatchScriptTemplateManager implements IPBSNonNLSConstants {
-
-	private PBSBatchScriptTemplate current;
-
-	private final PBSResourceManager resourceManager;
-	private final IPBSAttributeToTemplateConverter converter;
-
-	public PBSBatchScriptTemplateManager(PBSResourceManager rm) throws Throwable {
-		this.resourceManager = rm;
-		this.converter = PBSAttributeToTemplateConverterFactory.getConverter(getRMConfig());
-		configureConverter();
-	}
-
-	public void addImportedTemplate(final File imported) throws Throwable {
-		String name = imported.getName();
-		name = validateTemplateNameForEdit(name);
-		String template = ConfigUtils.readFull(imported, PBSBatchScriptTemplate.BUFFER_SIZE);
-		if (ZEROSTR.equals(template)) {
-			throw new Throwable(Messages.PBSBatchScriptTemplateManager_zerostringError);
-		}
-		ByteArrayInputStream bais = new ByteArrayInputStream(template.getBytes());
-		new PBSBatchScriptTemplate(converter).load(bais);
-		getRMConfig().addTemplate(name, template);
-	}
-
-	public void exportTemplate(final String dir, final String original, final String renamed) throws Throwable {
-		FileWriter fw = null;
-		try {
-			String validated = validateTemplateNameForEdit(renamed);
-			String template = getRMConfig().getTemplate(original);
-			if (ZEROSTR.equals(template)) {
-				throw new Throwable(Messages.PBSBatchScriptTemplateManager_zerostringError);
-			}
-			File export = new File(dir, validated);
-			fw = new FileWriter(export, false);
-			fw.write(template);
-			fw.flush();
-		} finally {
-			if (fw != null) {
-				try {
-					fw.close();
-				} catch (IOException t) {
-					t.printStackTrace();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Looks in the resource manager configuration for all
-	 * <code>_template</code> strings and loads their names.
-	 */
-	public String[] findAvailableTemplates() {
-		PBSResourceManagerConfiguration c = getRMConfig();
-		if (c == null) {
-			return new String[0];
-		}
-		return c.getTemplateNames();
-	}
-
-	public PBSBatchScriptTemplate getCurrent() {
-		return current;
-	}
-
-	/**
-	 * Either returns the name of the loaded template, or looks in the
-	 * configuration for the last stored one; if both are undefined, it returns
-	 * "base_template".
-	 * 
-	 * @return name
-	 */
-	public String getCurrentTemplateName() {
-		if (current != null) {
-			return current.getName();
-		}
-		PBSResourceManagerConfiguration c = getRMConfig();
-		if (c != null) {
-			return c.getCurrentTemplateName();
-		}
-		return FULL_TEMPLATE;
-	}
-
-	public PBSResourceManagerConfiguration getRMConfig() {
-		return (PBSResourceManagerConfiguration) resourceManager.getConfiguration();
-	}
-
-	/**
-	 * The is the full template, with all valid attributes mapped to qsub flags.
-	 * 
-	 * @throws Throwable
-	 */
-	public boolean handleBaseTemplates() throws Throwable {
-		PBSResourceManagerConfiguration c = getRMConfig();
-		if (!configureConverter()) {
-			return false;
-		}
-		String fullTemplate = converter.generateFullBatchScriptTemplate();
-		if (fullTemplate == null || ZEROSTR.equals(fullTemplate)) {
-			if (c != null) {
-				fullTemplate = c.getTemplate(FULL_TEMPLATE);
-			}
-			if (fullTemplate == null || ZEROSTR.equals(fullTemplate)) {
-				return false;
-			}
-			return true;
-		}
-		if (c != null) {
-			c.addTemplate(FULL_TEMPLATE, fullTemplate);
-			String minTemplate = converter.generateMinBatchScriptTemplate();
-			if (minTemplate != null && !ZEROSTR.equals(minTemplate)) {
-				c.addTemplate(MIN_TEMPLATE, minTemplate);
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Constructs a template and calls load using a stream from the serialized
-	 * string stored in the resource manager configuration corresponding to the
-	 * choice parameter. Sets the launch configuration before loading.
-	 * 
-	 * @param choice
-	 *            name of the template file
-	 * @param config
-	 *            current launch configuration
-	 * @return populated template object
-	 */
-	public PBSBatchScriptTemplate loadTemplate(String choice, ILaunchConfiguration config) {
-		PBSResourceManagerConfiguration c = getRMConfig();
-		if (c == null) {
-			return null;
-		}
-		PBSBatchScriptTemplate template = null;
-		if (choice == null || ConfigUtils.ZEROSTR.equals(choice)) {
-			choice = c.getCurrentTemplateName();
-		}
-		try {
-			String serialized = c.getTemplate(choice);
-			if (serialized == null) {
-				return null;
-			}
-			ByteArrayInputStream bais = new ByteArrayInputStream(serialized.getBytes());
-			template = new PBSBatchScriptTemplate(converter);
-			template.setConfiguration(config);
-			template.load(bais);
-			template.setName(choice);
-			if (config != null) {
-				c.setCurrentTemplateName(choice);
-				current = template;
-			}
-		} catch (Throwable t) {
-			t.printStackTrace();
-		}
-		return template;
-	}
-
-	/**
-	 * Checks first to make sure user is not attempting to remove the base
-	 * template.
-	 * 
-	 * @param name
-	 *            of template to remove
-	 * @throws IllegalAccessError
-	 */
-	public void removeTemplate(String name) throws IllegalAccessError {
-		if (name.equals(FULL_TEMPLATE) || name.equals(MIN_TEMPLATE)) {
-			throw new IllegalAccessError(name + Messages.PBSBatchScriptTemplateManager_removeError);
-		}
-		PBSResourceManagerConfiguration c = getRMConfig();
-		if (c != null) {
-			c.removeTemplate(name);
-		}
-	}
-
-	/**
-	 * Called after Edit action. Writes content to resource manager
-	 * configuration.
-	 * 
-	 * @param editedContent
-	 *            of current template
-	 * @param name
-	 *            to which to write contents
-	 */
-	public void storeTemplate(String editedContent, String name) {
-		validateTemplateNameForEdit(name);
-		PBSResourceManagerConfiguration c = getRMConfig();
-		if (c != null) {
-			c.addTemplate(name, editedContent);
-		}
-	}
-
-	/**
-	 * Checks to make sure user is not attempting to overwrite the base
-	 * template.
-	 * 
-	 * @param name
-	 *            for the template
-	 * @return the name if valid
-	 * @throws IllegalArgumentException
-	 * @throws IllegalAccessError
-	 */
-	public String validateTemplateNameForEdit(String name) throws IllegalArgumentException, IllegalAccessError {
-		if (name.length() == 0) {
-			throw new IllegalArgumentException(Messages.PBSBatchScriptTemplateManager_illegalArgument);
-		}
-		if (!name.endsWith(TEMPLATE_SUFFIX)) {
-			name = name + TEMPLATE_SUFFIX;
-		} else if (name.equals(FULL_TEMPLATE) || name.equals(MIN_TEMPLATE)) {
-			throw new IllegalAccessError(name + Messages.PBSBatchScriptTemplateManager_storeError);
-		}
-		return name;
-	}
-
-	/*
-	 * If we are offline, check for the last configuration of attributes for
-	 * this resource manager and use that.
-	 */
-	private boolean configureConverter() throws Throwable {
-		IAttributeDefinition<?, ?, ?>[] modelAttributes = getModelAttributeDefinitions();
-		if (modelAttributes == null) {
-			String stored = null;
-			PBSResourceManagerConfiguration c = getRMConfig();
-			if (c != null) {
-				stored = c.getValidAttributeSet();
-			}
-			if (stored == null) {
-				return false;
-			}
-			ByteArrayInputStream bais = new ByteArrayInputStream(stored.getBytes());
-			converter.getData().deserialize(bais);
-		} else {
-			converter.setAttributeDefinitions(modelAttributes);
-		}
-		converter.initialize();
-		storeValidAttributeSet(true);
-		return true;
-	}
-
-	private IAttributeDefinition<?, ?, ?>[] getModelAttributeDefinitions() {
-		IRuntimeSystem rts = resourceManager.getRuntimeSystem();
-		if (rts == null) {
-			return null;
-		}
-		IAttributeDefinition<?, ?, ?>[] defs = rts.getAttributeDefinitionManager().getAttributeDefinitions();
-
-		if (defs.length == 0) {
-			return null;
-		}
-		return defs;
-	}
-
-	/*
-	 * This is useful for avoiding having to read in the model definition or
-	 * contact the resource manager everytime we reload the manager.
-	 * 
-	 * @param force overwrite of current list. If <code>false</code> and the
-	 * list exists, this method simply returns.
-	 */
-	private void storeValidAttributeSet(boolean force) throws Throwable {
-		PBSResourceManagerConfiguration c = getRMConfig();
-		if (c == null) {
-			return;
-		}
-		if (!force && c.getValidAttributeSet() != null) {
-			return;
-		}
-		ByteArrayOutputStream baos = new ByteArrayOutputStream(16 * 1024);
-		converter.getData().serialize(baos);
-		c.setValidAttributeSet(baos.toString());
-	}
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSModelDefinitionAttributeToTemplateConverter.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSModelDefinitionAttributeToTemplateConverter.java
deleted file mode 100644
index 98d4b89..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSModelDefinitionAttributeToTemplateConverter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design; to be implemented in near future.
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.templates;
-
-import org.eclipse.ptp.rm.pbs.core.attributes.IPBSJobAttributeData;
-
-/**
- * Not yet implemented. When protocol changes are complete, will read full
- * attribute definition, flag and tooltip information form the model definition
- * events sent by the proxy.
- * 
- * @author arossi
- * @since 5.0
- * 
- */
-public class PBSModelDefinitionAttributeToTemplateConverter extends PBSBaseAttributeToTemplateConverter {
-	@Override
-	public IPBSJobAttributeData getData() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	protected void initializeInternal() throws Throwable {
-		// TODO Auto-generated method stub
-
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSXMLAttributeToTemplateConverter.java b/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSXMLAttributeToTemplateConverter.java
deleted file mode 100644
index 399fd76..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.core/src/org/eclipse/ptp/rm/pbs/core/templates/PBSXMLAttributeToTemplateConverter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- *                    a placeholder implementation which uses a
- *                    static plugin XML resource to create the definitions
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.core.templates;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.rm.pbs.core.Activator;
-import org.eclipse.ptp.rm.pbs.core.attributes.PBSXMLJobAttributeData;
-import org.osgi.framework.Bundle;
-
-/**
- * One-off implementation of the converter which uses an XML resource file in
- * this plugin to initialize the base template.
- * 
- * @author arossi
- * @since 5.0
- * 
- */
-public class PBSXMLAttributeToTemplateConverter extends PBSBaseAttributeToTemplateConverter {
-	protected String resourcePath;
-
-	public PBSXMLAttributeToTemplateConverter() {
-		data = new PBSXMLJobAttributeData();
-	}
-
-	public void setResourcePath(String resourcePath) {
-		this.resourcePath = resourcePath;
-	}
-
-	@Override
-	protected void initializeInternal() throws Throwable {
-		if (defs == null)
-			return;
-
-		URL url = null;
-		if (Activator.getDefault() != null) {
-			Bundle bundle = Activator.getDefault().getBundle();
-			url = FileLocator.find(bundle, new Path(DATA).append(resourcePath), null);
-		} else
-			url = new File(resourcePath).toURL();
-		if (url == null)
-			return;
-		InputStream s = null;
-		try {
-			s = url.openStream();
-			data.deserialize(s);
-		} finally {
-			try {
-				if (s != null)
-					s.close();
-			} catch (IOException e) {
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/.classpath b/rms/org.eclipse.ptp.rm.pbs.help/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/.project b/rms/org.eclipse.ptp.rm.pbs.help/.project
deleted file mode 100644
index 009459f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs.help</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.pbs.help/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f5d5b6f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Jun 04 13:02:26 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.pbs.help/META-INF/MANIFEST.MF
deleted file mode 100644
index 311e37d..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.pbs.help;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.pbs.help.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/about.html b/rms/org.eclipse.ptp.rm.pbs.help/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/build.properties b/rms/org.eclipse.ptp.rm.pbs.help/build.properties
deleted file mode 100644
index e8361be..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               html/,\
-               *.xml,\
-               plugin.properties,\
-               about.html
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/PBSHelpPage.html b/rms/org.eclipse.ptp.rm.pbs.help/html/PBSHelpPage.html
deleted file mode 100644
index 5c9a936..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/PBSHelpPage.html
+++ /dev/null
@@ -1,352 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>How to Run PBS Jobs in PTP</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-<body>
-	<h1>How to Run PBS Jobs in PTP</h1>
-	<h2>
-		<a name="Introduction"></a>Introduction
-	</h2>
-	<p>
-		The PBS Eclipse plug-in, part of the <a
-			href="PLUGINS_ROOT/org.eclipse.ptp.doc.user/html/toc.html">
-			Parallel Tools Platform</a> (PTP), allows you to launch and monitor
-		applications on local or remote PBS (Portable Batch System)
-		Distributed Resource Managers.<br>
-	</p>
-	<p>
-		The PBS Resource Managers use the new configurable (JAXB) framework.
-		(An in-detail explanation of the <a
-			href="PLUGINS_ROOT/org.eclipse.ptp.rm.jaxb.help/html/toc.html">JAXB
-			Model</a> can be found in the PTP Developer Guide.) What follows here is
-		a guide to the PBS-specific launch tabs. There are no special
-		requirements to run the PBS Resource Managers; consult <a
-			href="PLUGINS_ROOT/org.eclipse.ptp.doc.user/html/02resMgrSetup.html">Configuring
-			Resource Managers</a> for general information on resource-manager
-		requirements and set-up.
-	</p>
-	<h2 style="text-align: left;">
-		<a name="Preferences"></a>Preferences
-	</h2>
-	<p>There is currently only one preference option. Since the PBS
-		Resource Manager is configured from an XML definition file, the file
-		can be cached the first time you add the resource manager (this is the
-		default behavior), or you can set it to reread the file every time you
-		start the Resource Manager. This is useful if you are doing
-		customization (see below) and are configuring from a special XML file
-		you have imported into your workspace. This way, if you make changes,
-		they will automatically be picked up without having to reboot the
-		application or recreate the Resource Manager.
-	<p>
-		<br> <br>
-	<div style="margin-left: 40px;">
-		<img alt="Preferences" src="images/00Preferences.png"><br>
-	</div>
-	<br>
-	<br>
-	<ol>
-		<li>From the "Eclipse" menu, select "Preferences"</li>
-		<li>Open Parallel Tools / Resource Managers / Configurable
-			Resource Manager (JAXB)</li>
-		<li>Select "Always reload XML from URL" and click "Apply", then
-			"OK".</li>
-	</ol>
-	<h2 style="text-align: left;">
-		<a name="ProvidedTypes"></a>Preconfigured PBS Resource Manager Types
-	</h2>
-	<p>
-		PTP provides two generic PBS Resource Managers, one which is
-		configured for batch submissions to the scheduler (<i>PBS-Generic-Batch</i>),
-		and one for interactive PBS submissions using a pseudo-terminal (i.e.,
-		"qsub -I"; <i>PBS-Generic-Interactive</i>). The settings in these
-		configurations should work on most Torque systems and many PBS Pro
-		setups, though there may be differences in some of the attributes for
-		job submission which may have to be adjusted for depending on your
-		local system.
-	</p>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="PrefiguredTypes" src="images/01PrefiguredTypes.png"><br>
-	</div>
-	<br>
-	<br>
-	<p>
-		<b><i>For how to add, remove, start, stop and edit resource
-				managers, please refer to <a
-				href="PLUGINS_ROOT/org.eclipse.ptp.doc.user/html/02resMgrSetup.html">Configuring
-					Resource Managers</a> </i> </b>
-	</p>
-	<h2 style="text-align: left;">
-		<a name="BatchSubmission"></a>Submission Using the PBS Batch Resource
-		Manager
-	</h2>
-	<p>
-		When you select the <i>PBS-Generic-Batch</i> manager, the Run
-		Configuration will have a Resources Tab with three sub-tabs available
-		for use.
-	<p>
-	<ul>
-		<li><b>Basic PBS Settings</b>
-		</li>
-		<li><b>Advanced PBS Settings</b>
-		</li>
-		<li><b>Import PBS Script</b>
-		</li>
-	</ul>
-	<p>
-		Each of these is an "independent" environment in the sense that the
-		specific variables set on one are not necessarily included in the
-		others, even though their underlying values are shared across all
-		three tabs; <b><i>the tab from which you select "Run" is the
-				environment that applies to the job</i> </b>.
-	</p>
-	<p>Thus if you use the Advanced Tab and set Job_Name to "pbs1",
-		then switch to the Basic tab, you will see Job_Name set to "pbs1"
-		there as well; however, if you launch from Basic, only the variables
-		seen on the Basic tab will be included in the configuration and script
-		for the job; any of the variables on the Advanced Tab not on the Basic
-		Tab will revert to an undefined or default value.</p>
-
-	<h3 style="text-align: left;">
-		<a name="BasicTab"></a>Basic Settings
-	</h3>
-	<p>Below is a view of the Basic tab. Job_Name and Wallclock Time
-		are validated fields, meaning that values with a specific syntax must
-		be provided (there are defaults); an error message on the top left of
-		the screen will appear in red in case these are incorrect. Hovering
-		over the Name label will display a tooltip, if there is one for that
-		attribute.</p>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="BasicTab" src="images/02Basic.png"><br>
-	</div>
-	<br>
-	<br>
-	<p>At the left bottom of the tab there are three buttons, "View
-		Script", "View Configuration" and "Restore Defaults". The first allows
-		you to inspect what the batch script that is generated from the
-		filled-in values will look like:</p>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="Configuration" src="images/04Script.png"><br>
-	</div>
-	<br>
-	<br>
-	<p>Similarly, the second button can be used to see the full
-		configuration underlying this particular tab setting (this is the
-		"environment" for the resource manager, and is useful to check to make
-		sure the values you have set on the tab will be correctly reported to
-		the resource manager):</p>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="Configuration" src="images/03Configuration.png"><br>
-	</div>
-	<br>
-	<br>
-	<p>"Restore Defaults" sets the values of the variables visible in
-		this tab back to their defaults, if they have any. This is different
-		from the "Revert" button on the lower right, which reverts to the
-		previously saved changes. All changes should be saved using the
-		"Apply" button next to it.</p>
-	<h3 style="text-align: left;">
-		<a name="AdvancedTab"></a>Advanced Settings
-	</h3>
-	<p>The Advanced Tab exposes for configuration all the attributes
-		for job submission as defined in the XML. The viewer allows you to
-		select the ones that are applicable (only these will appear in the
-		configuration). The text box above the table/tree containing the
-		attribute list also displays a string of name=value defintions from
-		the table (here for viewing convenience only). The table has typed
-		values; it provides an appropriate editor (drop-down list,
-		numerical spinner, checkbox, etc.) to fill in the value according to
-		the value's type; doing "tab" after filling in the value effects the change.
-		The check box at the top left "Show Only Checked Items" allows you to
-		filter out unchecked items from the table list.</p>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="AdvancedTab" src="images/05AdvancedSettings.png"><br>
-	</div>
-	<br>
-	<br>
-	<h3 style="text-align: left;">
-		<a name="ImportTab"></a>Importing a Predefined Batch Script
-	</h3>
-	<p>If you wish to use a custom script that does more than just
-		launch the application selected from you local or remote workspace,
-		this tab is where you do it. The "Browse Workspace" button at the top
-		right takes you first to your current workspace, in case you have
-		imported a batch script there from either your local machine or a
-		remote host; however, you can usually navigate from there to other
-		directories in your local file system to search for a script.</p>
-	<p>The path of the selected script is displayed in the textbox to
-		the left of the browse button, and the contents of the script in the
-		large (scrolling) text area below. The script is not editable there;
-		to edit, you will need to import it like any other file into your
-		workspace. The selection can be cleared or cancelled using the "Clear
-		Script" button.</p>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="Imported" src="images/06Imported.png"><br>
-	</div>
-	<br>
-	<br>
-	<h4 style="text-align: left;">
-		<a name="OutputFiles"></a>Reading remote output and error files
-	</h4>
-
-	<p>The JAXB/PBS manager has the capability of allowing you to
-		stream in to the console the output and error files associated with a
-		batch job when the job has completed. This is done in XML definition
-		file for the Basic and Advanced tabs by creating a link from the PBS
-		batch attributes defining Output Path and Error Path to special
-		variables understood by the resource manager. If you set those
-		variables, the change will be conveyed through this linked variable.
-		If they are not set, the configuration provides a value corresponding
-		to the default location where PBS would put them.</p>
-	<p>
-		<b>NOTE: </b>If you are using the Import Script tab, the two paths
-		must be manually adjusted to correspond to whatever you have done
-		inside the script; the default definitions are provided, but these can
-		be adjusted as necessary. You can also turn off this feature for this
-		tab by unchecking the "Enable remote output file read" to the left of
-		the text box.
-	</p>
-	<p>If there are files associated with this job, and the job
-		completes, the "Get Job Error" and "Get Job Output" actions, activated
-		by clicking row for the job in the monitor job table, can be used to
-		issue a streaming command which will write the file contents to the
-		console. If the files do no exist, these actions will be disabled.</p>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="Actions" src="images/08Actions.png"><br>
-	</div>
-	<br>
-	<br>
-	<h2 style="text-align: left;">
-		<a name="InteractiveSubmission"></a>Submission Using the PBS
-		Interactive Resource Manager
-	</h2>
-	<p>The Interactive Resource Manager allows you to submit jobs
-		through a pseudo-terminal. This is done by issuing "qsub -I" (plus any
-		resource limits defined in the tab) upon the first launch, and waiting
-		for the interactive job to start. When the job turns from SUBMITTED to
-		RUNNING (this can be seen both from the reported state in monitor job
-		table views, as well as by the disappearance of the progress bars for
-		the submission), the job will then be streamed to the qsub terminal's
-		standard input, just as you would submit from a shell command-line.
-		Subsequent submissions will also be streamed to the same interactive
-		terminal process, for as long as it is running. If the time limit
-		expires, the next submission will resubmit the terminal request (qsub
-		-I).</p>
-	<br>
-	<p>The Launch Tab for this kind of job closely resembles the Basic
-		batch tab.</p>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="Imported" src="images/07Interactive.png"><br>
-	</div>
-	<br>
-	<br>
-	<p>The job output will go to the console when the job starts to
-		run, as seen here.</p>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="Output" src="images/09Output.png"><br>
-	</div>
-	<br>
-	<br>
-	<h2 style="text-align: left;">
-		<a name="Customizing"></a>Customizing the Configuration
-	</h2>
-	<br>
-	<br>
-	<p>The Resource Manager configuration for PBS can of course be
-		customized to suit the needs of the systems you habitually work with.
-		Of course, an understanding of the basic structure and content of the
-		XML definition is necessary for this, but often it may simply be a
-		question of changing a few of the provided attribute defaults or
-		definitions or a special command definition.</p>
-	<p>The way to provide a specialized XML configuration is by placing
-		it in a project named "resourceManagers" in your current workspace.
-		You can import a XML file into your workspace in three different ways:</p>
-	<br>
-	<ul>
-		<li><b>Using Import :: General :: File System</b> for files on
-			your local machine;<br>
-		</li>
-		<li><b>Using Import :: Remote Systems :: Remote file system</b>
-			for files on a remote machine;</li>
-		<li><b>Using Import :: Resource Managers :: Resource Manager
-				Definition from Plug-in</b> for the predefined definitions provided with
-			the PTP distribution.<br>
-		</li>
-	</ul>
-	<br>
-
-	<p>In the first two cases, you must have created the
-		"resourceManagers" project first; the third wizard asks you if you
-		wish to create one if one does not already exist. The following
-		illustrates the last kind of import.</p>
-	<ul>
-		<li>Open up your Remote C/C++ perspective containing your
-			workspace</li>
-		<li>Right click in the Project Explorer and then select "Import
-			:: Import..."</li>
-	</ul>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="Output1" src="images/10Import.png"><br>
-	</div>
-	<br>
-	<br>
-	<ul>
-		<li>Choose Resource Managers :: Resource Manager Definition from
-			Plug-in</li>
-	</ul>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="Output2" src="images/11Import.png"><br>
-	</div>
-	<br>
-	<br>
-	<ul>
-		<li>Select one of the configurations from the drop-down list, and
-			click "Finish".</li>
-	</ul>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="Output3" src="images/12Import.png"><br>
-	</div>
-	<br>
-	<br>
-	<p>The XML file will now appear in an editor in your workspace. The
-		XML editor which has been included in the PTP all-in-one download
-		("Eclipse IDE for Parallel Application Developers") does syntax
-		highlighting and also provides a design tree-view for examining its
-		structure.</p>
-	<br>
-	<br>
-	<div style="margin-left: 40px;">
-		<img alt="Output4" src="images/13Import.png"><br>
-	</div>
-	<br>
-	<br>
-	<hr>
-	<a href="toc.html">Back to Table of Contents</a>
-	</p>
-</body>
-</html>
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/help.css b/rms/org.eclipse.ptp.rm.pbs.help/html/help.css
deleted file mode 100644
index f34a23d..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/help.css
+++ /dev/null
@@ -1,51 +0,0 @@
-/* following font face declarations need to be removed for DBCS */
-
-
-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, sans-serif; color: #000000}
-pre				{ font-family: Courier, monospace}
-
-/* end font face declarations */
-
-/* following font size declarations should be OK for DBCS */
-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; }
-pre				{ font-size: 10pt}
-
-/* end font size declarations */
-
-body	     { background: #FFFFFF}
-h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	
-h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
-h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
-h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
-p 	     { font-size: 10pt; }
-pre	     { margin-left: 6; font-size: 9pt }
-
-a:link { color: #006699 }
-a:visited { color: #996699 }
-a:hover  { color: #006699 }
-
-ul	     { margin-top: 0; margin-bottom: 10 }
-li	     { margin-top: 0; margin-bottom: 0 } 
-li p	     { margin-top: 0; margin-bottom: 0 } 
-ol	     { margin-top: 0; margin-bottom: 10 }
-dl	     { margin-top: 0; margin-bottom: 10 }
-dt	     { margin-top: 0; margin-bottom: 0; font-weight: bold }
-dd	     { margin-top: 0; margin-bottom: 0 }
-strong	     { font-weight: bold}
-em	     { font-style: italic}
-var	     { font-style: italic}
-div.revision { border-left-style: solid; border-left-width: thin; 
-				   border-left-color: #7B68EE; padding-left:5 }
-th	     { font-weight: bold }
-
-/* Mike Behm's addition to the style sheet */
-.userinput { font-family: monospace; }
-.guitab, .important, .guibutton, .selectblue, .guimenu, .guilabel, 
-.notetitle  {
-     color: #000000;
-     font-family: helvetica, arial, sans-serif;
-     font-weight: bold;
-     }
-div.linux  {display:none;}
-.firsterm {font-style:italic;}
-
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/00Preferences.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/00Preferences.png
deleted file mode 100644
index f96094e..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/00Preferences.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/01PrefiguredTypes.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/01PrefiguredTypes.png
deleted file mode 100644
index b5a2ffc..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/01PrefiguredTypes.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/02Basic.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/02Basic.png
deleted file mode 100644
index 76aff07..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/02Basic.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/03Configuration.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/03Configuration.png
deleted file mode 100644
index dca8cd3..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/03Configuration.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/04Script.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/04Script.png
deleted file mode 100644
index 53a5a49..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/04Script.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/05AdvancedSettings.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/05AdvancedSettings.png
deleted file mode 100644
index 6a3a35f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/05AdvancedSettings.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/06Imported.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/06Imported.png
deleted file mode 100644
index ff6e90c..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/06Imported.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/07Interactive.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/07Interactive.png
deleted file mode 100644
index c4cbd02..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/07Interactive.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/08Actions.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/08Actions.png
deleted file mode 100644
index 8232ec6..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/08Actions.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/09Output.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/09Output.png
deleted file mode 100644
index 6c8e4f7..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/09Output.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/10Import.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/10Import.png
deleted file mode 100644
index 1c64b9f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/10Import.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/11Import.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/11Import.png
deleted file mode 100644
index 7743de9..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/11Import.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/12Import.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/12Import.png
deleted file mode 100644
index 8443db3..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/12Import.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/images/13Import.png b/rms/org.eclipse.ptp.rm.pbs.help/html/images/13Import.png
deleted file mode 100644
index 82001a0..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/images/13Import.png
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/html/toc.html b/rms/org.eclipse.ptp.rm.pbs.help/html/toc.html
deleted file mode 100644
index e3ffde4..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/html/toc.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Running PBS Applications</title>
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-<body>
-	<h1>PBS Resource Manager for PTP</h1>
-	<br> Release 4.0.
-	<br>
-	<h2>
-		Help Topics<br>
-	</h2>
-	<h1></h1>
-	<p>
-		The PBS Eclipse plug-in, part of the <a
-			href="PLUGINS_ROOT/org.eclipse.ptp.doc.user/html/toc.html">Parallel
-			Tools Platform</a> (PTP), allows you to run a parallel application using
-		the Portable Batch System (PBS) from within the PTP framework.
-	</p>
-	<h3>Table of Contents:</h3>
-	<ul>
-		<li><a href="PBSHelpPage.html#Introduction"><span
-				style="text-decoration: underline;">Introduction</span> </a></li>
-		<li><a href="PBSHelpPage.html#Preferences"><span
-				style="text-decoration: underline;">Preferences</span> </a></li>
-		<li><a href="PBSHelpPage.html#ProvidedTypes"><span
-				style="text-decoration: underline;">Preconfigured PBS Resource Manager Types</span> </a>
-		</li>
-		<li><a href="PBSHelpPage.html#BatchSubmission"><span
-				style="text-decoration: underline;">Submission Using the PBS Batch Resource Manager</span> </a></li>
-		<li><a href="PBSHelpPage.html#InteractiveSubmission"><span
-				style="text-decoration: underline;">Submission Using the PBS Interactive Resource Manager</span> </a></li>
-		<li><a href="PBSHelpPage.html#Customization"><span
-				style="text-decoration: underline;">Customizing the Configuration</span> </a></li>
-	</ul>
-</body>
-</html>
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/plugin.properties b/rms/org.eclipse.ptp.rm.pbs.help/plugin.properties
deleted file mode 100644
index 74bef50..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP PBS Resource Manager Help
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/plugin.xml b/rms/org.eclipse.ptp.rm.pbs.help/plugin.xml
deleted file mode 100644
index 185b42e..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/plugin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true">
-      </toc>
-   </extension>
-
-</plugin>
diff --git a/rms/org.eclipse.ptp.rm.pbs.help/src/org/eclipse/ptp/rm/pbs/help/Activator.java b/rms/org.eclipse.ptp.rm.pbs.help/src/org/eclipse/ptp/rm/pbs/help/Activator.java
deleted file mode 100644
index 35e3c99..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/src/org/eclipse/ptp/rm/pbs/help/Activator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.ptp.rm.pbs.help;
-
-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 = "org.eclipse.ptp.rm.pbs.help"; //$NON-NLS-1$
-
-	// 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/rms/org.eclipse.ptp.rm.pbs.help/toc.xml b/rms/org.eclipse.ptp.rm.pbs.help/toc.xml
deleted file mode 100644
index c8295dc..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.help/toc.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright (c) 2010 University of Illinois.                              -->
-<!-- All rights reserved. This program and the accompanying materials        -->
-<!-- are made available under the terms of the Eclipse Public License v1.0   -->
-<!-- which accompanies this distribution, and is available at                -->
-<!-- http://www.eclipse.org/legal/epl-v10.html                               -->
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Running PBS Jobs" link_to="../org.eclipse.ptp.doc.user/toc.xml#ptpPBS" topic="html/toc.html">
-      <topic href="html/toc.html" label="Contents"/> 
-      <topic label="Introduction" href="html/PBSHelpPage.html#Introduction"/>
-      <topic label="Preferences" href="html/PBSHelpPage.html#Preferences"/>
-      <topic label="Preconfigured PBS Resource Manager Types" href="html/PBSHelpPage.html#ProvidedTypes"/>
-      <topic label="Submission Using the PBS Batch Resource Manager" href="html/PBSHelpPage.html#BatchSubmission"/>
-      <topic label="Submission Using the PBS Interactive Resource Manager" href="html/PBSHelpPage.html#InteractiveSubmission"/>
-      <topic label="Customizing the Configuration" href="html/PBSHelpPage.html#Customizing"/>
-</toc>
-
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/.classpath b/rms/org.eclipse.ptp.rm.pbs.jproxy/.classpath
deleted file mode 100644
index 7156e6b..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/.classpath
+++ /dev/null
@@ -1,10 +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 combineaccessrules="false" kind="src" path="/org.eclipse.ptp.core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ptp.rm.proxy.core"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.ptp.proxy.protocol"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/.externalToolBuilders/ANT JAR Builder.launch b/rms/org.eclipse.ptp.rm.pbs.jproxy/.externalToolBuilders/ANT JAR Builder.launch
deleted file mode 100644
index 7e03e93..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/.externalToolBuilders/ANT JAR Builder.launch
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ptp.rm.pbs.jproxy"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ptp.rm.pbs.jproxy/build.xml}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.ptp.rm.pbs.jproxy}"/>
-</launchConfiguration>
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/.project b/rms/org.eclipse.ptp.rm.pbs.jproxy/.project
deleted file mode 100644
index 94149f2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs.jproxy</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>auto,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/ANT JAR Builder.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.pbs.jproxy/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index df084e6..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Thu Feb 18 17:41:04 EST 2010
-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.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/.settings/org.eclipse.ltk.core.refactoring.prefs b/rms/org.eclipse.ptp.rm.pbs.jproxy/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index ef0ecef..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Apr 16 15:51:16 EDT 2010
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.pbs.jproxy/META-INF/MANIFEST.MF
deleted file mode 100644
index 022247a..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.pbs.jproxy;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Localization: plugin
-Bundle-Vendor: %pluginProvider
-Require-Bundle: org.eclipse.ptp.core,
- org.eclipse.ptp.rm.proxy.core,
- org.eclipse.ptp.proxy.protocol
-Import-Package: com.ibm.icu.text
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Definitions-old.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Definitions-old.txt
deleted file mode 100644
index d35fb77..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Definitions-old.txt
+++ /dev/null
@@ -1,177 +0,0 @@
-###############################################################################
-# This is an attribute definition file for PBS Attributes
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-#
-# separator: "::"
-# 
-# attribute entry:
-# ID :: TYPE :: NAME :: DESCRIPTION :: DISPLAY :: DEFAULT :: CUSTOM FIELD1 :: CUSTOM FIELD 2 :: etc
-#
-# IDs have to be unique
-#
-# TYPE can be: string boolean integer double date
-# integer, double allow min max as custom fields
-# date requires a DATEFORMAT pattern as custom field 
-###############################################################################
-
-###############################################################################
-# PBS JOB ATTRIBUTES
-###############################################################################
-
-PBSJOB_ACCOUNT_NAME                 :: STRING :: Account_Name              :: Account to which to charge this job.                                                                                                                                           :: TRUE ::  
-PBSJOB_Checkpoint                   :: STRING :: Checkpoint                :: If supported by the server implementation and the host operating system, the checkpoint attribute determines when checkpointing will be performed by PBS on behalf of the job. :: TRUE ::  
-PBSJOB_depend                       :: STRING :: depend                    :: The type of inter-job dependencies specified by the job owner.                                                                                                                 :: TRUE ::  
-PBSJOB_destination                  :: STRING :: destination               :: Designation of the queue to which to submit the job.                                                                                                                           :: TRUE ::  
-PBSJOB_directive                    :: STRING :: directive                 :: Defines the prefix that declares a directive to the qsub command within the script file.                                                                                       :: TRUE ::  
-PBSJOB_export_all                   :: STRING :: export_all                :: Declares that all environment variables in the qsub command's environment are to be exported to the batch job.                                                                 :: TRUE ::  true
-PBSJOB_Error_Path                   :: STRING :: Error_Path                :: The final path name for the file containing the job's standard error stream.                                                                                                   :: TRUE ::  
-PBSJOB_Execution_Time               :: STRING :: Execution_Time            :: The time after which the job may execute.                                                                                                                                      :: TRUE ::  
-PBSJOB_group_list                   :: STRING :: group_list                :: A list of group_names@hosts which determines the group under which the job is run on a given host.                                                                             :: TRUE ::  
-PBSJOB_Hold_Types                   :: STRING :: Hold_Types                :: The set of holds currently applied to the job.                                                                                                                                 :: TRUE ::  
-PBSJOB_Job_Name                     :: STRING :: Job_Name                  :: The name assigned to the job by the qsub or qalter command.                                       :: TRUE ::  
-PBSJOB_Join_Path                    :: STRING :: Join_Path                 :: Merge stdout and stderr into stdout.                                                              :: TRUE ::  
-PBSJOB_Keep_Files                   :: STRING :: Keep_Files                :: Retain these streams on the execution host upon job termination.                                  :: TRUE ::  
-PBSJOB_Mail_Points                  :: STRING :: Mail_Points               :: Identifies at which state changes the server will send mail about the job.                        :: TRUE ::  
-PBSJOB_Mail_Users                   :: STRING :: Mail_Users                :: The set of users to whom mail may be sent when the job makes certain state changes.               :: TRUE ::  
-PBSJOB_Output_Path                  :: STRING :: Output_Path               :: The final path name for the file containing the job's standard output stream.                     :: TRUE ::  
-PBSJOB_Priority                     :: STRING :: Priority                  :: The job scheduling priority assigned by the user.                                                 :: TRUE ::  
-PBSJOB_Rerunnable                   :: STRING :: Rerunnable                :: The rerunnable flag assigned by the user.                                                         :: TRUE ::  false
-PBSJOB_Resource_List__arch          :: STRING :: Resource_List.arch        :: Specifies the administrator defined system architecture requried.                                 :: TRUE ::  
-PBSJOB_Resource_List__cput          :: STRING :: Resource_List.cput        :: Maximum amount of CPU time used by all processes in the job.                                      :: TRUE ::  
-PBSJOB_Resource_List__file          :: STRING :: Resource_List.file        :: The largest size of any single file that may be created by the job.                               :: TRUE ::  
-PBSJOB_Resource_List__host          :: STRING :: Resource_List.host        :: Name of host on which job should be run.                                                          :: TRUE ::  
-PBSJOB_Resource_List__mem           :: STRING :: Resource_List.mem         :: Maximum amount of memory used by all concurrent processes in the job.                             :: TRUE ::  
-PBSJOB_Resource_List__ncpus         :: STRING :: Resource_List.ncpus       :: Total number of cpus/cores to be allocated to the job.                                            :: TRUE ::  1
-PBSJOB_Resource_List__nice          :: STRING :: Resource_List.nice        :: The nice value under which the job is to be run.                                                  :: TRUE ::  0
-PBSJOB_Resource_List__nodes         :: STRING :: Resource_List.nodes       :: Number and/or type of nodes to be reserved for exclusive use by the job.                          :: TRUE ::  1
-PBSJOB_Resource_List__ompthreads    :: STRING :: Resource_List.ompthreads  :: Number of threads per processor for Open MP jobs.                                                 :: TRUE ::  1
-PBSJOB_Resource_List__pcput         :: STRING :: Resource_List.pcput       :: Maximum amount of CPU time used by any single process in the job.                                 :: TRUE ::  
-PBSJOB_Resource_List__pmem          :: STRING :: Resource_List.pmem        :: Maximum amount of physical memory (workingset) used by any single process of the job.             :: TRUE ::  
-PBSJOB_Resource_List__pvmem         :: STRING :: Resource_List.pvmem       :: Maximum amount of virtual memory used by any single process in the job.                           :: TRUE ::  
-PBSJOB_Resource_List__vmem          :: STRING :: Resource_List.vmem        :: Maximum amount of virtual memory used by all concurrent processes in the job.                     :: TRUE ::  
-PBSJOB_Resource_List__walltime      :: STRING :: Resource_List.walltime    :: Maximum amount of real time during which the job can be in the running state.                     :: TRUE ::  00:30:00 :: HH:MM:SS
-PBSJOB_Shell_Path_List              :: STRING ::  Shell_Path_List          :: A set of absolute paths of the program to process the job's script file.                          :: TRUE ::  
-PBSJOB_stagein                      :: STRING :: stagein                   :: The list of files to be staged in prior to job execution.                                         :: TRUE ::  
-PBSJOB_stageout                     :: STRING ::  stageout                 :: The list of files to be staged out after job execution.                                           :: TRUE ::  
-PBSJOB_User_List                    :: STRING :: User_List                 :: The list of user@hosts which determines the user name under which the job is run on a given host. :: TRUE ::  
-PBSJOB_Variable_List                :: STRING :: Variable_List             :: This is the list of environment variables passed with the Queue Job batch request.                :: TRUE ::  
-PBSJOB_mpiCores                     :: STRING :: mpiCores                  :: INTERNAL_EXTENSION                                                                                :: TRUE ::  0
-PBSJOB_template                     :: STRING :: template                  :: INTERNAL_EXTENSION                                                                                :: TRUE ::  
-PBSJOB_mpiCommand                   :: STRING :: mpiCommand                :: INTERNAL_EXTENSION                                                                                :: TRUE ::  mpiexec
-
-#nodeState :: STRING :: Node State :: :: TRUE :: 3
-#nodeNumber :: INTEGER :: Node Number :: :: TRUE :: 0
-#nodeStatus :: STRING :: Node Status :: :: TRUE :: 
-
-###############################################################################
-# PBS NODE ATTRIBUTES
-###############################################################################
-
-PBSNODE_NAME_ATTR_ID         :: STRING :: NAME_ATTR_ID        ::  :: TRUE :: 
-# state enumeration: UP, DOWN, ERROR, UNKNOWN,
-PBSNODE_STATE_ATTR_ID        :: STRING :: nodeState       ::  :: TRUE :: UNKNOWN
-PBSNODE_NP_ATTR_ID           :: STRING :: NP_ATTR_ID          ::  :: TRUE :: 
-PBSNODE_PROPERTIES_ATTR_ID   :: STRING :: PROPERTIES_ATTR_ID  ::  :: TRUE :: 
-PBSNODE_NTYPE_ATTR_ID        :: STRING :: NTYPE_ATTR_ID       ::  :: TRUE :: 
-PBSNODE_STATUS_ATTR_ID       :: STRING :: nodeStatus      ::  :: TRUE :: 
-PBSNODE_NUMBER_ATTR_ID       :: INTEGER :: nodeNumber      ::  :: TRUE :: 0
-
-
-###############################################################################
-# PBS QUEUE ATTRIBUTES
-###############################################################################
-                                                                                     
-PBSQUEUE_NAME_ATTR_ID                   :: STRING   :: NAME_ATTR_ID                   :: :: TRUE :: 
-PBSQUEUE_TYPE_ATTR_ID                   :: STRING   :: TYPE_ATTR_ID                   :: :: TRUE :: 
-PBSQUEUE_TOTAL_JOBS_ATTR_ID             :: STRING   :: TOTAL_JOBS_ATTR_ID             :: :: TRUE :: 
-PBSQUEUE_STATE_COUNT_ATTR_ID            :: STRING   :: STATE_COUNT_ATTR_ID            :: :: TRUE :: 
-PBSQUEUE_MTIME_ATTR_ID                  :: STRING   :: MTIME_ATTR_ID                  :: :: TRUE :: 
-PBSQUEUE_ENABLED_ATTR_ID                :: STRING   :: ENABLED_ATTR_ID                :: :: TRUE :: 
-PBSQUEUE_STARTED_ATTR_ID                :: STRING   :: STARTED_ATTR_ID                :: :: TRUE :: 
-
-PBSQUEUE_RES_DEFAULT_ARCH_ATTR_ID       :: STRING   :: RES_DEFAULT_ARCH_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_CPUT_ATTR_ID       :: STRING   :: RES_DEFAULT_CPUT_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_FILE_ATTR_ID       :: STRING   :: RES_DEFAULT_FILE_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_HOST_ATTR_ID       :: STRING   :: RES_DEFAULT_HOST_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_MEM_ATTR_ID        :: STRING   :: RES_DEFAULT_MEM_ATTR_ID        :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_MPIPROCS_ATTR_ID   :: INTEGER  :: RES_DEFAULT_MPIPROCS_ATTR_ID   :: :: TRUE :: 0
-PBSQUEUE_RES_DEFAULT_NCPUS_ATTR_ID      :: INTEGER  :: RES_DEFAULT_NCPUS_ATTR_ID      :: :: TRUE :: 0
-PBSQUEUE_RES_DEFAULT_NICE_ATTR_ID       :: INTEGER  :: RES_DEFAULT_NICE_ATTR_ID       :: :: TRUE :: 0
-PBSQUEUE_RES_DEFAULT_NODES_ATTR_ID      :: STRING   :: RES_DEFAULT_NODES_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_NODECT_ATTR_ID     :: INTEGER  :: RES_DEFAULT_NODECT_ATTR_ID     :: :: TRUE :: 0
-PBSQUEUE_RES_DEFAULT_OMPTHREADS_ATTR_ID :: INTEGER  :: RES_DEFAULT_OMPTHREADS_ATTR_ID :: :: TRUE :: 0
-PBSQUEUE_RES_DEFAULT_PCPUT_ATTR_ID      :: STRING   :: RES_DEFAULT_PCPUT_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_PMEM_ATTR_ID       :: STRING   :: RES_DEFAULT_PMEM_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_PVMEM_ATTR_ID      :: STRING   :: RES_DEFAULT_PVMEM_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_RESC_ATTR_ID       :: STRING   :: RES_DEFAULT_RESC_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_VMEM_ATTR_ID       :: STRING   :: RES_DEFAULT_VMEM_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_WALLTIME_ATTR_ID   :: STRING   :: RES_DEFAULT_WALLTIME_ATTR_ID   :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_MPPE_ATTR_ID       :: INTEGER  :: RES_DEFAULT_MPPE_ATTR_ID       :: :: TRUE :: 0
-PBSQUEUE_RES_DEFAULT_MPPT_ATTR_ID       :: STRING   :: RES_DEFAULT_MPPT_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_PF_ATTR_ID         :: STRING   :: RES_DEFAULT_PF_ATTR_ID         :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_PMPPT_ATTR_ID      :: STRING   :: RES_DEFAULT_PMPPT_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_PNCPUS_ATTR_ID     :: INTEGER  :: RES_DEFAULT_PNCPUS_ATTR_ID     :: :: TRUE :: 0
-PBSQUEUE_RES_DEFAULT_PPF_ATTR_ID        :: STRING   :: RES_DEFAULT_PPF_ATTR_ID        :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_PROCS_ATTR_ID      :: INTEGER  :: RES_DEFAULT_PROCS_ATTR_ID      :: :: TRUE :: 0
-PBSQUEUE_RES_DEFAULT_PSDS_ATTR_ID       :: STRING   :: RES_DEFAULT_PSDS_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_DEFAULT_SDS_ATTR_ID        :: STRING   :: RES_DEFAULT_SDS_ATTR_ID        :: :: TRUE :: 
-
-PBSQUEUE_RES_MAX_ARCH_ATTR_ID       :: STRING   :: RES_MAX_ARCH_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_MAX_CPUT_ATTR_ID       :: STRING   :: RES_MAX_CPUT_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_MAX_FILE_ATTR_ID       :: STRING   :: RES_MAX_FILE_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_MAX_HOST_ATTR_ID       :: STRING   :: RES_MAX_HOST_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_MAX_MEM_ATTR_ID        :: STRING   :: RES_MAX_MEM_ATTR_ID        :: :: TRUE :: 
-PBSQUEUE_RES_MAX_MPIPROCS_ATTR_ID   :: INTEGER  :: RES_MAX_MPIPROCS_ATTR_ID   :: :: TRUE :: 0
-PBSQUEUE_RES_MAX_NCPUS_ATTR_ID      :: INTEGER  :: RES_MAX_NCPUS_ATTR_ID      :: :: TRUE :: 0
-PBSQUEUE_RES_MAX_NICE_ATTR_ID       :: INTEGER  :: RES_MAX_NICE_ATTR_ID       :: :: TRUE :: 0
-PBSQUEUE_RES_MAX_NODES_ATTR_ID      :: STRING   :: RES_MAX_NODES_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_MAX_NODECT_ATTR_ID     :: INTEGER  :: RES_MAX_NODECT_ATTR_ID     :: :: TRUE :: 0
-PBSQUEUE_RES_MAX_OMPTHREADS_ATTR_ID :: INTEGER  :: RES_MAX_OMPTHREADS_ATTR_ID :: :: TRUE :: 0
-PBSQUEUE_RES_MAX_PCPUT_ATTR_ID      :: STRING   :: RES_MAX_PCPUT_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_MAX_PMEM_ATTR_ID       :: STRING   :: RES_MAX_PMEM_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_MAX_PVMEM_ATTR_ID      :: STRING   :: RES_MAX_PVMEM_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_MAX_RESC_ATTR_ID       :: STRING   :: RES_MAX_RESC_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_MAX_VMEM_ATTR_ID       :: STRING   :: RES_MAX_VMEM_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_MAX_WALLTIME_ATTR_ID   :: STRING   :: RES_MAX_WALLTIME_ATTR_ID   :: :: TRUE :: 
-PBSQUEUE_RES_MAX_MPPE_ATTR_ID       :: INTEGER  :: RES_MAX_MPPE_ATTR_ID       :: :: TRUE :: 0
-PBSQUEUE_RES_MAX_MPPT_ATTR_ID       :: STRING   :: RES_MAX_MPPT_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_MAX_PF_ATTR_ID         :: STRING   :: RES_MAX_PF_ATTR_ID         :: :: TRUE :: 
-PBSQUEUE_RES_MAX_PMPPT_ATTR_ID      :: STRING   :: RES_MAX_PMPPT_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_MAX_PNCPUS_ATTR_ID     :: INTEGER  :: RES_MAX_PNCPUS_ATTR_ID     :: :: TRUE :: 0
-PBSQUEUE_RES_MAX_PPF_ATTR_ID        :: STRING   :: RES_MAX_PPF_ATTR_ID        :: :: TRUE :: 
-PBSQUEUE_RES_MAX_PROCS_ATTR_ID      :: INTEGER  :: RES_MAX_PROCS_ATTR_ID      :: :: TRUE :: 0
-PBSQUEUE_RES_MAX_PSDS_ATTR_ID       :: STRING   :: RES_MAX_PSDS_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_MAX_SDS_ATTR_ID        :: STRING   :: RES_MAX_SDS_ATTR_ID        :: :: TRUE :: 
-
-PBSQUEUE_RES_ASSIGNED_ARCH_ATTR_ID       :: STRING   :: RES_ASSIGNED_ARCH_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_CPUT_ATTR_ID       :: STRING   :: RES_ASSIGNED_CPUT_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_FILE_ATTR_ID       :: STRING   :: RES_ASSIGNED_FILE_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_HOST_ATTR_ID       :: STRING   :: RES_ASSIGNED_HOST_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_MEM_ATTR_ID        :: STRING   :: RES_ASSIGNED_MEM_ATTR_ID        :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_MPIPROCS_ATTR_ID   :: INTEGER  :: RES_ASSIGNED_MPIPROCS_ATTR_ID   :: :: TRUE :: 0
-PBSQUEUE_RES_ASSIGNED_NCPUS_ATTR_ID      :: INTEGER  :: RES_ASSIGNED_NCPUS_ATTR_ID      :: :: TRUE :: 0
-PBSQUEUE_RES_ASSIGNED_NICE_ATTR_ID       :: INTEGER  :: RES_ASSIGNED_NICE_ATTR_ID       :: :: TRUE :: 0
-PBSQUEUE_RES_ASSIGNED_NODES_ATTR_ID      :: STRING   :: RES_ASSIGNED_NODES_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_NODECT_ATTR_ID     :: INTEGER  :: RES_ASSIGNED_NODECT_ATTR_ID     :: :: TRUE :: 0
-PBSQUEUE_RES_ASSIGNED_OMPTHREADS_ATTR_ID :: INTEGER  :: RES_ASSIGNED_OMPTHREADS_ATTR_ID :: :: TRUE :: 0
-PBSQUEUE_RES_ASSIGNED_PCPUT_ATTR_ID      :: STRING   :: RES_ASSIGNED_PCPUT_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_PMEM_ATTR_ID       :: STRING   :: RES_ASSIGNED_PMEM_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_PVMEM_ATTR_ID      :: STRING   :: RES_ASSIGNED_PVMEM_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_RESC_ATTR_ID       :: STRING   :: RES_ASSIGNED_RESC_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_VMEM_ATTR_ID       :: STRING   :: RES_ASSIGNED_VMEM_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_WALLTIME_ATTR_ID   :: STRING   :: RES_ASSIGNED_WALLTIME_ATTR_ID   :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_MPPE_ATTR_ID       :: INTEGER  :: RES_ASSIGNED_MPPE_ATTR_ID       :: :: TRUE :: 0
-PBSQUEUE_RES_ASSIGNED_MPPT_ATTR_ID       :: STRING   :: RES_ASSIGNED_MPPT_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_PF_ATTR_ID         :: STRING   :: RES_ASSIGNED_PF_ATTR_ID         :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_PMPPT_ATTR_ID      :: STRING   :: RES_ASSIGNED_PMPPT_ATTR_ID      :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_PNCPUS_ATTR_ID     :: INTEGER  :: RES_ASSIGNED_PNCPUS_ATTR_ID     :: :: TRUE :: 0
-PBSQUEUE_RES_ASSIGNED_PPF_ATTR_ID        :: STRING   :: RES_ASSIGNED_PPF_ATTR_ID        :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_PROCS_ATTR_ID      :: INTEGER  :: RES_ASSIGNED_PROCS_ATTR_ID      :: :: TRUE :: 0
-PBSQUEUE_RES_ASSIGNED_PSDS_ATTR_ID       :: STRING   :: RES_ASSIGNED_PSDS_ATTR_ID       :: :: TRUE :: 
-PBSQUEUE_RES_ASSIGNED_SDS_ATTR_ID        :: STRING   :: RES_ASSIGNED_SDS_ATTR_ID        :: :: TRUE :: 
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Definitions.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Definitions.txt
deleted file mode 100644
index 11606b9..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Definitions.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-###############################################################################
-# This is an attribute definition file for PBS Attributes
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-#
-# separator: "::"
-# 
-# attribute entry:
-# ID :: TYPE :: NAME :: DESCRIPTION :: DISPLAY :: DEFAULT :: CUSTOM FIELD1 :: CUSTOM FIELD 2 :: etc
-#
-# IDs have to be unique
-#
-# TYPE can be: string boolean integer double date
-# integer, double allow min max as custom fields
-# date requires a DATEFORMAT pattern as custom field 
-###############################################################################
-
-###############################################################################
-# PBS JOB ATTRIBUTES
-###############################################################################
-
-PBSJOB_NAME                         :: STRING :: PBSJOB_NAME                  :: The name assigned to the job by the qsub or qalter command.                                       :: TRUE ::  
-PBSJOB_DESCRIPTION                  :: STRING :: PBSJOB_DESCRIPTION           :: The name of the submission script                                                                 :: TRUE ::  
-PBSJOB_QUEUE                        :: STRING :: PBSJOB_QUEUE               :: Designation of the queue to which to submit the job.                                                                                                                           :: TRUE ::  
-PBSJOB_OWNER                        :: STRING :: PBSJOB_OWNER               :: Designation of the queue to which to submit the job.                                                                                                                           :: TRUE ::  
-PBSJOB_CHECKPOINT                   :: STRING :: PBSJOB_CHECKPOINT                :: If supported by the server implementation and the host operating system, the checkpoint attribute determines when checkpointing will be performed by PBS on behalf of the job. :: TRUE ::  
-PBSJOB_RERUNABLE                    :: STRING :: PBSJOB_RERUNABLE                :: The rerunable flag assigned by the user.                                                         :: TRUE ::  false
-PBSJOB_JOINPATH                     :: STRING :: PBSJOB_JOINPATH                 :: Merge stdout and stderr into stdout.                                                              :: TRUE ::  
-PBSJOB_MAILPOINTS                   :: STRING :: PBSJOB_MAILPOINTS               :: Identifies at which state changes the server will send mail about the job.                        :: TRUE ::  
-PBSJOB_HOLDTYPES                    :: STRING :: PBSJOB_HOLDTYPES                :: The set of holds currently applied to the job.                                                                                                                                 :: TRUE ::  
-PBSJOB_ERRORPATH                    :: STRING :: PBSJOB_ERRORPATH                :: The final path name for the file containing the job's standard error stream.                                                                                                   :: TRUE ::  
-PBSJOB_OUTPUTPATH                   :: STRING :: PBSJOB_OUTPUTPATH               :: The final path name for the file containing the job's standard output stream.                     :: TRUE ::  
-PBSJOB_PRIORITY                     :: STRING :: PBSJOB_PRIORITY                  :: The job scheduling priority assigned by the user.                                                 :: TRUE ::  
-PBSJOB_SERVER                       :: STRING :: PBSJOB_SERVER                  :: DESCRIPTION MISSING                                         :: TRUE ::  
-PBSJOB_STATE                        :: STRING :: PBSJOB_STATE                  :: DESCRIPTION MISSING                                         :: TRUE ::  
-PBSJOB_KEEPFILES                    :: STRING :: PBSJOB_KEEPFILES                  :: DESCRIPTION MISSING                                         :: TRUE ::  
-PBSJOB_EXECHOST                     :: STRING :: PBSJOB_EXECHOST                  :: DESCRIPTION MISSING                                         :: TRUE ::  
-PBSJOB_SESSIONID                    :: STRING :: PBSJOB_SESSIONID                  :: DESCRIPTION MISSING                                         :: TRUE ::  
-
-#:: PBSJOB_NUM_PROCS
-#:: PBSJOB_PROG_ARGS
-#:: PBSJOB_STATUS
-#:: PBSJOB_STATUS_MESSAGE
-#:: PBSJOB_USERID
-#:: PBSJOB_WORKING_DIR
-#:: PBSJOB_SUBID
-###############################################################################
-# PBS NODE ATTRIBUTES
-###############################################################################
-
-PBSNODE_NAME         :: STRING :: PBSNODE_NAME        ::  :: TRUE :: 
-PBSNODE_STATE        :: STRING :: PBSNODE_STATE       ::  :: TRUE :: 3
-PBSNODE_NP           :: STRING :: PBSNODE_NP          ::  :: TRUE :: 
-PBSNODE_NTYPE        :: STRING :: PBSNODE_NTYPE       ::  :: TRUE :: 
-PBSNODE_STATUS       :: STRING :: PBSNODE_STATUS      ::  :: TRUE :: UNKNOWN
-
-
-###############################################################################
-# PBS QUEUE ATTRIBUTES
-###############################################################################
-                                                                                     
-PBSQUEUE_NAME                   :: STRING   :: PBSQUEUE_NAME                   :: :: TRUE :: 
-PBSQUEUE_ENABLED                :: STRING   :: PBSQUEUE_ENABLED                :: :: TRUE :: 
-PBSQUEUE_STARTED                :: STRING   :: PBSQUEUE_STARTED                :: :: TRUE :: 
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/PBS2Protocol-KeyMap.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/PBS2Protocol-KeyMap.txt
deleted file mode 100644
index 99bb7c0..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/PBS2Protocol-KeyMap.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-###############################################################################
-# This is a file for mapping parser entries to PBS Attributes
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-#
-# separator: "::"
-# 
-# attribute entry:
-# Parser Key ID :: PBS Key ID
-#
-# The File is internally treated as a List
-# Parser Key ID is a regular expression, case ignoring
-# First match (top/down) will overwrite other possible matches
-###############################################################################
-
-###############################################################################
-# PBS JOB ATTRIBUTES
-###############################################################################
-
-PBSJOB_DESCRIPTION :: jobId
-PBSJOB_QUEUE :: queueId
-PBSJOB_STATE :: jobState
-PBSJOB_OWNER :: userId
-
-###############################################################################
-# PBS NODE ATTRIBUTES
-###############################################################################
-
-# Alternative Entries:
-#JOB_NAME :: job_name
-#job_state :: 
-#:: server 
-#ACCOUNT_NAME :: account_name
-#CHECKPOINT :: checkpoint
-#ERROR_PATH :: error_path
-#HOLD_TYPES :: hold_types
-#JOIN_PATH :: join_path
-#KEEP_FILES :: keep_files
-#MAIL_POINTS :: mail_points
-#OUTPUT_PATH :: output_path
-#:: submit_args
-#:: ctime
-#:: mtime
-#:: qtime
-#:: fault_tolerant
-#RES_NODECT :: nodect
-#RES_NODES :: nodes
-
-PBSNODE_NAME :: name
-PBSNODE_STATE :: nodeState
-PBSNODE_NP :: nodeNumber
-PBSNODE_NUMBER :: nodeNP
-PBSNODE_STATUS :: nodeStatus
-PBSNODE_NTYPE :: nodeType
-
-###############################################################################
-# PBS QUEUE ATTRIBUTES
-###############################################################################
- 
-PBSQUEUE_STARTED :: queueState
-PBSQUEUE_NAME :: name
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/PBS2Protocol-ValueMap.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/PBS2Protocol-ValueMap.txt
deleted file mode 100644
index 967a968..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/PBS2Protocol-ValueMap.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-###############################################################################
-# This is a file for mapping PBS Attribute Values to Protocol values
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-#
-# separator: "::"
-# 
-# attribute entry:
-# PBS Key ID :: PBS Value :: Protocol Value
-#
-# The File is internally treated as a List
-# Parser Key ID and Parser Value are regular expressions, case ignoring
-# First match (top/down) will overwrite other possible matches
-###############################################################################
-
-PBSJOB_STATE :: E :: STARTING
-PBSJOB_STATE :: Q :: SUSPENDED
-PBSJOB_STATE :: R :: RUNNING
-PBSJOB_STATE :: H :: SUSPENDED
-PBSJOB_STATE :: C :: COMPLETED
-
-PBSNODE_STATE :: job-exclusive|free :: UP
-# always put more specific matchers upfront
-# escape commas!
-PBSNODE_STATE :: down\,offline|down\,job-exclusive :: DOWN
-# otherwise more general matchers will "overwrite" more specific ones
-PBSNODE_STATE :: down|offline :: DOWN
-# any other value is mapped to UNKNOWN
-PBSNODE_STATE :: .* :: UNKNOWN
-
-PBSQUEUE_STARTED :: True :: NORMAL
-PBSQUEUE_STARTED :: False :: STOPPED
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-job.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-job.txt
deleted file mode 100644
index cea6b2c..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-job.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-###############################################################################
-# This is a file for mapping parser entries to PBS Attributes
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-#
-# separator: "::"
-# 
-# attribute entry:
-# Parser Key ID :: PBS Key ID
-#
-# The File is internally treated as a List
-# Parser Key ID is a regular expression, case ignoring
-# First match (top/down) will overwrite other possible matches
-###############################################################################
-
-job_id :: PBSJOB_NAME
-Job_Name :: PBSJOB_DESCRIPTION
-job_state :: PBSJOB_STATE
-Job_Owner :: PBSJOB_OWNER
-queue :: PBSJOB_QUEUE
-server :: PBSJOB_SERVER
-Checkpoint :: PBSJOB_CHECKPOINT
-Error_Path :: PBSJOB_ERRORPATH
-exec_host :: PBSJOB_EXECHOST
-Hold_Types :: PBSJOB_HOLDTYPES
-Join_Path :: PBSJOB_JOINPATH
-Keep_Files :: PBSJOB_KEEPFILES
-Mail_Points :: PBSJOB_MAILPOINTS
-Output_Path :: PBSJOB_OUTPUTPATH
-Priority :: PBSJOB_PRIORITY
-Rerunable :: PBSJOB_RERUNABLE
-session_id :: PBSJOB_SESSIONID
-
-
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-node.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-node.txt
deleted file mode 100644
index 55b4a7f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-node.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# This is a file for mapping parser entries to PBS Attributes
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-#
-# separator: "::"
-# 
-# attribute entry:
-# Parser Key ID :: PBS Key ID
-#
-# The File is internally treated as a List
-# Parser Key ID is a regular expression, case ignoring
-# First match (top/down) will overwrite other possible matches
-###############################################################################
-
-name :: PBSNODE_NAME
-state :: PBSNODE_STATE
-np :: PBSNODE_NP
-ntype :: PBSNODE_NTYPE
-jobs :: PBSNODE_JOBS
-#status ::PBSNODE_STATUS
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-queue.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-queue.txt
deleted file mode 100644
index 0ed8145..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-KeyMap-queue.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# This is a file for mapping parser entries to PBS Attributes
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-#
-# separator: "::"
-# 
-# attribute entry:
-# Parser Key ID :: PBS Key ID
-#
-# The File is internally treated as a List
-# Parser Key ID is a regular expression, case ignoring
-# First match (top/down) will overwrite other possible matches
-###############################################################################
-
-name :: PBSQUEUE_NAME
-started :: PBSQUEUE_STARTED
-enabled :: PBSQUEUE_ENABLED
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-job.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-job.txt
deleted file mode 100644
index 9429342..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-job.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# This is a file for mapping parser entries to PBS Attributes
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-#
-# separator: "::"
-# 
-# attribute entry:
-# Parser Key ID :: Parser Value :: PBS Value
-#
-# The File is internally treated as a List
-# Parser Key ID and Parser Value are regular expressions, case ignoring
-# First match (top/down) will overwrite other possible matches
-###############################################################################
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-node.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-node.txt
deleted file mode 100644
index 9429342..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-node.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# This is a file for mapping parser entries to PBS Attributes
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-#
-# separator: "::"
-# 
-# attribute entry:
-# Parser Key ID :: Parser Value :: PBS Value
-#
-# The File is internally treated as a List
-# Parser Key ID and Parser Value are regular expressions, case ignoring
-# First match (top/down) will overwrite other possible matches
-###############################################################################
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-queue.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-queue.txt
deleted file mode 100644
index 9429342..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/Parser2PBS-ValueMap-queue.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# This is a file for mapping parser entries to PBS Attributes
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-#
-# separator: "::"
-# 
-# attribute entry:
-# Parser Key ID :: Parser Value :: PBS Value
-#
-# The File is internally treated as a List
-# Parser Key ID and Parser Value are regular expressions, case ignoring
-# First match (top/down) will overwrite other possible matches
-###############################################################################
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-job.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-job.txt
deleted file mode 100644
index 7e8e351..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-job.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# This is an single entry per line file for Required PBS Keys
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-# 
-# The File is internally treated as a List
-# The Key elements have to match (case sensitive) the entries in Definition.txt
-###############################################################################
-
-###############################################################################
-# PBS JOB ATTRIBUTES
-###############################################################################
-
-PBSJOB_NAME
-PBSJOB_QUEUE
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-node.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-node.txt
deleted file mode 100644
index 70a0e67..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-node.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# This is an single entry per line file for Required PBS Keys
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-# 
-# The File is internally treated as a List
-# The Key elements have to match (case sensitive) the entries in Definition.txt
-###############################################################################
-
-###############################################################################
-# PBS NODE ATTRIBUTES
-###############################################################################
-
-PBSNODE_NAME
-PBSNODE_STATE
-PBSNODE_NP
-PBSNODE_NTYPE
-PBSNODE_STATUS
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-queue.txt b/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-queue.txt
deleted file mode 100644
index 250d91c..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/PBSAttributes/RequiredPBSKeys-queue.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# This is an single entry per line file for Required PBS Keys
-# tip: disable soft wrap in your text editor to work with this file
-###############################################################################
-
-###############################################################################
-# Formatting:
-# lines starting with # are ignored
-# empty lines are ignored
-# 
-# The File is internally treated as a List
-# The Key elements have to match (case sensitive) the entries in Definition.txt
-###############################################################################
-
-###############################################################################
-# PBS QUEUE ATTRIBUTES
-###############################################################################
- 
-PBSQUEUE_NAME
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/about.html b/rms/org.eclipse.ptp.rm.pbs.jproxy/about.html
deleted file mode 100644
index 3106f3a..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<title>About</title>

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

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

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

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

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

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

-

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

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

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

-

-</body>

-</html>
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/build.properties b/rms/org.eclipse.ptp.rm.pbs.jproxy/build.properties
deleted file mode 100644
index 76709f5..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.properties,\
-               PBSAttributes/
-source.. = src/
-customBuildCallbacks = customBuild.xml
-jars.compile.order = .
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/build.xml b/rms/org.eclipse.ptp.rm.pbs.jproxy/build.xml
deleted file mode 100644
index b01605d..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/build.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="pbs_proxy.jar" name="com.chartle.ant">
-
-	<!--
-    ===================
-	ECLIPSE TASK JAR
-    ===================
-    -->
-
-	<target name="pbs_proxy.jar" description="Creates the PBS Proxy JAR">
-		<property name="jar-with-dependencies" value="pbs_proxy_pre.jar" />
-		<delete file="${jar-with-dependencies}" />
-
-		<taskdef name="jar-eclipse" classname="${ant.project.name}.JarEclipseProject" classpath="${ant.project.name}.jar" />
-		<jar-eclipse outjar="${jar-with-dependencies}" />
-
-		<jar destfile="../org.eclipse.ptp.rm.pbs.core.server/pbs_proxy.jar">
-			<manifest>
-				<attribute name="Main-Class" value="org.eclipse.ptp.rm.pbs.jproxy.PBSProxyRuntimeServer" />
-				<attribute name="Class-Path" value="." />
-			</manifest>
-			<zipfileset src="${jar-with-dependencies}" />
-			<fileset file="about.html" />
-			<fileset dir=".">
-				<include name="PBSAttributes/"/>
-			</fileset>
-		</jar>
-		<delete file="${jar-with-dependencies}"/>
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/com.chartle.ant.jar b/rms/org.eclipse.ptp.rm.pbs.jproxy/com.chartle.ant.jar
deleted file mode 100644
index 18d4206..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/com.chartle.ant.jar
+++ /dev/null
Binary files differ
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/customBuild.xml b/rms/org.eclipse.ptp.rm.pbs.jproxy/customBuild.xml
deleted file mode 100644
index d2d56e4..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/customBuild.xml
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright (c) 2010 IBM Corporation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
- 
- Contributors:
-   IBM - Initial API and implementation
--->
-
-<!--
- Script for generating the PBS server packages.  To be run with
- PTP master build and not standalone.
--->
-
-<project name="PBS Java Proxy Build" default="noDefault">
-	<tstamp/>
-	<property name="server.builddir" value="${build.result.folder}/pbs_proxy"/>
-	<property name="server.jar" value="${basedir}/../org.eclipse.ptp.rm.pbs.core.server/pbs_proxy.jar"/>
-	
-	<target name="noDefault">
-		<echo message="This file must be called with explicit targets" />
-	</target>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.jars                              -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.jars"/>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.jars                               -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.jars"/>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target build.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="pre.build.sources"/>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target build.sources                            -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder to contain the build results           -->
-	<!-- ===================================================================== -->
-	<target name="post.build.sources"/>
-		
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the compilation target <name>                      -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="pre.name"/>
-
-	<target name="pre.@dot"/>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do during the compilation target <name>, after the compile   -->
-	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
-	<!-- target, eg @dot                                                       -->
-	<!-- Available parameters :                                                -->
-	<!--   source.foldern : n = 1 ... N, the source folders                    -->
-	<!--   target.folder  : where the results of the compilation go            -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.compile.name"/>
-
-	<target name="post.compile.@dot"/>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the compilation target <name>                       -->
-	<!-- Substitute "name" with the name of the compilation target, eg @dot    -->
-	<!-- Available parameters :                                                -->
-	<!--   jar.Location - the location of the compilation results              -->
-	<!--   <name>.classpath : name = name of the compilation target. A         -->
-	<!--                      reference to the classpath structure.            -->
-	<!-- ===================================================================== -->
-	<target name="post.name"/>
-
-	<target name="post.@dot"/>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.bin.parts                        -->
-	<!-- Available parameters :                                                -->
-	<!--   build.result.folder - folder containing the build results           -->
-	<!--   target.folder - destination folder                                  -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.bin.parts"/>
-	
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.bin.parts                         -->
-	<!-- Available parameters :                                            	   -->
-	<!--   build.result.folder - folder containing the build results       	   -->
-	<!--   target.folder - destination folder                              	   -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.bin.parts" depends="jar.remote"/>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.sources                          -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.sources"/>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.sources                           -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.sources"/>
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target gather.logs                             -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.gather.logs"/>     
-   
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target gather.logs                              -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="post.gather.logs"/>       
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do before the target clean                                   -->
-	<!-- Available parameters :                                                -->
-	<!--   destination.temp.folder - destination folder                        -->
-	<!-- ===================================================================== -->
-	<target name="pre.clean"/>              
-
-	<!-- ===================================================================== -->
-	<!-- Steps to do after the target clean                                    -->
-	<!-- Available parameters :                                                -->
-	<!--   plugin.destination - final destination of the build                 -->
-	<!--   build.result.folder - results of the compilation                    -->
-	<!--   temp.folder - temporary folder                                      -->
-	<!-- ===================================================================== -->
-	<target name="post.clean"/>             
-
-	<target name="prepare.remote.jar">
-		<!-- Add the Jar-in-jar loader to the server -->
-		<unzip dest="${build.result.folder}">
-			<fileset dir="${basedir}/../../eclipse/plugins">
-				<include name="org.eclipse.jdt.ui_*.jar"/>
-			</fileset>
-			<patternset>
-				<include name="jar-in-jar-loader.zip"/>	
-			</patternset>
-		</unzip>
-		<unzip src="jar-in-jar-loader.zip" dest="${server.builddir}"/>
-		<delete file="jar-in-jar-loader.zip"/>
-	</target>
-			
-	<target name="assemble.remote">
-		<copy todir="${server.builddir}">
-			<fileset dir="${basedir}/../org.eclipse.ptp.utils.core">
-				<include name="utils_core.jar"/>
-			</fileset>
-			<fileset dir="${basedir}/../org.eclipse.ptp.proxy.protocol">
-				<include name="proxy_protocol.jar"/>
-			</fileset>
-			<fileset dir="${basedir}/../org.eclipse.ptp.rm.proxy.core">
-				<include name="rm_proxy_core.jar"/>
-			</fileset>
-			<fileset dir="${build.result.folder}/@dot"/>
-			<fileset dir="${build.result.folder}">
-				<include name="PBSAttributes/"/>
-			</fileset>
-		</copy>
-	</target>
-	
-	<target name="jar.remote" depends="prepare.remote.jar, assemble.remote">
-		<jar destfile="${server.jar}" basedir="${server.builddir}">
-			<manifest>
-				<attribute name="Rsrc-Class-Path" value="./ utils_core.jar proxy_protocol.jar rm_proxy_core.jar"/>
-				<attribute name="Class-Path" value="."/>
-				<attribute name="Rsrc-Main-Class" value="org.eclipse.ptp.rm.pbs.jproxy.PBSProxyRuntimeServer"/>
-				<attribute name="Main-Class" value="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader"/>
-			</manifest>
-		</jar>
-	</target>
-</project>
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/plugin.properties b/rms/org.eclipse.ptp.rm.pbs.jproxy/plugin.properties
deleted file mode 100644
index e609dd1..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2010 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP PBS Java Proxy Agent
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/Messages.java b/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/Messages.java
deleted file mode 100644
index 2c18063..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/Messages.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 The University of Tennessee,
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Roland Schulz - initial implementation
-
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.pbs.jproxy;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.pbs.jproxy.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/PBSProxyRuntimeServer.java b/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/PBSProxyRuntimeServer.java
deleted file mode 100644
index bf66953..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/PBSProxyRuntimeServer.java
+++ /dev/null
@@ -1,691 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Dieter Krachtus and The University of Tennessee,
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Dieter Krachtus (dieter.krachtus@gmail.com) and Roland Schulz - initial API and implementation
- *    Benjamin Lindner (ben@benlabs.net) - Attribute Definitions and Mapping (bug 316671)
- *    Albert L. Rossi (arossi@ncsa.illinois.edu) - Added listener functionality and volatile map
- *                    to be able to associate client-generated jobSubId with the New Job event (10/11/2010)
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.pbs.jproxy;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.proxy.event.IProxyEvent;
-import org.eclipse.ptp.proxy.event.IProxyMessageEvent.Level;
-import org.eclipse.ptp.proxy.runtime.event.ProxyRuntimeEventFactory;
-import org.eclipse.ptp.proxy.runtime.server.ElementIDGenerator;
-import org.eclipse.ptp.rm.pbs.jproxy.parser.AttributeDefinitionReader;
-import org.eclipse.ptp.rm.pbs.jproxy.parser.AttributeKeyMapReader;
-import org.eclipse.ptp.rm.pbs.jproxy.parser.AttributeValueMapReader;
-import org.eclipse.ptp.rm.pbs.jproxy.parser.QstatJobXMLReader;
-import org.eclipse.ptp.rm.pbs.jproxy.parser.QstatQueuesReader;
-import org.eclipse.ptp.rm.pbs.jproxy.parser.RequiredAttributeKeyReader;
-import org.eclipse.ptp.rm.proxy.core.AbstractRMProxyRuntimeServer;
-import org.eclipse.ptp.rm.proxy.core.Controller;
-import org.eclipse.ptp.rm.proxy.core.element.IElement;
-import org.eclipse.ptp.rm.proxy.core.event.JobEventFactory;
-import org.eclipse.ptp.rm.proxy.core.event.NodeEventFactory;
-import org.eclipse.ptp.rm.proxy.core.event.QueueEventFactory;
-import org.eclipse.ptp.rm.proxy.core.parser.XMLReader;
-
-/**
- * Proxy for PBS.
- */
-public class PBSProxyRuntimeServer extends AbstractRMProxyRuntimeServer {
-	private static final int STREAM_BUFFER_SIZE = 1024;
-	private static final int EOF = -1;
-	private static final boolean debugReadFromFiles = false;
-	private static final String debugFolder = "helics" + File.separator; //$NON-NLS-1$
-	// static final String debugUser = "alizade1";
-	private static final String debugUser = "xli"; //$NON-NLS-1$
-
-	private final Controller nodeController;
-
-	private final Controller queueController;
-
-	private final Controller jobController;
-
-	private final Map<String, String> jobIdBindings = Collections.synchronizedMap(new HashMap<String, String>());
-
-	String user = null;
-
-	private PBSProxyRuntimeServer(String host, int port) {
-		super(host, port, new ProxyRuntimeEventFactory());
-		nodeController = new Controller("pbsnodes -x", // command //$NON-NLS-1$
-				// TODO: should include a flag whether mandatory.
-				new NodeEventFactory(), new XMLReader() // Parser
-		);
-
-		queueController = new Controller("qstat -Q -f -1", // command //$NON-NLS-1$
-				new QueueEventFactory(), new QstatQueuesReader() // Parser
-		);
-
-		jobController = new Controller("qstat -x", // command //$NON-NLS-1$
-				new JobEventFactory(), new QstatJobXMLReader(), // Parser
-				queueController // Parent
-		);
-
-		jobController.setEventArgumentsHandler(new Controller.EventArgumentsHandler() {
-			public void handle(List<String> eventArgs) {
-				for (Iterator<String> i = eventArgs.iterator(); i.hasNext();) {
-					String arg = i.next();
-					if (arg.startsWith("PBSJOB_NAME=")) { //$NON-NLS-1$
-						String batchId = arg.split("=")[1];//$NON-NLS-1$
-						String jobSubId = jobIdBindings.remove(batchId);
-						if (jobSubId != null) {
-							int curr = Integer.parseInt(eventArgs.get(3));
-							eventArgs.add("jobSubId=" + jobSubId);//$NON-NLS-1$
-							eventArgs.set(3, Integer.toString(curr + 1));
-						}
-						break;
-					}
-				}
-			}
-		});
-
-		if (debugReadFromFiles) {
-			nodeController.setDebug(debugFolder + "pbsnodes_1.xml", //$NON-NLS-1$
-					debugFolder + "pbsnodes_2.xml"); //$NON-NLS-1$
-			queueController.setDebug(debugFolder + "qstat_Q_1.xml", //$NON-NLS-1$
-					debugFolder + "qstat_Q_2.xml"); //$NON-NLS-1$
-			jobController.setDebug(debugFolder + "qstat_1.xml", debugFolder //$NON-NLS-1$
-					+ "qstat_2.xml"); //$NON-NLS-1$
-		}
-
-	}
-
-	@Override
-	protected List<IAttributeDefinition<?, ?, ?>> detectAttributeDefinitions() {
-
-		// detect PBS specific attributes here
-		// translate and add them for the attribute manager
-		List<IAttributeDefinition<?, ?, ?>> attrDefList = new ArrayList<IAttributeDefinition<?, ?, ?>>();
-
-		// query the controllers for a list of their assigned attributes
-		attrDefList.addAll(jobController.getAttributeDefinitions());
-		attrDefList.addAll(nodeController.getAttributeDefinitions());
-		attrDefList.addAll(queueController.getAttributeDefinitions());
-
-		return attrDefList;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.runtime.server.AbstractProxyRuntimeServer#
-	 * initServer()
-	 */
-	@Override
-	protected void initServer() throws Exception {
-		Controller.ErrorHandler handler = new Controller.ErrorHandler() {
-			public void handle(Level level, String msg) {
-				try {
-					sendEvent(getEventFactory().newProxyRuntimeMessageEvent(level, msg));
-				} catch (IOException e) {
-					e.printStackTrace(); // sendEvent failed - can't signal UI
-				}
-			}
-		};
-
-		// initialize Controllers:
-		// Attribute Defintions
-		InputStream AttrDefFile = getClass().getClassLoader().getResourceAsStream("PBSAttributes/Definitions.txt"); //$NON-NLS-1$
-		if (AttrDefFile == null) {
-			System.out.println("Unable to locate PBSAttributes/Definitions.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-		List<IAttributeDefinition<?, ?, ?>> AttributeDefinitions = AttributeDefinitionReader.parse(AttrDefFile);
-		nodeController.setAttributeDefinitions(AttributeDefinitions);
-		queueController.setAttributeDefinitions(AttributeDefinitions);
-		jobController.setAttributeDefinitions(AttributeDefinitions);
-
-		// Required PBS Keys for an entry to be complete
-		InputStream nodeParserRequiredKeyStream = getClass().getClassLoader().getResourceAsStream(
-				"PBSAttributes/RequiredPBSKeys-node.txt"); //$NON-NLS-1$
-		InputStream queueParserRequiredKeyStream = getClass().getClassLoader().getResourceAsStream(
-				"PBSAttributes/RequiredPBSKeys-queue.txt"); //$NON-NLS-1$
-		InputStream jobParserRequiredKeyStream = getClass().getClassLoader().getResourceAsStream(
-				"PBSAttributes/RequiredPBSKeys-job.txt"); //$NON-NLS-1$
-		if (nodeParserRequiredKeyStream == null) {
-			System.out.println("Unable to locate PBSAttributes/RequiredPBSKeys-node.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-		if (queueParserRequiredKeyStream == null) {
-			System.out.println("Unable to locate PBSAttributes/RequiredPBSKeys-queue.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-		if (jobParserRequiredKeyStream == null) {
-			System.out.println("Unable to locate PBSAttributes/RequiredPBSKeys-job.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-
-		nodeController.setRequiredAttributeKeys(RequiredAttributeKeyReader.parse(nodeParserRequiredKeyStream));
-		queueController.setRequiredAttributeKeys(RequiredAttributeKeyReader.parse(queueParserRequiredKeyStream));
-		jobController.setRequiredAttributeKeys(RequiredAttributeKeyReader.parse(jobParserRequiredKeyStream));
-
-		// Parser2PBS KeyMap
-		InputStream nodeParserKeyMapStream = getClass().getClassLoader().getResourceAsStream(
-				"PBSAttributes/Parser2PBS-KeyMap-node.txt"); //$NON-NLS-1$
-		InputStream queueParserKeyMapStream = getClass().getClassLoader().getResourceAsStream(
-				"PBSAttributes/Parser2PBS-KeyMap-queue.txt"); //$NON-NLS-1$
-		InputStream jobParserKeyMapStream = getClass().getClassLoader().getResourceAsStream(
-				"PBSAttributes/Parser2PBS-KeyMap-job.txt"); //$NON-NLS-1$
-		if (nodeParserKeyMapStream == null) {
-			System.out.println("Unable to locate PBSAttributes/Parser2PBS-KeyMap-node.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-		if (queueParserKeyMapStream == null) {
-			System.out.println("Unable to locate PBSAttributes/Parser2PBS-KeyMap-queue.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-		if (jobParserKeyMapStream == null) {
-			System.out.println("Unable to locate PBSAttributes/Parser2PBS-KeyMap-job.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-
-		nodeController.setParserKeyMap(AttributeKeyMapReader.parse(nodeParserKeyMapStream));
-		queueController.setParserKeyMap(AttributeKeyMapReader.parse(queueParserKeyMapStream));
-		jobController.setParserKeyMap(AttributeKeyMapReader.parse(jobParserKeyMapStream));
-
-		// Parser2PBS ValueMap
-		InputStream nodeParserValueMapStream = getClass().getClassLoader().getResourceAsStream(
-				"PBSAttributes/Parser2PBS-ValueMap-node.txt"); //$NON-NLS-1$
-		InputStream queueParserValueMapStream = getClass().getClassLoader().getResourceAsStream(
-				"PBSAttributes/Parser2PBS-ValueMap-queue.txt"); //$NON-NLS-1$
-		InputStream jobParserValueMapStream = getClass().getClassLoader().getResourceAsStream(
-				"PBSAttributes/Parser2PBS-ValueMap-job.txt"); //$NON-NLS-1$
-		if (nodeParserValueMapStream == null) {
-			System.out.println("Unable to locate PBSAttributes/Parser2PBS-ValueMap-node.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-		if (queueParserValueMapStream == null) {
-			System.out.println("Unable to locate PBSAttributes/Parser2PBS-ValueMap-queue.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-		if (jobParserValueMapStream == null) {
-			System.out.println("Unable to locate PBSAttributes/Parser2PBS-ValueMap-job.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-
-		nodeController.setParserValueMap(AttributeValueMapReader.parse(nodeParserValueMapStream));
-		queueController.setParserValueMap(AttributeValueMapReader.parse(queueParserValueMapStream));
-		jobController.setParserValueMap(AttributeValueMapReader.parse(jobParserValueMapStream));
-
-		// PBS2Protocol KeyMap
-		InputStream ProtocolKeyMapStream = getClass().getClassLoader().getResourceAsStream("PBSAttributes/PBS2Protocol-KeyMap.txt"); //$NON-NLS-1$
-		List<List<Object>> ProtocolKeyMap = AttributeKeyMapReader.parse(ProtocolKeyMapStream);
-		if (ProtocolKeyMap == null) {
-			System.out.println("Unable to locate PBSAttributes/PBS2Protocol-KeyMap.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-		nodeController.setProtocolKeyMap(ProtocolKeyMap);
-		queueController.setProtocolKeyMap(ProtocolKeyMap);
-		jobController.setProtocolKeyMap(ProtocolKeyMap);
-
-		// PBS2Protocol ValueMap
-		InputStream ProtocolValueMapStream = getClass().getClassLoader().getResourceAsStream(
-				"PBSAttributes/PBS2Protocol-ValueMap.txt"); //$NON-NLS-1$
-		List<List<Object>> ProtocolValueMap = AttributeValueMapReader.parse(ProtocolValueMapStream);
-		if (ProtocolValueMap == null) {
-			System.out.println("Unable to locate PBSAttributes/PBS2Protocol-ValueMap.txt"); //$NON-NLS-1$
-			throw new Exception();
-		}
-		nodeController.setProtocolValueMap(ProtocolValueMap);
-		queueController.setProtocolValueMap(ProtocolValueMap);
-		jobController.setProtocolValueMap(ProtocolValueMap);
-
-		// set key identifiers
-		nodeController.setElementKeyID("PBSNODE_NAME"); //$NON-NLS-1$
-		nodeController.setParentKeyID(null);
-
-		queueController.setElementKeyID("PBSQUEUE_NAME"); //$NON-NLS-1$
-		queueController.setParentKeyID(null);
-
-		jobController.setElementKeyID("PBSJOB_NAME"); //$NON-NLS-1$
-		jobController.setParentKeyID("PBSJOB_QUEUE"); //$NON-NLS-1$
-
-		nodeController.setErrorHandler(handler);
-		queueController.setErrorHandler(handler);
-		jobController.setErrorHandler(handler);
-
-		// Test whether all programs and parser work
-		queueController.parse();
-		nodeController.parse();
-		jobController.parse();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.proxy.runtime.server.AbstractProxyRuntimeServer#
-	 * startEventThread(int)
-	 */
-	@Override
-	protected Thread startEventThread(final int transID) {
-		int machineID = ElementIDGenerator.getInstance().getUniqueID();
-		System.out.println(Messages.getString("PBSProxyRuntimeServer.2")); //$NON-NLS-1$
-
-		// System.err.println(base_ID);
-		// System.err.println(getElementID());
-		// System.err.println(getElementID(12));
-
-		// MACHINES
-		int resourceManagerID = ElementIDGenerator.getInstance().getBaseID();
-
-		try {
-			Process p = null;
-			String server = null;
-			if (!debugReadFromFiles) {
-				try {
-					p = Runtime.getRuntime().exec("qstat -B -f -1");//$NON-NLS-1$
-				} catch (IOException e1) {
-					sendEvent(getEventFactory().newProxyRuntimeMessageEvent(Level.ERROR, e1.getMessage()));
-					return null;
-				}
-				p.waitFor();
-				server = new BufferedReader(new InputStreamReader(p.getInputStream())).readLine();
-			}
-			if (server == null || server.split(" ").length < 2) { //$NON-NLS-1$
-				server = "UNKNOWN"; //$NON-NLS-1$
-			} else {
-				server = server.split(" ")[1]; //$NON-NLS-1$
-			}
-			sendEvent(getEventFactory().newProxyRuntimeNewMachineEvent(transID,
-					new String[] { Integer.toString(resourceManagerID), "1", Integer.toString(machineID), //$NON-NLS-1$
-							"2", //$NON-NLS-1$
-							"machineState=UP", //$NON-NLS-1$
-							"name=" + server //$NON-NLS-1$
-					}));
-		} catch (IOException e1) {
-			e1.printStackTrace();
-		} catch (InterruptedException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		nodeController.setBaseID(machineID);
-		queueController.setBaseID(resourceManagerID);
-
-		jobController.setFilter("PBSJOB_OWNER", Pattern.quote(getUser()) + "@.*"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		// TODO: the following could be moved to the abstract class.
-		Thread eventThread = new Thread() {
-
-			@Override
-			public void run() {
-
-				// Event Loop
-				while (state != ServerState.SHUTDOWN) {
-					{
-						List<IProxyEvent> events = new ArrayList<IProxyEvent>();
-						try {
-							try {
-								events.addAll(nodeController.update());
-								events.addAll(queueController.update());
-								events.addAll(jobController.update());
-							} catch (Exception e) {
-								sendEvent(getEventFactory().newProxyRuntimeMessageEvent(Level.ERROR, e.getMessage()));
-							}
-							for (IProxyEvent e : events) {
-								e.setTransactionID(transID);
-								sendEvent(e);
-								System.out.println(e.toString());
-							}
-						} catch (IOException e1) {
-							e1.printStackTrace();
-							System.out.println(Messages.getString("PBSProxyRuntimeServer.6")); //$NON-NLS-1$
-							state = ServerState.SHUTDOWN;
-							stateMachineThread.interrupt();
-						}
-
-					}
-					try {
-						// System.err.println("Event Loop sleeps...");
-						Thread.sleep(2000);
-						// System.err.println("Event Loop continues...");
-					} catch (Exception e) {
-						e.printStackTrace();
-					}
-				}
-				System.out.println(Messages.getString("PBSProxyRuntimeServer.0")); //$NON-NLS-1$
-			}
-
-			// private String escape(String input, String what, String with)
-			// {
-			// if (input.contains(what)) input = input.replaceAll(what,
-			// with);
-			// return input;
-			// }
-
-			// private void sendEvent(PBSProxyRuntimeServer server,
-			// IProxyRuntimeEvent ev) {
-			// try {
-			// server.sendEvent(ev);
-			// } catch (IOException ex) {
-			// ex.printStackTrace();
-			// }
-			// };
-		};
-		eventThread.start();
-		return eventThread;
-	}
-
-	// private boolean procDone(Process p) {
-	// try {
-	// int v = p.exitValue();
-	// return true;
-	// } catch (IllegalThreadStateException e) {
-	// return false;
-	// }
-	// }
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.proxy.runtime.server.AbstractProxyRuntimeServer#submitJob
-	 * (int, java.lang.String[])
-	 */
-	@Override
-	protected void submitJob(int transID, String[] arguments) {
-
-		String jobSubId = null;
-		String script = null;
-		// Insert values into template and store special parameters
-		for (String argument : arguments) {
-			String[] keyValue = argument.split("=", 2); //$NON-NLS-1$
-			String key = keyValue[0];
-			String value = keyValue[1];
-			if (key.equals("jobSubId")) { //$NON-NLS-1$
-				jobSubId = value;
-			} else if (key.equals("script")) { //$NON-NLS-1$
-				script = normalize(value);
-			}
-		}
-
-		if (jobSubId == null) {
-			System.out.println("missing arguments!");//$NON-NLS-1$
-			return;
-		}
-
-		if (script == null) {
-			sendSubmitJobError(transID, jobSubId, "No script supplied");//$NON-NLS-1$
-			return;
-		}
-
-		// Write template into job-script as a temporary file
-		File tmp = null;
-		try {
-			tmp = File.createTempFile("job", "qsub"); //$NON-NLS-1$ //$NON-NLS-2$
-			//			System.out.println("script: "+tmp); //$NON-NLS-1$
-			// System.out.println(script);
-			BufferedWriter out = new BufferedWriter(new FileWriter(tmp));
-			out.write(script);
-			out.close();
-		} catch (IOException e1) {
-			sendSubmitJobError(transID, jobSubId, e1.getLocalizedMessage());
-			return;
-		}
-
-		// Call Qsub with job-script
-		String args[] = { "qsub", tmp.getAbsolutePath() }; //$NON-NLS-1$
-		Process p = null;
-		try {
-			p = new ProcessBuilder(args).redirectErrorStream(true).start();
-			StringBuffer out = new StringBuffer();
-			StringBuffer err = new StringBuffer();
-			streamConsumer(new InputStreamReader(p.getErrorStream()), true, err).start();
-			streamConsumer(new InputStreamReader(p.getInputStream()), false, out).start();
-			p.waitFor();
-
-			try {
-				//System.out.println("submitJob: exit:" + p.exitValue()); //$NON-NLS-1$
-				// Check that is was succesful
-				if (p.exitValue() == 0) {
-					String batchId = parseBatchId(out.toString());
-					if (batchId != null) {
-						jobIdBindings.put(batchId, jobSubId);
-					}
-					sendEvent(getEventFactory().newOKEvent(transID));
-				} else {
-					sendSubmitJobError(transID, jobSubId, out.toString());
-					/*
-					 * document in wiki - following here
-					 * proxy_event:proxy_submitjob_error_event
-					 */
-					System.out.println("submitJob: err: " + out.toString()); //$NON-NLS-1$
-				}
-			} catch (Throwable e1) { // sendEvent, readLine
-				e1.printStackTrace();
-			}
-
-		} catch (IOException e) { // exec
-			sendSubmitJobError(transID, jobSubId, e.getLocalizedMessage());
-		} catch (InterruptedException e) { // waitFor
-			e.printStackTrace();
-		}
-
-		tmp.delete();
-		// System.out.print(template);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.proxy.runtime.server.AbstractProxyRuntimeServer#terminateJob
-	 * (int, java.lang.String[])
-	 */
-	@Override
-	protected void terminateJob(int transID, String[] arguments) {
-		// CHECK: threading issues of jobController.currentElements
-		/*
-		 * is probably OK because if ID is already gone - then job doesn't need
-		 * to be terminated anymore. And it can't be that terminateJob is called
-		 * before the job is in list - because it is in the list before the
-		 * event is send (thus the UI doesn't know about he job earlier)
-		 */
-		//
-		int id = Integer.parseInt(arguments[0].split("=")[1]); //$NON-NLS-1$
-		IElement job = jobController.currentElements.getElementByElementID(id);
-		if (job == null) {
-			sendTerminateJobError(transID, id, "job not found on server");//$NON-NLS-1$
-			return;
-		}
-		System.out.println(Messages.getString("PBSProxyRuntimeServer.25") + id + "," + job.getKey()); //$NON-NLS-1$ //$NON-NLS-2$
-		String args[] = { "qdel", job.getKey() }; //$NON-NLS-1$
-		try {
-			Process p = new ProcessBuilder(args).redirectErrorStream(true).start();
-
-			p.waitFor();
-			if (p.exitValue() == 0) {
-				sendEvent(getEventFactory().newOKEvent(transID));
-			} else {
-				BufferedReader err = new BufferedReader(new InputStreamReader(p.getInputStream()));
-				String line, errMsg = ""; //$NON-NLS-1$
-				while ((line = err.readLine()) != null) {
-					errMsg += line;
-				}
-				err.close();
-				sendTerminateJobError(transID, id, errMsg);
-				System.out.println("qdel finished with exit status " + p.exitValue()); //$NON-NLS-1$
-			}
-		} catch (IOException e) {
-			e.printStackTrace();
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-		// System.out.println("terminateJob: "+keyVal[1]);
-
-	}
-
-	private String getUser() {
-		if (debugReadFromFiles) {
-			user = debugUser;
-		}
-		if (user == null) {
-			try {
-				Process p = Runtime.getRuntime().exec("whoami"); //$NON-NLS-1$
-				p.waitFor();
-				user = new BufferedReader(new InputStreamReader(p.getInputStream())).readLine();
-			} catch (IOException e) {
-				// Auto-generated catch block
-				e.printStackTrace();
-			} catch (InterruptedException e) {
-				// Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return user;
-	}
-
-	public static void main(String[] args) {
-		Map<String, Object> params = parseArguments(args);
-		String host = (String) params.get("host"); //$NON-NLS-1$
-		if (host == null) {
-			System.out.println(Messages.getString("PBSProxyRuntimeServer.1")); //$NON-NLS-1$
-			System.exit(1);
-		}
-		int port = 0;
-		Integer portVal = ((Integer) params.get("port")); //$NON-NLS-1$
-		if (portVal == null) {
-			System.out.println(Messages.getString("PBSProxyRuntimeServer.3")); //$NON-NLS-1$
-			System.exit(1);
-			return; // just to avoid warnings
-		}
-		port = portVal.intValue();
-
-		PBSProxyRuntimeServer server = new PBSProxyRuntimeServer(host, port);
-
-		try {
-			server.connect();
-			System.out.println(PBSProxyRuntimeServer.class.getSimpleName() + Messages.getString("PBSProxyRuntimeServer.4")); //$NON-NLS-1$
-			server.start();
-		} catch (IOException e) {
-			System.out.println(Messages.getString("PBSProxyRuntimeServer.5") + e.getMessage()); //$NON-NLS-1$
-			System.exit(1);
-		}
-		System.out.println("PBSProxyRuntimeServer exited"); //$NON-NLS-1$
-		/*
-		 * Exit required or server does not terminate.
-		 */
-		System.exit(0);
-	}
-
-	/**
-	 * @since 4.0
-	 */
-	protected static Map<String, Object> parseArguments(String args[]) {
-		Map<String, Object> argsMap = new HashMap<String, Object>();
-
-		for (int i = 0; i < args.length; i++) {
-			if (args[i].startsWith("--port")) { //$NON-NLS-1$
-				try {
-					int port = new Integer(args[i].substring(7));
-					argsMap.put("port", port); //$NON-NLS-1$
-				} catch (NumberFormatException e) {
-					System.out.println(Messages.getString(Messages.getString("PBSProxyRuntimeServer.10")) + args[i + 1].substring(7)); //$NON-NLS-1$
-				}
-			} else if (args[i].startsWith("--host")) { //$NON-NLS-1$
-				String host = args[i].substring(7);
-				if (host != null) {
-					argsMap.put("host", host); //$NON-NLS-1$
-				}
-			}
-		}
-
-		return argsMap;
-	}
-
-	private static String normalize(String content) {
-		content = content.replaceAll("\\\\\\\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
-		content = content.replaceAll("\\\\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		content = content.replaceAll("\\\\t", "\t"); //$NON-NLS-1$ //$NON-NLS-2$
-		content = content.replaceAll("\\\\s", " "); //$NON-NLS-1$ //$NON-NLS-2$
-		return content;
-	}
-
-	/*
-	 * 
-	 */
-	private static String parseBatchId(String out) throws Throwable {
-		String[] lines = out.split("\n"); //$NON-NLS-1$
-		if (lines == null || lines.length == 0) {
-			return null;
-		}
-		return lines[lines.length - 1];
-	}
-
-	private static Thread streamConsumer(final InputStreamReader reader, final boolean err, final StringBuffer output) {
-		return new Thread(reader + (err ? "err-thread" : "out-thread")) { //$NON-NLS-1$ //$NON-NLS-2$
-			@Override
-			public void run() {
-				char[] buffer = new char[STREAM_BUFFER_SIZE];
-				int numBytes = 0;
-				while (true) {
-					try {
-						numBytes = reader.read(buffer, 0, STREAM_BUFFER_SIZE);
-					} catch (EOFException eofe) {
-						break;
-					} catch (IOException ioe) {
-						return;
-					}
-					if (numBytes == EOF) {
-						break;
-					}
-					if (output != null) {
-						output.append(buffer, 0, numBytes);
-					}
-				}
-
-				try {
-					reader.close();
-				} catch (IOException ignored) {
-				}
-			}
-		};
-	}
-
-	private void sendSubmitJobError(int transId, String jobSubId, String errorMsg) {
-		String errArgs[] = { "jobSubId=" + jobSubId, "errorCode=" + 0, "errorMsg=" + errorMsg }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		try {
-			System.out.println("SubmitJobError: " + errorMsg); //$NON-NLS-1$
-			sendEvent(getEventFactory().newProxyRuntimeSubmitJobErrorEvent(transId, errArgs));
-		} catch (IOException e1) {
-			e1.printStackTrace();
-		}
-
-	}
-
-	private void sendTerminateJobError(int transId, int id, String errorMsg) {
-		String errArgs[] = { "jobId=" + id, "errorCode=" + 0, "errorMsg=" + errorMsg }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		try {
-			System.out.println("SubmitJobError: " + errorMsg); //$NON-NLS-1$
-			sendEvent(getEventFactory().newProxyRuntimeTerminateJobErrorEvent(transId, errArgs));
-		} catch (IOException e1) {
-			e1.printStackTrace();
-		}
-
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/messages.properties b/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/messages.properties
deleted file mode 100644
index 183e81c..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/messages.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-PBSProxyRuntimeServer.0=Exit Proxy Server Event Loop
-PBSProxyRuntimeServer.1=host argument missing
-PBSProxyRuntimeServer.10=Failed to parse arguments
-PBSProxyRuntimeServer.2=Proxy Server Event Thread started...
-PBSProxyRuntimeServer.25=terminateJob: 
-PBSProxyRuntimeServer.3=port argument missing
-PBSProxyRuntimeServer.4=\ started
-PBSProxyRuntimeServer.5=Failed to start: 
-PBSProxyRuntimeServer.6=IO exception while sending events... shutting down
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeDefinitionReader.java b/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeDefinitionReader.java
deleted file mode 100644
index f06ced9..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeDefinitionReader.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 The University of Tennessee,
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Benjamin Lindner (ben@benlabs.net) - initial implementation (bug 316671)
- *
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.pbs.jproxy.parser;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.ptp.core.attributes.BooleanAttributeDefinition;
-import org.eclipse.ptp.core.attributes.DateAttributeDefinition;
-import org.eclipse.ptp.core.attributes.DoubleAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-
-import com.ibm.icu.text.DateFormat;
-
-/**
- * @since 5.0
- */
-public class AttributeDefinitionReader {
-	static public List<IAttributeDefinition<?, ?, ?>> parse(InputStream in) throws Exception, IOException {
-
-		List<IAttributeDefinition<?, ?, ?>> tmpList = new ArrayList<IAttributeDefinition<?, ?, ?>>();
-
-		BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-
-		// each line is a sequence (:: separated) of entries which correspond to
-		// fields in the attribute definiton
-
-		// ignore lines starting with #
-		// skip lines which are empty
-
-		String line;
-
-		Integer linenumber = 0;
-		while ((line = reader.readLine()) != null) {
-			linenumber += 1;
-			String tline = line.trim();
-			if (tline.startsWith("#"))continue; //$NON-NLS-1$
-			if (tline.equals(""))continue; //$NON-NLS-1$
-			String[] linesplit = tline.split("::"); //$NON-NLS-1$
-			Integer linesplitlen = linesplit.length;
-
-			if (linesplitlen < 5) {
-				System.err.println("Attribute Definition ill-defined," + "linenumber=" + linenumber.toString()); //$NON-NLS-1$ //$NON-NLS-2$
-				System.err.println("read:" + tline); //$NON-NLS-1$
-				for (String lss : linesplit) {
-					System.err.println(lss);
-				}
-			} else if (linesplitlen < 6) {
-				// split discarded a trailing default which was empty and thus
-				// trimed away:
-				List<String> nlinesplit = new ArrayList<String>();
-				for (String lss : linesplit) {
-					nlinesplit.add(lss);
-				}
-				nlinesplit.add(""); //$NON-NLS-1$
-				linesplit = nlinesplit.toArray(new String[nlinesplit.size()]);
-			}
-
-			// format required:
-			// ID :: TYPE :: NAME :: DESCRIPTION :: DISPLAY :: DEFAULT :: CUSTOM
-			// FIELD 1 :: CUSTOM FIELD 2 :: etc
-
-			// somebool :: BOOLEAN :: someboolname :: this is an ex. for a bool
-			// :: true :: true
-			// somedate :: DATE :: somedatename :: this is an ex. for a date ::
-			// true :: 00:30:00 :: HH:MM:SS
-
-			if ("boolean".compareToIgnoreCase(linesplit[1].trim()) == 0) { //$NON-NLS-1$
-				tmpList.add(new BooleanAttributeDefinition(linesplit[0].trim(), // id
-						linesplit[2].trim(), // name
-						linesplit[3].trim(), // description
-						Boolean.valueOf(linesplit[4].trim()).booleanValue(), // display
-						Boolean.valueOf(linesplit[5].trim()) // default
-				));
-			}
-			if ("string".compareToIgnoreCase(linesplit[1].trim()) == 0) { //$NON-NLS-1$
-				tmpList.add(new StringAttributeDefinition(linesplit[0].trim(), // id
-						linesplit[2].trim(), // name
-						linesplit[3].trim(), // description
-						Boolean.valueOf(linesplit[4].trim()).booleanValue(), // display
-						linesplit[5].trim() // default
-				));
-			}
-			if ("integer".compareToIgnoreCase(linesplit[1].trim()) == 0) { //$NON-NLS-1$
-				boolean minmax = false;
-				if (linesplitlen >= 8)
-					minmax = true;
-
-				if (minmax) {
-					tmpList.add(new IntegerAttributeDefinition(linesplit[0].trim(), // id
-							linesplit[2].trim(), // name
-							linesplit[3].trim(), // description
-							Boolean.valueOf(linesplit[4].trim()).booleanValue(), // display
-							Integer.parseInt(linesplit[5].trim()), // default
-							Integer.parseInt(linesplit[6].trim()), // min
-							Integer.parseInt(linesplit[7].trim()) // max
-					));
-				} else {
-					tmpList.add(new IntegerAttributeDefinition(linesplit[0].trim(), // id
-							linesplit[2].trim(), // name
-							linesplit[3].trim(), // description
-							Boolean.valueOf(linesplit[4].trim()).booleanValue(), // display
-							Integer.parseInt(linesplit[5].trim()) // default
-					));
-				}
-			}
-			if ("double".compareToIgnoreCase(linesplit[1].trim()) == 0) { //$NON-NLS-1$
-				boolean minmax = false;
-				if (linesplitlen >= 8)
-					minmax = true;
-
-				if (minmax) {
-					tmpList.add(new DoubleAttributeDefinition(linesplit[0].trim(), // id
-							linesplit[2].trim(), // name
-							linesplit[3].trim(), // description
-							Boolean.valueOf(linesplit[4].trim()).booleanValue(), // display
-							Double.parseDouble(linesplit[5].trim()), // default
-							Double.parseDouble(linesplit[6].trim()), // min
-							Double.parseDouble(linesplit[7].trim()) // max
-					));
-				} else {
-					tmpList.add(new DoubleAttributeDefinition(linesplit[0].trim(), // id
-							linesplit[2].trim(), // name
-							linesplit[3].trim(), // description
-							Boolean.valueOf(linesplit[4].trim()).booleanValue(), // display
-							Double.parseDouble(linesplit[5].trim()) // default
-					));
-				}
-			}
-			if ("date".compareToIgnoreCase(linesplit[1].trim()) == 0) { //$NON-NLS-1$
-				boolean minmax = false;
-				if (linesplitlen >= 9)
-					minmax = true;
-
-				DateFormat df = DateFormat.getPatternInstance(linesplit[6].trim());
-
-				if (minmax) {
-					tmpList.add(new DateAttributeDefinition(linesplit[0].trim(), // id
-							linesplit[2].trim(), // name
-							linesplit[3].trim(), // description
-							Boolean.valueOf(linesplit[4].trim()).booleanValue(), // display
-							df.parse(linesplit[5].trim()), // default
-							df, df.parse(linesplit[7].trim()), // min
-							df.parse(linesplit[8].trim()) // max
-					));
-				} else {
-					tmpList.add(new DateAttributeDefinition(linesplit[0].trim(), // id
-							linesplit[2].trim(), // name
-							linesplit[3].trim(), // description
-							Boolean.valueOf(linesplit[4].trim()).booleanValue(), // display
-							df.parse(linesplit[5].trim()), // default
-							df));
-				}
-			}
-		}
-
-		return tmpList;
-
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeKeyMapReader.java b/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeKeyMapReader.java
deleted file mode 100644
index 2b08d63..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeKeyMapReader.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 The University of Tennessee,
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Benjamin Lindner (ben@benlabs.net) - initial implementation (bug 316671)
- *
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.pbs.jproxy.parser;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * @since 5.0
- */
-public class AttributeKeyMapReader {
-
-	// this parser read a custom text file which
-	// maps PBS Proxy IDs to Resource Manager Model Definitions
-	static public List<List<Object>> parse(InputStream in) throws Exception, IOException {
-
-		List<List<Object>> tmpMap = new ArrayList<List<Object>>();
-
-		BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-
-		// each line is a sequence (:: separated) of entries which correspond to
-		// fields in the attribute definiton
-		// ignore lines starting with #
-		// skip lines which are empty
-
-		String line;
-
-		Integer linenumber = 0;
-		while ((line = reader.readLine()) != null) {
-			linenumber += 1;
-			String tline = line.trim();
-			if (tline.startsWith("#"))continue; //$NON-NLS-1$
-			if (tline.equals(""))continue; //$NON-NLS-1$
-			String[] linesplit = tline.split("::"); //$NON-NLS-1$
-			Integer linesplitlen = linesplit.length;
-
-			if (linesplitlen < 2) {
-				System.err.println("Attribute Key Map ill-defined," + "linenumber=" + linenumber.toString()); //$NON-NLS-1$ //$NON-NLS-2$
-				System.err.println("read:" + tline); //$NON-NLS-1$
-				for (String lss : linesplit) {
-					System.err.println(lss);
-				}
-			}
-			// format required:
-			// Proxy Attribute Definition :: Resource Manager Model Attribute
-			// Definition
-
-			Pattern k = Pattern.compile(linesplit[0].trim(), Pattern.CASE_INSENSITIVE);
-			String v = linesplit[1].trim();
-
-			List<Object> newentry = new ArrayList<Object>();
-			newentry.add(k);
-			newentry.add(v);
-
-			tmpMap.add(newentry);
-		}
-
-		return tmpMap;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeValueMapReader.java b/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeValueMapReader.java
deleted file mode 100644
index 59c6858..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/AttributeValueMapReader.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 The University of Tennessee,
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Benjamin Lindner (ben@benlabs.net) - initial implementation (bug 316671)
- *
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.pbs.jproxy.parser;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * @since 5.0
- */
-public class AttributeValueMapReader {
-
-	static public List<List<Object>> parse(InputStream in) throws Exception, IOException {
-
-		List<List<Object>> tmpMapMap = new ArrayList<List<Object>>();
-
-		BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-
-		// each line is a sequence (:: separated) of entries which correspond to
-		// fields in the attribute definiton
-		// ignore lines starting with #
-		// skip lines which are empty
-
-		String line;
-
-		Integer linenumber = 0;
-		while ((line = reader.readLine()) != null) {
-			linenumber += 1;
-			String tline = line.trim();
-			if (tline.startsWith("#"))continue; //$NON-NLS-1$
-			if (tline.equals(""))continue; //$NON-NLS-1$
-			String[] linesplit = tline.split("::"); //$NON-NLS-1$
-			Integer linesplitlen = linesplit.length;
-
-			if (linesplitlen < 3) {
-				System.err.println("Attribute Value Map ill-defined," + "linenumber=" + linenumber.toString()); //$NON-NLS-1$ //$NON-NLS-2$
-				System.err.println("read:" + tline); //$NON-NLS-1$
-				for (String lss : linesplit) {
-					System.err.println(lss);
-				}
-			}
-			// format required:
-			// Parsed Key Name :: Parsed Value :: PBS Proxy Value
-
-			Pattern keyname = Pattern.compile(linesplit[0].trim(), Pattern.CASE_INSENSITIVE);
-			Pattern oldvalue = Pattern.compile(linesplit[1].trim(), Pattern.CASE_INSENSITIVE);
-			String newvalue = linesplit[2].trim();
-
-			List<Object> newentry = new ArrayList<Object>();
-			newentry.add(keyname);
-			newentry.add(oldvalue);
-			newentry.add(newvalue);
-
-			tmpMapMap.add(newentry);
-		}
-
-		return tmpMapMap;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/QstatJobXMLReader.java b/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/QstatJobXMLReader.java
deleted file mode 100644
index 24cc210..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/QstatJobXMLReader.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.eclipse.ptp.rm.pbs.jproxy.parser;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ptp.rm.proxy.core.parser.XMLReader;
-import org.w3c.dom.Node;
-
-/**
- * XML reader with fix for broken pbs job format (qstat -x).
- */
-public class QstatJobXMLReader extends XMLReader {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rm.proxy.core.parser.XMLReader#populateInput(org.w3c.
-	 * dom.Node, java.util.Map)
-	 */
-	@Override
-	protected Map<String, String> populateInput(Node node, Map<String, String> input) {
-
-		// Hack to recover from not well-formed XML (old qstat versions generate
-		// not well-formed XML)
-		Node item = node.getChildNodes().item(0);
-
-		// true when qstat XML output is not well-formed
-		if (item.getNodeType() == Node.TEXT_NODE) {
-			String textContent = item.getTextContent().trim();
-			if (textContent.length() > 0) { // make sure textnode is not empty
-				// System.out.println("Invalid XML: "+textContent);
-				if (input == null) {
-					input = new HashMap<String, String>();
-				}
-				input.put("job_id", textContent); //$NON-NLS-1$
-			}
-		}
-		return super.populateInput(node, input);
-
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/QstatQueuesReader.java b/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/QstatQueuesReader.java
deleted file mode 100644
index c72c1b5..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/QstatQueuesReader.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Dieter Krachtus and The University of Tennessee,
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Dieter Krachtus (dieter.krachtus@gmail.com) and Roland Schulz - initial API and implementation
- *    Benjamin Lindner (ben@benlabs.net) - initial implementation 
-
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.pbs.jproxy.parser;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.rm.proxy.core.element.ProxyModelElement;
-import org.eclipse.ptp.rm.proxy.core.element.IElement;
-import org.eclipse.ptp.rm.proxy.core.element.IElement.UnknownValueExecption;
-import org.eclipse.ptp.rm.proxy.core.parser.IParser;
-
-// TODO: Auto-generated Javadoc
-/**
- * Parser for non-xml PBS queue format (qstat -Q -f -1)
- */
-public class QstatQueuesReader implements IParser {
-
-	/** The queues. */
-	private Set<IElement> queues;
-
-	private void _parse(List<String> requiredAttributeKeys,List<IAttributeDefinition<?,?,?>> AttributeDefinitions, List<List<Object>> ParserKeyMap,List<List<Object>> ParserValueMap , InputStream in,String keyID,String parentkeyID)
-			throws IOException, UnknownValueExecption {
-		queues = new HashSet<IElement>();
-
-		BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-
-		Pattern queuepattern = Pattern.compile("^[Qq]ueue:(.*)$"); //$NON-NLS-1$
-		Pattern keyvalpattern = Pattern.compile("^([^=]+)=(.+)$"); //$NON-NLS-1$
-
-		String line;
-		ArrayList<HashMap<String, String>> qhashes = new ArrayList<HashMap<String, String>>();
-		HashMap<String, String> thisqueue = new HashMap<String, String>();
-		boolean firstqueue = true;
-		// parse the input file and store the individual queues as Hashmaps in
-		// qhashes
-		while ((line = reader.readLine()) != null) {
-			Matcher mq = queuepattern.matcher(line);
-
-			boolean newqueue = mq.find();
-			if (newqueue) {
-				if (!firstqueue) {
-					qhashes.add(thisqueue);
-				} else {
-					firstqueue = false;
-				}
-				thisqueue = new HashMap<String, String>();
-				thisqueue.put("name", mq.group(1).trim()); //$NON-NLS-1$
-				continue;
-			}
-
-			Matcher mkv = keyvalpattern.matcher(line);
-			if (!mkv.find()) {
-				continue;
-			}
-			if (mkv.groupCount() != 2) {
-				continue;
-			}
-			String skey = mkv.group(1).trim();
-			String svalue = mkv.group(2).trim();
-
-			thisqueue.put(skey, svalue);
-		}
-		if (!firstqueue) {
-			qhashes.add(thisqueue);
-		}
-				
-		// now convert the hashmap representation into beans
-		for (HashMap<String, String> q : qhashes) {
-			IElement e = new ProxyModelElement(requiredAttributeKeys,AttributeDefinitions,keyID,parentkeyID);
-				for (Entry<String,String> entry : q.entrySet()) {
-					// save keys as lower case! (by convention)
-					// then when matching they will be matched against the lower case of the corresponding ParserKeyMap entry
-					String newkey = entry.getKey();
-					String newvalue = entry.getValue();
-					String k = newkey;
-					String v = newvalue;
-					boolean keymatched = false;
-					
-					for (List<Object> ke : ParserKeyMap) {
-						Pattern kp = (Pattern) ke.get(0);
-						if (kp.matcher(k).matches()) {
-							newkey = (String) ke.get(1);
-							keymatched = true;
-							break;
-						}
-					}
-
-					for (List<Object> ve : ParserValueMap) {
-						Pattern kp = (Pattern) ve.get(0);
-						Pattern vp = (Pattern) ve.get(1);
-
-						if (kp.matcher(k).matches() && vp.matcher(v).matches()) {
-							newvalue = (String) ve.get(2);	
-							break;
-						}
-					}
-		
-//					System.err.println("trying to set: "+ newkey + " :: " + newvalue); 
-					if (keymatched) e.setAttribute(newkey, newvalue,false);
-				}
-			
-			// for (Entry<String, String> entry : q.entrySet()) {
-			// e.setAttribute(entry.getKey(), entry.getValue());
-			// }
-			queues.add(e);
-		}
-	}
-
-	private Set<IElement> getQueues() {
-		return queues;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rm.proxy.core.parser.IParser#parse(org.eclipse.ptp.rm
-	 * .proxy.core.attributes.AttributeDefinition, java.io.InputStream)
-	 */
-	public Set<IElement> parse(List<String> requiredAttributeKeys,List<IAttributeDefinition<?,?,?>> AttributeDefinitions, List<List<Object>> ParserKeyMap,List<List<Object>> ParserValueMap , InputStream in,String keyID,String parentkeyID) throws IOException, UnknownValueExecption  {
-		Set<IElement> queues = new HashSet<IElement>();
-		// qstat -Q -f is not XML - specific Reader has to be used.
-		_parse(requiredAttributeKeys,AttributeDefinitions,ParserKeyMap,ParserValueMap,in, keyID,parentkeyID);
-		queues = getQueues();
-
-		// System.err.println("queues length -> " + queues.size());
-		return queues;
-	}
-
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/RequiredAttributeKeyReader.java b/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/RequiredAttributeKeyReader.java
deleted file mode 100644
index 053fd19..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.jproxy/src/org/eclipse/ptp/rm/pbs/jproxy/parser/RequiredAttributeKeyReader.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 The University of Tennessee,
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Benjamin Lindner (ben@benlabs.net) - initial implementation (bug 316671)
- *
- *******************************************************************************/
-
-package org.eclipse.ptp.rm.pbs.jproxy.parser;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @since 5.0
- */
-public class RequiredAttributeKeyReader {
-
-	// this parser read a custom text file which
-	// maps PBS Proxy IDs to Resource Manager Model Definitions
-	static public List<String> parse(InputStream in) throws Exception, IOException {
-
-		List<String> tmpList = new ArrayList<String>();
-
-		BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-
-		// each line is a sequence (:: separated) of entries which correspond to
-		// fields in the attribute definiton
-		// ignore lines starting with #
-		// skip lines which are empty
-
-		String line;
-
-		Integer linenumber = 0;
-		while ((line = reader.readLine()) != null) {
-			linenumber += 1;
-			String tline = line.trim();
-			if (tline.startsWith("#"))continue; //$NON-NLS-1$
-			if (tline.equals(""))continue; //$NON-NLS-1$
-			String[] linesplit = tline.split("::"); //$NON-NLS-1$
-			Integer linesplitlen = linesplit.length;
-
-			if (linesplitlen > 1) {
-				System.err.println("Required Attribute Key Reader entry ill-defined," + "linenumber=" + linenumber.toString()); //$NON-NLS-1$ //$NON-NLS-2$
-				System.err.println("read:" + tline); //$NON-NLS-1$
-				for (String lss : linesplit) {
-					System.err.println(lss);
-				}
-			}
-			// format required:
-			// Proxy Attribute Definition :: Resource Manager Model Attribute
-			// Definition
-
-			tmpList.add(linesplit[0].trim());
-
-		}
-
-		return tmpList;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/.cproject b/rms/org.eclipse.ptp.rm.pbs.proxy/.cproject
deleted file mode 100644
index 841b658..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/.cproject
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="0.1451097999">
-<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.1451097999" moduleId="org.eclipse.cdt.core.settings" name="Default">
-<externalSettings/>
-<extensions>
-<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-</extensions>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<configuration artifactName="org.eclipse.ptp.rm.slurm.proxy" buildProperties="" description="" id="0.1451097999" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
-<folderInfo id="0.1451097999." name="/" resourcePath="">
-<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1939665555" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
-<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1939665555.1415213314" name=""/>
-<builder id="org.eclipse.cdt.build.core.settings.default.builder.379503967" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
-<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1835313480" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
-<tool id="org.eclipse.cdt.build.core.settings.holder.354226561" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.909176780" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-<tool id="org.eclipse.cdt.build.core.settings.holder.419413029" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1301739134" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-<tool id="org.eclipse.cdt.build.core.settings.holder.1246471449" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
-<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.2135229327" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
-</tool>
-</toolChain>
-</folderInfo>
-</configuration>
-</storageModule>
-<storageModule moduleId="scannerConfiguration">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<scannerConfigBuildInfo instanceId="0.1451097999">
-<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="makefileGenerator">
-<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
-<buildOutputProvider>
-<openAction enabled="true" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</scannerConfigBuildInfo>
-</storageModule>
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-</cconfiguration>
-</storageModule>
-<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-<project id="org.eclipse.ptp.rm.slurm.proxy.null.1647747885" name="org.eclipse.ptp.rm.slurm.proxy"/>
-</storageModule>
-</cproject>
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/.cvsignore b/rms/org.eclipse.ptp.rm.pbs.proxy/.cvsignore
deleted file mode 100644
index 3870dfd..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-autom4te.cache
-a.out.dSYM
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/.project b/rms/org.eclipse.ptp.rm.pbs.proxy/.project
deleted file mode 100644
index eb70ac2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/.project
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs.proxy</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>?name?</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildArguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.buildCommand</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.contents</key>
-					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/AUTHORS b/rms/org.eclipse.ptp.rm.pbs.proxy/AUTHORS
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/AUTHORS
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/COPYING b/rms/org.eclipse.ptp.rm.pbs.proxy/COPYING
deleted file mode 100644
index d75058f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/COPYING
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2009 School of Computer, National University of Defense Technology, P.R.China 
-
-This program and the accompanying materials 
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- 
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/ChangeLog b/rms/org.eclipse.ptp.rm.pbs.proxy/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/ChangeLog
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/INSTALL b/rms/org.eclipse.ptp.rm.pbs.proxy/INSTALL
deleted file mode 100644
index 5c0c42f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-See README for build/install instructions.
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/MANIFEST.MF
deleted file mode 100644
index db63451..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.eclipse.ptp.rm.pbs.proxy
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Version: 4.0.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ptp.utils,org.eclipse.ptp.proxy
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/eclipse.inf b/rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/eclipse.inf
deleted file mode 100644
index 92ffed2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/META-INF/eclipse.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-#Processed using Jarprocessor
-pack200.conditioned = true
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.am b/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.am
deleted file mode 100644
index c6beafb..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-
-bin_PROGRAMS =	ptp_pbs_proxy
-
-ptp_pbs_proxy_SOURCES =	src/ptp_pbs_proxy.c 
-ptp_pbs_proxy_CFLAGS =	-g $(AM_CFLAGS)
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.in b/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.in
deleted file mode 100644
index 0a275e2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/Makefile.in
+++ /dev/null
@@ -1,586 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-bin_PROGRAMS = ptp_pbs_proxy$(EXEEXT)
-subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	compile config.guess config.sub depcomp install-sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS)
-am__dirstamp = $(am__leading_dot)dirstamp
-am_ptp_pbs_proxy_OBJECTS = src/ptp_pbs_proxy-ptp_pbs_proxy.$(OBJEXT)
-ptp_pbs_proxy_OBJECTS = $(am_ptp_pbs_proxy_OBJECTS)
-ptp_pbs_proxy_LDADD = $(LDADD)
-ptp_pbs_proxy_LINK = $(CCLD) $(ptp_pbs_proxy_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(ptp_pbs_proxy_SOURCES)
-DIST_SOURCES = $(ptp_pbs_proxy_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PBSDIR = @PBSDIR@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-ptp_pbs_proxy_SOURCES = src/ptp_pbs_proxy.c 
-ptp_pbs_proxy_CFLAGS = -g $(AM_CFLAGS)
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-src/$(am__dirstamp):
-	@$(MKDIR_P) src
-	@: > src/$(am__dirstamp)
-src/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) src/$(DEPDIR)
-	@: > src/$(DEPDIR)/$(am__dirstamp)
-src/ptp_pbs_proxy-ptp_pbs_proxy.$(OBJEXT): src/$(am__dirstamp) \
-	src/$(DEPDIR)/$(am__dirstamp)
-ptp_pbs_proxy$(EXEEXT): $(ptp_pbs_proxy_OBJECTS) $(ptp_pbs_proxy_DEPENDENCIES) 
-	@rm -f ptp_pbs_proxy$(EXEEXT)
-	$(ptp_pbs_proxy_LINK) $(ptp_pbs_proxy_OBJECTS) $(ptp_pbs_proxy_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f src/ptp_pbs_proxy-ptp_pbs_proxy.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	mv -f $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-src/ptp_pbs_proxy-ptp_pbs_proxy.o: src/ptp_pbs_proxy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_pbs_proxy_CFLAGS) $(CFLAGS) -MT src/ptp_pbs_proxy-ptp_pbs_proxy.o -MD -MP -MF src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Tpo -c -o src/ptp_pbs_proxy-ptp_pbs_proxy.o `test -f 'src/ptp_pbs_proxy.c' || echo '$(srcdir)/'`src/ptp_pbs_proxy.c
-@am__fastdepCC_TRUE@	mv -f src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Tpo src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ptp_pbs_proxy.c' object='src/ptp_pbs_proxy-ptp_pbs_proxy.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_pbs_proxy_CFLAGS) $(CFLAGS) -c -o src/ptp_pbs_proxy-ptp_pbs_proxy.o `test -f 'src/ptp_pbs_proxy.c' || echo '$(srcdir)/'`src/ptp_pbs_proxy.c
-
-src/ptp_pbs_proxy-ptp_pbs_proxy.obj: src/ptp_pbs_proxy.c
-@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_pbs_proxy_CFLAGS) $(CFLAGS) -MT src/ptp_pbs_proxy-ptp_pbs_proxy.obj -MD -MP -MF src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Tpo -c -o src/ptp_pbs_proxy-ptp_pbs_proxy.obj `if test -f 'src/ptp_pbs_proxy.c'; then $(CYGPATH_W) 'src/ptp_pbs_proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/ptp_pbs_proxy.c'; fi`
-@am__fastdepCC_TRUE@	mv -f src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Tpo src/$(DEPDIR)/ptp_pbs_proxy-ptp_pbs_proxy.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='src/ptp_pbs_proxy.c' object='src/ptp_pbs_proxy-ptp_pbs_proxy.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ptp_pbs_proxy_CFLAGS) $(CFLAGS) -c -o src/ptp_pbs_proxy-ptp_pbs_proxy.obj `if test -f 'src/ptp_pbs_proxy.c'; then $(CYGPATH_W) 'src/ptp_pbs_proxy.c'; else $(CYGPATH_W) '$(srcdir)/src/ptp_pbs_proxy.c'; fi`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d $(distdir) || mkdir $(distdir)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) config.h
-installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-rm -f src/$(DEPDIR)/$(am__dirstamp)
-	-rm -f src/$(am__dirstamp)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf src/$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf src/$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/NEWS b/rms/org.eclipse.ptp.rm.pbs.proxy/NEWS
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/NEWS
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/README b/rms/org.eclipse.ptp.rm.pbs.proxy/README
deleted file mode 100644
index e69de29..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/README
+++ /dev/null
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/about.html b/rms/org.eclipse.ptp.rm.pbs.proxy/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/aclocal.m4 b/rms/org.eclipse.ptp.rm.pbs.proxy/aclocal.m4
deleted file mode 100644
index d898164..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/aclocal.m4
+++ /dev/null
@@ -1,908 +0,0 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_if(m4_PACKAGE_VERSION, [2.61],,
-[m4_fatal([this file was generated for autoconf 2.61.
-You have another version of autoconf.  If you want to use that,
-you should regenerate the build system entirely.], [63])])
-
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.10'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.10], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 9
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.60])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-                  [_AM_DEPENDENCIES(OBJC)],
-                  [define([AC_PROG_OBJC],
-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_PROG_CC_C_O
-# --------------
-# Like AC_PROG_CC_C_O, but changed for automake.
-AC_DEFUN([AM_PROG_CC_C_O],
-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([compile])dnl
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-dnl Make sure AC_PROG_CC is never called again, or it will override our
-dnl setting of CC.
-m4_define([AC_PROG_CC],
-          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 5
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/build.properties b/rms/org.eclipse.ptp.rm.pbs.proxy/build.properties
deleted file mode 100644
index d4b1fdf..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-bin.includes = AUTHORS,\
-               COPYING,\
-               ChangeLog,\
-               INSTALL,\
-               Makefile.am,\
-               Makefile.in,\
-               NEWS,\
-               README,\
-               aclocal.m4,\
-               compile,\
-               config.guess,\
-               config.h.in,\
-               config.status,\
-               config.sub,\
-               configure,\
-               configure.in,\
-               depcomp,\
-               install-sh,\
-               missing,\
-               src/,\
-               META-INF/,\
-               plugin.properties,\
-               about.html,\
-               include/
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/compile b/rms/org.eclipse.ptp.rm.pbs.proxy/compile
deleted file mode 100755
index 1b1d232..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/compile
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/config.guess b/rms/org.eclipse.ptp.rm.pbs.proxy/config.guess
deleted file mode 100755
index 396482d..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/config.guess
+++ /dev/null
@@ -1,1500 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2006-07-02'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    x86:Interix*:[3456]*)
-	echo i586-pc-interix${UNAME_RELEASE}
-	exit ;;
-    EM64T:Interix*:[3456]*)
-	echo x86_64-unknown-interix${UNAME_RELEASE}
-	exit ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/config.h.in b/rms/org.eclipse.ptp.rm.pbs.proxy/config.h.in
deleted file mode 100644
index e414213..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/config.h.in
+++ /dev/null
@@ -1,61 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `proxysvr' library (-lproxysvr). */
-#undef HAVE_LIBPROXYSVR
-
-/* Define to 1 if you have the `torque' library (-ltorque). */
-#undef HAVE_LIBTORQUE
-
-/* Define to 1 if you have the `utils' library (-lutils). */
-#undef HAVE_LIBUTILS
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <pbs_ilf.h> header file. */
-#undef HAVE_PBS_ILF_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#undef RETSIGTYPE
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/config.sub b/rms/org.eclipse.ptp.rm.pbs.proxy/config.sub
deleted file mode 100755
index fab0aa3..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/config.sub
+++ /dev/null
@@ -1,1616 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-#   Inc.
-
-timestamp='2006-09-20'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/configure b/rms/org.eclipse.ptp.rm.pbs.proxy/configure
deleted file mode 100755
index 6845b96..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/configure
+++ /dev/null
@@ -1,6122 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for org.eclipse.ptp.pbs 4.0.0.
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-
-  if test $as_have_required = yes && 	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
-else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  case $as_dir in
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-	   done;;
-       esac
-done
-IFS=$as_save_IFS
-
-
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-fi
-
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
-fi
-
-
-fi
-
-fi
-
-
-
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
-}
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-
-exec 7<&0 </dev/null 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Identity of this package.
-PACKAGE_NAME='org.eclipse.ptp.pbs'
-PACKAGE_TARNAME='org-eclipse-ptp-pbs'
-PACKAGE_VERSION='4.0.0'
-PACKAGE_STRING='org.eclipse.ptp.pbs 4.0.0'
-PACKAGE_BUGREPORT=''
-
-ac_unique_file="src/ptp_pbs_proxy.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-am__isrc
-CYGPATH_W
-PACKAGE
-VERSION
-ACLOCAL
-AUTOCONF
-AUTOMAKE
-AUTOHEADER
-MAKEINFO
-install_sh
-STRIP
-INSTALL_STRIP_PROGRAM
-mkdir_p
-AWK
-SET_MAKE
-am__leading_dot
-AMTAR
-am__tar
-am__untar
-build
-build_cpu
-build_vendor
-build_os
-PBSDIR
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-DEPDIR
-am__include
-am__quote
-AMDEP_TRUE
-AMDEP_FALSE
-AMDEPBACKSLASH
-CCDEPMODE
-am__fastdepCC_TRUE
-am__fastdepCC_FALSE
-RANLIB
-CPP
-GREP
-EGREP
-LIBOBJS
-LTLIBOBJS'
-ac_subst_files=''
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *)	ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures org.eclipse.ptp.pbs 4.0.0 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR          info documentation [DATAROOTDIR/info]
-  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR           man documentation [DATAROOTDIR/man]
-  --docdir=DIR           documentation root [DATAROOTDIR/doc/org-eclipse-ptp-pbs]
-  --htmldir=DIR          html documentation [DOCDIR]
-  --dvidir=DIR           dvi documentation [DOCDIR]
-  --pdfdir=DIR           pdf documentation [DOCDIR]
-  --psdir=DIR            ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of org.eclipse.ptp.pbs 4.0.0:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pbs              Specify the top dir of installed PBS rms.[REQUIRED]
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" || continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-org.eclipse.ptp.pbs configure 4.0.0
-generated by GNU Autoconf 2.61
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by org.eclipse.ptp.pbs $as_me 4.0.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------------- ##
-## File substitutions. ##
-## ------------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
-elif test "x$prefix" != xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-am__api_version='1.10'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm -f conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
-if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-done
-IFS=$as_save_IFS
-
-fi
-
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-echo "${ECHO_T}$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='org-eclipse-ptp-pbs'
- VERSION='4.0.0'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		{ { echo "$as_me:$LINENO: error: utils directory not found" >&5
-echo "$as_me: error: utils directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-
-PROXY="../org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
-	PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
-	if test ! -d $PROXY; then
-		{ { echo "$as_me:$LINENO: error: proxy directory not found" >&5
-echo "$as_me: error: proxy directory not found" >&2;}
-   { (exit 1); exit 1; }; }
-	fi
-fi
-
-
-
-# Check whether --with-pbs was given.
-if test "${with_pbs+set}" = set; then
-  withval=$with_pbs;
-else
-  with_pbs=no
-fi
-
-
-PBSDIR=
-if test "x$with_pbs" != xno; then
-  PBSDIR=$with_pbs
-
-else
-  { { echo "$as_me:$LINENO: error: The top installation directory of PBS must be specified via \"--with-pbs=DIR\"." >&5
-echo "$as_me: error: The top installation directory of PBS must be specified via \"--with-pbs=DIR\"." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { (ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
-if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_prog_cc_c89=$ac_arg
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
-  xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
-echo $ECHO_N "checking whether $CC and cc understand -c and -o together... $ECHO_C" >&6; }
-else
-  { echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
-echo $ECHO_N "checking whether cc understands -c and -o together... $ECHO_C" >&6; }
-fi
-set dummy $CC; ac_cc=`echo $2 |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f -r core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_MINUS_C_MINUS_O 1
-_ACEOF
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-IFS=$as_save_IFS
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  SET_MAKE=
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-
-CFLAGS="$CFLAGS -Wall -I$UTILS/include -I$PROXY/include -I$PBSDIR/include"
-LIBS="$LIBS -L$UTILS -L$PROXY -L$PBSDIR/lib"
-
-
-
-
-{ echo "$as_me:$LINENO: checking for bitset_new in -lutils" >&5
-echo $ECHO_N "checking for bitset_new in -lutils... $ECHO_C" >&6; }
-if test "${ac_cv_lib_utils_bitset_new+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutils  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bitset_new ();
-int
-main ()
-{
-return bitset_new ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_utils_bitset_new=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_utils_bitset_new=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_utils_bitset_new" >&5
-echo "${ECHO_T}$ac_cv_lib_utils_bitset_new" >&6; }
-if test $ac_cv_lib_utils_bitset_new = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBUTILS 1
-_ACEOF
-
-  LIBS="-lutils $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for proxy_svr_init in -lproxysvr" >&5
-echo $ECHO_N "checking for proxy_svr_init in -lproxysvr... $ECHO_C" >&6; }
-if test "${ac_cv_lib_proxysvr_proxy_svr_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lproxysvr  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char proxy_svr_init ();
-int
-main ()
-{
-return proxy_svr_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_proxysvr_proxy_svr_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_proxysvr_proxy_svr_init=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_proxysvr_proxy_svr_init" >&5
-echo "${ECHO_T}$ac_cv_lib_proxysvr_proxy_svr_init" >&6; }
-if test $ac_cv_lib_proxysvr_proxy_svr_init = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPROXYSVR 1
-_ACEOF
-
-  LIBS="-lproxysvr $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for pbs_connect in -ltorque" >&5
-echo $ECHO_N "checking for pbs_connect in -ltorque... $ECHO_C" >&6; }
-if test "${ac_cv_lib_torque_pbs_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ltorque  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pbs_connect ();
-int
-main ()
-{
-return pbs_connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_torque_pbs_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_torque_pbs_connect=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_torque_pbs_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_torque_pbs_connect" >&6; }
-if test $ac_cv_lib_torque_pbs_connect = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBTORQUE 1
-_ACEOF
-
-  LIBS="-ltorque $LIBS"
-
-else
-  { echo "$as_me:$LINENO: PBS not installed, skipping..." >&5
-echo "$as_me: PBS not installed, skipping..." >&6;}
-	 		 { (exit 1); exit 1; }
-
-fi
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
-if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-
-   fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f -r conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f -r conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-if test "${ac_cv_header_pbs_ifl_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for pbs_ifl.h" >&5
-echo $ECHO_N "checking for pbs_ifl.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_pbs_ifl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_pbs_ifl_h" >&5
-echo "${ECHO_T}$ac_cv_header_pbs_ifl_h" >&6; }
-else
-  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking pbs_ifl.h usability" >&5
-echo $ECHO_N "checking pbs_ifl.h usability... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <pbs_ifl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ echo "$as_me:$LINENO: checking pbs_ifl.h presence" >&5
-echo $ECHO_N "checking pbs_ifl.h presence... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <pbs_ifl.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: pbs_ifl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: pbs_ifl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pbs_ifl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: pbs_ifl.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: pbs_ifl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: pbs_ifl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pbs_ifl.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: pbs_ifl.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pbs_ifl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: pbs_ifl.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pbs_ifl.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: pbs_ifl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pbs_ifl.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: pbs_ifl.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: pbs_ifl.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: pbs_ifl.h: in the future, the compiler will take precedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for pbs_ifl.h" >&5
-echo $ECHO_N "checking for pbs_ifl.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_pbs_ifl_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_pbs_ifl_h=$ac_header_preproc
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_pbs_ifl_h" >&5
-echo "${ECHO_T}$ac_cv_header_pbs_ifl_h" >&6; }
-
-fi
-if test $ac_cv_header_pbs_ifl_h = yes; then
-  :
-else
-  { echo "$as_me:$LINENO: PBS not installed, skipping..." >&5
-echo "$as_me: PBS not installed, skipping..." >&6;}
-	 { (exit 1); exit 1; }
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_signal=int
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_signal=void
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-
-ac_config_files="$ac_config_files Makefile"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      *) $as_unset $ac_var ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
-  else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-as_nl='
-'
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
-fi
-
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
--n*)
-  case `echo 'x\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s='ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-    as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-        test -d "$1/.";
-      else
-	case $1 in
-        -*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-
-# Save the log message, to keep $[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by org.eclipse.ptp.pbs $as_me 4.0.0, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-org.eclipse.ptp.pbs config.status 4.0.0
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=$SHELL
-  export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp=
-  trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-am__isrc!$am__isrc$ac_delim
-CYGPATH_W!$CYGPATH_W$ac_delim
-PACKAGE!$PACKAGE$ac_delim
-VERSION!$VERSION$ac_delim
-ACLOCAL!$ACLOCAL$ac_delim
-AUTOCONF!$AUTOCONF$ac_delim
-AUTOMAKE!$AUTOMAKE$ac_delim
-AUTOHEADER!$AUTOHEADER$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-install_sh!$install_sh$ac_delim
-STRIP!$STRIP$ac_delim
-INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-mkdir_p!$mkdir_p$ac_delim
-AWK!$AWK$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-am__leading_dot!$am__leading_dot$ac_delim
-AMTAR!$AMTAR$ac_delim
-am__tar!$am__tar$ac_delim
-am__untar!$am__untar$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-PBSDIR!$PBSDIR$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-DEPDIR!$DEPDIR$ac_delim
-am__include!$am__include$ac_delim
-am__quote!$am__quote$ac_delim
-AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-CCDEPMODE!$CCDEPMODE$ac_delim
-am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-RANLIB!$RANLIB$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
-    break
-  elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/
-s/:*\${srcdir}:*/:/
-s/:*@srcdir@:*/:/
-s/^\([^=]*=[	 ]*\):*/\1/
-s/:*$//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-fi # test -n "$CONFIG_FILES"
-
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-   { (exit 1); exit 1; }; };;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
-      esac
-      ac_file_inputs="$ac_file_inputs $ac_f"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input="Generated from "`IFS=:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-
-case `sed -n '/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p
-' $ac_file_inputs` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined." >&2;}
-
-  rm -f "$tmp/stdin"
-  case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-# NAME is the cpp macro being defined, VALUE is the value it is being given.
-# PARAMS is the parameter list in the macro definition--in most cases, it's
-# just an empty string.
-ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB='\\)[	 (].*,\\1define\\2'
-ac_dC=' '
-ac_dD=' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #undef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in='$ac_file_inputs'
-ac_out='"$tmp/out1"'
-ac_nxt='"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
-  if test x"$ac_file" != x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # Grep'ing the whole file is not good either: AIX grep has a line
-  # limit of 2048, but all sed's we know have understand at least 4000.
-  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-    dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-
-  esac
-done # for ac_tag
-
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/configure.in b/rms/org.eclipse.ptp.rm.pbs.proxy/configure.in
deleted file mode 100644
index a56f464..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/configure.in
+++ /dev/null
@@ -1,83 +0,0 @@
-dnl
-dnl
-
-AC_PREREQ([2.50])
-
-AC_INIT([org.eclipse.ptp.pbs], [4.0.0])
-AC_CONFIG_SRCDIR([src/ptp_pbs_proxy.c])
-
-AM_INIT_AUTOMAKE([subdir-objects])
-
-AM_CONFIG_HEADER(config.h)
-AC_CANONICAL_BUILD
-
-dnl
-dnl Eclipse adds version number to end of package when deploying via update site
-dnl
-
-UTILS="../org.eclipse.ptp.utils"
-if test ! -d $UTILS; then
-	UTILS="`echo ${UTILS}_${PACKAGE_VERSION}.*`"
-	if test ! -d $UTILS; then
-		AC_MSG_ERROR([utils directory not found])
-	fi
-fi
-
-PROXY="../org.eclipse.ptp.proxy"
-if test ! -d $PROXY; then
-	PROXY="`echo ${PROXY}_${PACKAGE_VERSION}.*`"
-	if test ! -d $PROXY; then
-		AC_MSG_ERROR([proxy directory not found])
-	fi
-fi
-
-dnl PBS
-
-AC_ARG_WITH([pbs], AS_HELP_STRING([--with-pbs],
-	[Specify the top dir of installed PBS rms.@<:@REQUIRED@:>@]),[],[with_pbs=no])
-
-PBSDIR=
-AS_IF([test "x$with_pbs" != xno],[AC_SUBST([PBSDIR],[$with_pbs])],
-       AC_MSG_ERROR([The top installation directory of PBS must be specified via "--with-pbs=DIR".]))
-
-
-dnl
-dnl Check for programs.
-dnl
-
-AC_PROG_CC
-AM_PROG_CC_C_O
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_RANLIB
-
-CFLAGS="$CFLAGS -Wall -I$UTILS/include -I$PROXY/include -I$PBSDIR/include"
-LIBS="$LIBS -L$UTILS -L$PROXY -L$PBSDIR/lib"
-
-dnl
-dnl Check for libraries.
-dnl
-
-AC_CHECK_LIB([utils], [bitset_new])
-AC_CHECK_LIB([proxysvr], [proxy_svr_init])
-AC_CHECK_LIB([torque],[pbs_connect],[],
-			[AC_MSG_NOTICE([PBS not installed, skipping...])
-	 		 AS_EXIT
-			])
-
-dnl
-dnl Check for header files.
-dnl
-
-AC_HEADER_STDC
-AC_CHECK_HEADER([pbs_ifl.h], [], 
-	[AC_MSG_NOTICE([PBS not installed, skipping...])
-	 AS_EXIT
-	])
-dnl
-dnl Check for types
-dnl
-AC_TYPE_SIGNAL
-
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/depcomp b/rms/org.eclipse.ptp.rm.pbs.proxy/depcomp
deleted file mode 100755
index ca5ea4e..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/depcomp
+++ /dev/null
@@ -1,584 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2006-10-15.18
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/include/ptp_pbs_job.h b/rms/org.eclipse.ptp.rm.pbs.proxy/include/ptp_pbs_job.h
deleted file mode 100644
index 16ef13c..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/include/ptp_pbs_job.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2009 National Center for Supercomputing Applications
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-#ifndef PTP_PBS_JOB_H_
-#define PTP_PBS_JOB_H_
-
-#include <stdbool.h>
-#include "pbs_ifl.h"
-#include "hash.h"
-
-#define RSRC_arch	"arch"
-#define RSRC_cput	"cput"
-#define RSRC_file	"file"
-#define RSRC_host	"host"
-#define RSRC_mem	"mem"
-#define RSRC_mpiprocs "mpiprocs"
-#define RSRC_ncpus	"ncpus"
-#define RSRC_nice	"nice"
-#define RSRC_nodes	"nodes"
-#define RSRC_nodect	"nodect"
-#define RSRC_ompthreads "ompthreads"
-#define RSRC_pcput	"pcput"
-#define RSRC_pmem	"mem"
-#define RSRC_pvmem	"pvmem"
-#define RSRC_resc	"resc"
-#define RSRC_vmem	"vmem"
-#define RSRC_walltime	"walltime"
-#define RSRC_mppe	"mppe"
-#define RSRC_mppt	"mppt"
-#define RSRC_pf		"pf"
-#define RSRC_pmppt	"pmppt"
-#define RSRC_pncpus	"pncpus"
-#define RSRC_ppf	"ppf"
-#define RSRC_procs	"procs"
-#define RSRC_psds	"psds"
-#define RSRC_sds	"sds"
-
-#define DEFAULT_HASH_SIZE 4091
-
-typedef struct attrl attrl;
-
-struct PbsAttrList
-{
-	Hash* attrTable;
-	Hash* rsrcTable;
-};
-typedef struct PbsAttrList PbsAttrList;
-
-PbsAttrList* create_pbs_attr_list();
-void free_pbs_attr_list(PbsAttrList*);
-char* serialize_pbs_attr_list(PbsAttrList*);
-
-bool is_valid_pbs_attr(char*, PbsAttrList*);
-bool is_valid_pbs_rsrc(char*, PbsAttrList*);
-
-attrl* create_job_attr_entry(char*, attrl*, PbsAttrList*);
-void free_attrl(attrl*);
-void free_attrl_recur(attrl* job_attr);
-bool parse_arg_into_attrl(char*, attrl*, PbsAttrList*);
-void print_attrl(attrl*);
-
-char *copy_string(char *str);
-void HashPut(Hash*, char*, void*);
-
-#endif /* PTP_PBS_JOB_H_ */
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/install-sh b/rms/org.eclipse.ptp.rm.pbs.proxy/install-sh
deleted file mode 100755
index 4fbbae7..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/install-sh
+++ /dev/null
@@ -1,507 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2006-10-14.15
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-posix_glob=
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chmodcmd=$chmodprog
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-        shift
-        shift
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dstarg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dstarg"
-      shift # fnord
-    fi
-    shift # arg
-    dstarg=$arg
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix=/ ;;
-	-*) prefix=./ ;;
-	*)  prefix= ;;
-      esac
-
-      case $posix_glob in
-        '')
-	  if (set -f) 2>/dev/null; then
-	    posix_glob=true
-	  else
-	    posix_glob=false
-	  fi ;;
-      esac
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob && set -f
-      set fnord $dstdir
-      shift
-      $posix_glob && set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test -z "$d" && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dst"; then
-	       $doit $rmcmd -f "$dst" 2>/dev/null \
-	       || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
-		     && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
-	       || {
-		 echo "$0: cannot unlink or rename $dst" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dst"
-	 }
-    } || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/missing b/rms/org.eclipse.ptp.rm.pbs.proxy/missing
deleted file mode 100755
index 1c8ff70..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/missing
+++ /dev/null
@@ -1,367 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2006-05-10.23
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case $1 in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $1 in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG="\${$#}"
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/plugin.properties b/rms/org.eclipse.ptp.rm.pbs.proxy/plugin.properties
deleted file mode 100644
index 716943f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2009 IBM Corporation.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-###############################################################################
-
-pluginName=PTP PBS Proxy Agent
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_job.c b/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_job.c
deleted file mode 100644
index 26965d6..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_job.c
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (c) 2009 National Center for Supercomputing Applications
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <ptp_pbs_job.h>
-#include "hash.h"
-#include <pbs_ifl.h>
-
-PbsAttrList*
-create_pbs_attr_list()
-{
-	void* element;
-	PbsAttrList* pbs_attr_list = (PbsAttrList*) malloc(sizeof(PbsAttrList));
-	pbs_attr_list->attrTable = HashCreate(DEFAULT_HASH_SIZE);
-	pbs_attr_list->rsrcTable = HashCreate(DEFAULT_HASH_SIZE);
-	HashPut(pbs_attr_list->attrTable, ATTR_a, ATTR_a);
-	HashPut(pbs_attr_list->attrTable, ATTR_c, ATTR_c);
-	HashPut(pbs_attr_list->attrTable, ATTR_e, ATTR_e);
-	HashPut(pbs_attr_list->attrTable, ATTR_g, ATTR_g);
-	HashPut(pbs_attr_list->attrTable, ATTR_h, ATTR_h);
-	HashPut(pbs_attr_list->attrTable, ATTR_j, ATTR_j);
-	HashPut(pbs_attr_list->attrTable, ATTR_J, ATTR_J);
-	HashPut(pbs_attr_list->attrTable, ATTR_k, ATTR_k);
-	HashPut(pbs_attr_list->attrTable, ATTR_l, ATTR_l);
-	HashPut(pbs_attr_list->attrTable, ATTR_m, ATTR_m);
-	HashPut(pbs_attr_list->attrTable, ATTR_o, ATTR_o);
-	HashPut(pbs_attr_list->attrTable, ATTR_p, ATTR_p);
-	HashPut(pbs_attr_list->attrTable, ATTR_q, ATTR_q);
-	HashPut(pbs_attr_list->attrTable, ATTR_r, ATTR_r);
-	HashPut(pbs_attr_list->attrTable, ATTR_u, ATTR_u);
-	HashPut(pbs_attr_list->attrTable, ATTR_v, ATTR_v);
-	HashPut(pbs_attr_list->attrTable, ATTR_A, ATTR_A);
-	HashPut(pbs_attr_list->attrTable, ATTR_M, ATTR_M);
-	HashPut(pbs_attr_list->attrTable, ATTR_N, ATTR_N);
-	HashPut(pbs_attr_list->attrTable, ATTR_S, ATTR_S);
-	HashPut(pbs_attr_list->attrTable, ATTR_depend, ATTR_depend);
-	HashPut(pbs_attr_list->attrTable, ATTR_inter, ATTR_inter);
-	HashPut(pbs_attr_list->attrTable, ATTR_sandbox, ATTR_sandbox);
-	HashPut(pbs_attr_list->attrTable, ATTR_stagein, ATTR_stagein);
-	HashPut(pbs_attr_list->attrTable, ATTR_stageout, ATTR_stageout);
-	HashPut(pbs_attr_list->attrTable, ATTR_resvTag, ATTR_resvTag);
-	HashPut(pbs_attr_list->attrTable, ATTR_resvID, ATTR_resvID);
-	HashPut(pbs_attr_list->attrTable, ATTR_resv_start, ATTR_resv_start);
-	HashPut(pbs_attr_list->attrTable, ATTR_resv_end, ATTR_resv_end);
-	HashPut(pbs_attr_list->attrTable, ATTR_resv_duration, ATTR_resv_duration);
-	HashPut(pbs_attr_list->attrTable, ATTR_auth_u, ATTR_auth_u);
-	HashPut(pbs_attr_list->attrTable, ATTR_auth_g, ATTR_auth_g);
-	HashPut(pbs_attr_list->attrTable, ATTR_auth_h, ATTR_auth_h);
-	HashPut(pbs_attr_list->attrTable, ATTR_pwd, ATTR_pwd);
-	HashPut(pbs_attr_list->attrTable, ATTR_cred, ATTR_cred);
-	HashPut(pbs_attr_list->attrTable, ATTR_nodemux, ATTR_nodemux);
-	HashPut(pbs_attr_list->attrTable, ATTR_umask, ATTR_umask);
-	HashPut(pbs_attr_list->attrTable, ATTR_block, ATTR_block);
-	HashPut(pbs_attr_list->attrTable, ATTR_convert, ATTR_convert);
-	HashPut(pbs_attr_list->attrTable, ATTR_DefaultChunk, ATTR_DefaultChunk);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_arch, RSRC_arch);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_cput, RSRC_cput);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_file, RSRC_file);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_host, RSRC_host);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_mem, RSRC_mem);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_mpiprocs, RSRC_mpiprocs);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_ncpus, RSRC_ncpus);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_nice, RSRC_nice);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_nodes, RSRC_nodes);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_nodect, RSRC_nodect);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_ompthreads, RSRC_ompthreads);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_pcput, RSRC_pcput);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_pmem, RSRC_pmem);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_pvmem, RSRC_pvmem);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_resc, RSRC_resc);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_vmem, RSRC_vmem);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_walltime, RSRC_walltime);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_mppe, RSRC_mppe);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_mppt, RSRC_mppt);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_pf, RSRC_pf);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_pmppt, RSRC_pmppt);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_pncpus, RSRC_pncpus);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_ppf, RSRC_ppf);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_procs, RSRC_procs);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_psds, RSRC_psds);
-	HashPut(pbs_attr_list->rsrcTable, RSRC_sds, RSRC_sds);
-	return pbs_attr_list;
-}
-
-void
-free_pbs_attr_list
-(PbsAttrList* pbs_attr_list)
-{
-	if ( pbs_attr_list != NULL ) {
-		HashDestroy(pbs_attr_list->attrTable, free);
-		HashDestroy(pbs_attr_list->rsrcTable, free);
-		free(pbs_attr_list);
-	}
-}
-
-bool
-is_valid_pbs_attr
-(char* key, PbsAttrList* pbs_attr_list)
-{
-	if ( HashFind(pbs_attr_list->attrTable, key) == NULL ) return false;
-	return true;
-}
-
-bool
-is_valid_pbs_rsrc
-(char* key, PbsAttrList* pbs_attr_list)
-{
-	if ( HashFind(pbs_attr_list->rsrcTable, key) == NULL ) return false;
-	return true;
-}
-
-char*
-serialize_pbs_attr_list
-(PbsAttrList* pbs_attr_list)
-{
-	char buffer[16384];
-	HashEntry *entry;
-	int i = sprintf(&buffer[0], "%s", "<pbs-job-attributes>");
-	HashSet(pbs_attr_list->attrTable);
-	while( (entry = HashGet(pbs_attr_list->attrTable)) != NULL ) {
-		i += sprintf(&buffer[i], "<attr name=\"%s\"/>", (char*)entry->h_data);
-	}
-	HashSet(pbs_attr_list->rsrcTable);
-	while( (entry = HashGet(pbs_attr_list->rsrcTable)) != NULL ) {
-		i += sprintf(&buffer[i], "<rsrc name=\"%s\"/>", (char*)entry->h_data);
-	}
-	sprintf(&buffer[i], "%s", "</pbs-job-attributes>");
-	return copy_string(buffer);
-}
-
-attrl*
-create_job_attr_entry
-( char* arg, attrl* last, PbsAttrList* pbs_attr_lst)
-{
-	attrl* job_attr = (attrl *) malloc(sizeof(attrl));
-	if ( parse_arg_into_attrl(arg, job_attr, pbs_attr_lst) == false ) return NULL;
-	if ( last != NULL ) last->next = job_attr;
-	return job_attr;
-}
-
-bool
-parse_arg_into_attrl
-( char* arg, attrl* job_attr, PbsAttrList* pbs_attr_lst)
-{
-	char *part[3];
-	char* prefix = NULL;
-	part[1] = NULL;
-	part[0] = strtok(arg, "=");
-	part[2] = strtok(NULL, "=");
-	prefix = strstr(part[0], "Resource");
-	if (prefix != NULL) {
-		part[0] = "Resource_List";
-		strtok(prefix, "_");
-		part[1] = strtok(NULL, "-");
-	}
-	if ( is_valid_pbs_attr(part[0], pbs_attr_lst) == false ) {
-		return false;
-	}
-	job_attr->name = copy_string(part[0]);
-	if ( part[1] != NULL && is_valid_pbs_rsrc(part[1], pbs_attr_lst) == false ) {
-		return false;
-	}
-	job_attr->resource = copy_string(part[1]);
-	job_attr->value = copy_string(part[2]);
-	return true;
-}
-
-void
-free_attrl
-(attrl* job_attr)
-{
-	if (job_attr != NULL) {
-		if ( job_attr->name != NULL ) free(job_attr->name);
-		if ( job_attr->resource != NULL ) free(job_attr->resource);
-		if ( job_attr->value != NULL ) free(job_attr->value);
-		job_attr->next = NULL;
-		free(job_attr);
-	}
-}
-
-void
-free_attrl_recur
-(attrl* job_attr)
-{
-	if (job_attr != NULL) {
-		if ( job_attr->name != NULL ) free(job_attr->name);
-		if ( job_attr->resource != NULL ) free(job_attr->resource);
-		if ( job_attr->value != NULL ) free(job_attr->value);
-		if ( job_attr->next != NULL ) free_attrl_recur(job_attr->next);
-		free(job_attr);
-	}
-}
-
-void
-print_attrl
-(attrl* job_attr)
-{
-	if (job_attr != NULL) {
-		printf("<job-attribute");
-		if ( job_attr->name != NULL ) printf(" name=\"%s\"", job_attr->name);
-		if ( job_attr->resource != NULL ) printf(" resource=\"%s\"", job_attr->resource);
-		if ( job_attr->value != NULL ) printf(" value=\"%s\"", job_attr->value);
-		if ( job_attr->next != NULL) {
-			if ( job_attr->next->resource != NULL )
-				printf(" next=\"Resource_List_%s\"", job_attr->next->resource);
-			else
-				printf(" next=\"%s\"", job_attr->next->name);
-		}
-		printf( "/>\n");
-	}
-}
-
-void HashPut
-(Hash* table, char* key, void* value)
-{
-	HashInsert(table, HashCompute(key, strlen(key)), copy_string(value));
-}
-
-char *
-copy_string
-(char *str)
-{
-	if (str != NULL) {
-		int 	len = strlen(str);
-		char *	res = (char *)malloc(len+1);
-		memcpy(res, str, len);
-		*(res+len) = '\0';
-		return res;
-	}
-	return NULL;
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_job_tests.c b/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_job_tests.c
deleted file mode 100644
index 499b2eb..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_job_tests.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2009 National Center for Supercomputing Applications
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <ptp_pbs_job.h>
-#include "hash.h"
-#include "list.h"
-#include <pbs_ifl.h>
-
-int
-main()
-{
-	int i;
-	int argc = 7;
-	attrl *attributes[7];
-	char argv[7][32];
-	char* serial;
-	PbsAttrList* aList;
-	attrl* last = NULL;
-
-	sprintf( argv[0], "%s", "Job_Name=testPBSjob");
-	sprintf( argv[1], "%s", "Account_Name=fyl");
-	sprintf( argv[2], "%s", "Phoney_argument=foo");
-	sprintf( argv[3], "%s", "Error_Path=/tmp/err.log");
-	sprintf( argv[4], "%s", "Output_Path=/tmp/out.log");
-	sprintf( argv[5], "%s", "Resource_walltime=00:25");
-	sprintf( argv[6], "%s", "Resource_ncpus=256");
-
-	aList = create_pbs_attr_list();
-	serial = serialize_pbs_attr_list(aList);
-	printf( "%s\n", serial);
-	free(serial);
-
-	for (i = 0; i < argc; i++) {
-		attributes[i] = create_job_attr_entry(argv[i], last, aList);
-		if ( attributes[i] == NULL ) {
-			fprintf(stderr, "bad argument %s\n", argv[i]);
-			continue;
-		}
-		last = attributes[i];
-	}
-
-	for (i = 0; i < argc; i++) {
-		print_attrl(attributes[i]);
-	}
-
-	free_attrl_recur(attributes[0]);
-	free_pbs_attr_list(aList);
-	return 0;
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_proxy.c b/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_proxy.c
deleted file mode 100644
index 0513644..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.proxy/src/ptp_pbs_proxy.c
+++ /dev/null
@@ -1,1665 +0,0 @@
-/*
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-#ifdef __gnu_linux__
-#define _GNU_SOURCE
-#endif /* __gnu_linux__ */
-
-#include "config.h"
-
-#include <getopt.h>
-#include <unistd.h>
-#include <stdbool.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <pwd.h>
-#include <regex.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/select.h>
-
-#include "proxy.h"
-#include "proxy_tcp.h"
-#include "handler.h"
-#include "list.h"
-#include "hash.h"
-#include "args.h"
-#include "rangeset.h"
-#include "pbs_ifl.h"
-
-#define WIRE_PROTOCOL_VERSION	"2.0"
-
-/*
- * PBS Resources
- *
- * arch			string		System architecture
- * cput			time		Maximum, aggregate CPU time required by all processes
- * file			size		Maximum disk space requirements for any single file to be created
- * host			string		Name of requested host/node
- * mem			size		Maximum amount of physical memory (RAM)
- * mpiprocs		int			Number of MPI processes for this chunk
- * ncpus		int			Number of CPUs (processors)
- * nice			int			Requested job priority
- * nodes		string		Number and/or type of nodes
- * nodect		int			Number of chunks in resource request from selection directive, or number of vnodes requested from node specification
- * ompthreads	int			Number of OpenMP threads for this chunk.
- * pcput		time		Per-process maximum CPU time
- * pmem			size		Per-process maximum amount of physical memory
- * pvmem		size		Per-process maximum amount of virtual memory
- * resc			string		Single-node variable resource specification string
- * vmem			size		Maximum, aggregate amount of virtual memory used by all concurrent processes
- * walltime		time		Maximum amount of real time (wall-clock elapsed time)
- * mppe			int			The number of processing elements used by a single process
- * mppt			time		Maximum wallclock time used on the MPP.
- * pf			size		Maximum number of file system blocks that can be used by all process
- * pmppt		time		Maximum amount of wall clock time used on the MPP by a single process
- * pncpus		int			Maximum number of processors used by any single process
- * ppf			size		Maximum number of file system blocks that can be used by a single process
- * procs		int			Maximum number of processes
- * psds			size		Maximum number of data blocks on the SDS (secondary data storage) for any process
- * sds			size		Maximum number of data blocks on the SDS (secondary data storage)
- *
- * Job Attributes
- *
- * Account_Name
- * Checkpoint
- * depend
- * Error_Path
- * Execution_Time
- * group_list
- * Hold_Types
- * Job_Name
- * Join_Path
- * Keep_Files
- * Mail_Points
- * Mail_Users
- * no_stdio_sockets
- * Output_Path
- * Priority
- * Rerunnable
- * Resource_List[.resource]
- * Shell_Path_List
- * stagein
- * stageout
- * umask
- * User_List
- * Variable_List
- * comment
- *
- * Read-only Job Attributes
- *
- * accounting_id
- * alt_id
- * array
- * array_id
- * array_index
- * array_indices_remaining
- * array_indices_submitted
- * array_state_count
- * ctime
- * etime
- * exec_host
- * egroup
- * euser
- * hashname
- * interactive
- * Job_Owner
- * job_state
- * mtime
- * qtime
- * queue
- * resources_used
- * run_count
- * schedselect
- * server
- * session_id
- *
- * Queue Attributes
- * acl_groups			string	""		The list of groups which may submit jobs to the queue
- * acl_group_enable 	boolean	false	Only allow jobs submitted from groups specified by the acl_groups parameter
- * acl_group_sloppy		boolean	false	acl_groups will be checked against all groups of which the job user is a member
- * acl_hosts			string	""		List of hosts that may submit jobs to the queue
- * acl_host_enable		boolean	false	Only allow jobs submitted from hosts specified by the acl_hosts parameter
- * acl_logic_or			boolean	false	User and group acls are logically OR'd together
- * acl_users			string	""		The list of users who may submit jobs to the queue
- * acl_user_enable		boolean	false	Only allow jobs submitted from users specified by the acl_users parameter
- * disallowed_types		string	""		List of job "types" that are not allowed in this queue
- * enabled				boolean	false 	The queue accepts new job submissions
- * keep_completed		integer	0		The number of seconds jobs should be held in the Completed state after exiting
- * kill_delay			integer	2		The number of seconds between sending a SIGTERM and a SIGKILL to a job being cancelled
- * max_queuable			integer	+INF	The maximum number of jobs allowed in the queue at any given time
- * max_running			integer	+INF	The maximum number of jobs in the queue allowed to run at any given time
- * max_user_queuable	integer	+INF	The maximum number of jobs, per user, allowed in the queue at any given time
- * max_user_run			integer	+INF	The maximum number of jobs, per user, in the queue allowed to run at any given time
- * priority				integer	+INF	The priority value associated with the queue.  DEFAULT: 0	qmgr -c "set queue batch priority=20"
- * queue_type			enum	e	 	The queue type (e=execution, r=route)
- * resources_available	string	""		The cumulative resources available to all jobs running in the queue
- * resources_default	string	""		Default resource requirements for jobs submitted to the queue
- * resources_max		string	""		The maximum resource limits for jobs submitted to the queue
- * resources_min		string	""		The minimum resource limits for jobs submitted to the queue
- * route_destinations	string	""		The potential destination queues for jobs submitted to the associated routing queue
- * started				boolean	false	Jobs in the queue are allowed to execute
- */
-/*
- * Proxy server states. The SHUTTING_DOWN state is used to
- * give the proxy a chance to send any pending events once
- * a QUIT command has been received.
- */
-#define STATE_INIT			0
-#define STATE_RUNNING		1
-#define STATE_SHUTTING_DOWN	2
-#define STATE_SHUTDOWN		3
-
-/*
- * RTEV codes must EXACTLY match org.eclipse.ptp.rtsystem.proxy.event.IProxyRuntimeEvent
- */
-#define RTEV_OFFSET						200
-
-/*
- * RTEV_ERROR codes are used internally in the PBS specific plugin
- */
-#define RTEV_ERROR_INIT			RTEV_OFFSET + 1000
-#define RTEV_ERROR_FINALIZE		RTEV_OFFSET + 1001
-#define RTEV_ERROR_SUBMIT		RTEV_OFFSET + 1002
-#define RTEV_ERROR_JOB			RTEV_OFFSET + 1003
-#define RTEV_ERROR_SERVER		RTEV_OFFSET + 1004
-#define RTEV_ERROR_NATTR		RTEV_OFFSET + 1007
-#define RTEV_ERROR_SIGNAL		RTEV_OFFSET + 1009
-#define RTEV_ERROR_FILTER		RTEV_OFFSET + 1010
-#define RTEV_ERROR_START_EVENTS	RTEV_OFFSET + 1011
-
-#define JOB_NAME_FMT			"job%02d"
-#define PBS_QUEUE_ATTR			"queue"
-#define PBS_POLL_INTERVAL		60000000 /* 60 seconds */
-#define PROXY_TIMEOUT			20000	 /* 20 ms */
-
-#define DEFAULT_HASH_SIZE				8192
-#define DEFAULT_FILTER_HASH_SIZE		32
-#define DEFAULT_FILTER_ATTR_HASH_SIZE	32
-#define DEFAULT_HOST					"localhost"
-#define DEFAULT_PROXY					"tcp"
-
-int PBS_Initialize(int, int, char **);
-int PBS_ModelDef(int, int, char **);
-int PBS_StartEvents(int, int, char **);
-int PBS_StopEvents(int, int, char **);
-int PBS_SubmitJob(int, int, char **);
-int PBS_TerminateJob(int, int, char **);
-int PBS_Quit(int, int, char **);
-int PBS_FilterEvents(int, int, char **);
-
-enum job_state {
-	JOB_CREATED,
-	JOB_NORMAL,
-	JOB_TERMINATING,
-	JOB_TERMINATED
-};
-typedef enum job_state	job_state;
-
-struct ptp_machine {
-	int		id;
-	char *	name;
-	List *	nodes;
-};
-typedef struct ptp_machine	ptp_machine;
-
-struct ptp_node {
-	int	 	id;
-	int		number;
-	char *	name;
-	char *	state;
-	char *	user;
-	char *	group;
-	char *	mode;
-};
-typedef struct ptp_node	ptp_node;
-
-struct ptp_process {
-	int		id;
-	int		node_id;
-	int		task_id;
-	int		pid;
-};
-typedef struct ptp_process	ptp_process;
-
-struct ptp_queue {
-	int		id;
-	char *	name;
-};
-typedef struct ptp_queue ptp_queue;
-
-struct ptp_job {
-	int 			ptp_jobid;		/* job ID as known by PTP */
-	char * 			pbs_jobid;		/* PBS job ID */
-	char *			jobsubid;		/* submission ID of job */
-	ptp_queue *		queue;			/* queue this job is in */
-	int				num_procs;		/* number of procs requested for program (debugger uses num_procs+1) */
-	bool			debug;			/* job is debug job */
-	job_state		state;			/* job state */
-	bool			iof;			/* job has i/o forwarding */
-	ptp_process **	procs;			/* procs for this job */
-	rangeset *		set;			/* range set of proc IDs */
-};
-typedef struct ptp_job ptp_job;
-
-struct ptp_filter {
-	Hash *	hash;		/* attributes to filter */
-	int		num_attrs;	/* number of attributes in hash */
-	bool	children;	/* apply filter to children */
-};
-typedef struct ptp_filter	ptp_filter;
-
-static int			gTransID = 0; /* transaction id for start of event stream, is 0 when events are off */
-static int			gBaseID = -1; /* base ID for event generation */
-static int			gLastID = 1; /* ID generator */
-static int 			proxy_state = STATE_INIT;
-static proxy_svr *	conn;
-static List *		gJobList;
-static Hash *		gJobHash;
-static Hash *		gFilters;
-static List *		gMachineList;
-static List *		gQueueList;
-static int			ptp_signal_exit;
-static int			debug_level = 0; /* 0 is off */
-static RETSIGTYPE	(*saved_signals[NSIG])(int);
-static int			stream;
-static char *		gUserName;
-
-extern char *		pbs_server;
-
-static proxy_svr_helper_funcs helper_funcs = {
-	NULL,					// newconn() - can be used to reject connections
-	NULL					// numservers() - if there are multiple servers, return the number
-};
-
-#define CMD_BASE	0
-
-static proxy_cmd	cmds[] = {
-	PBS_Quit,
-	PBS_Initialize,
-	PBS_ModelDef,
-	PBS_StartEvents,
-	PBS_StopEvents,
-	PBS_SubmitJob,
-	PBS_TerminateJob,
-	PBS_FilterEvents
-};
-
-static proxy_commands command_tab = {
-	CMD_BASE,
-	sizeof(cmds)/sizeof(proxy_cmd),
-	cmds
-};
-
-static struct option longopts[] = {
-	{"proxy",			required_argument,	NULL, 	'P'}, 
-	{"port",			required_argument,	NULL, 	'p'}, 
-	{"host",			required_argument,	NULL, 	'h'}, 
-	{"debug",			required_argument,	NULL, 	'd'}, 
-	{NULL,				0,					NULL,	0}
-};
-
-/*
- * Generate a model element ID
- */
-static int
-generate_id(void)
-{
-	return gBaseID + gLastID++;
-}
-
-/*
- * Create a new machine.
- */
-static ptp_machine *
-new_machine(char *name)
-{
-	ptp_machine *	m = (ptp_machine *)malloc(sizeof(ptp_machine));
-	m->id = generate_id();
-	m->name = strdup(name);
-	m->nodes = NewList();
-    AddToList(gMachineList, (void *)m);
-    return m;
-}
-
-static void
-free_machine(ptp_machine *m)
-{
-	RemoveFromList(gMachineList, (void *)m);
-	free(m->name);
-	free(m);
-}
-
-/*
- * Create a new node.
- */
-static ptp_node *
-new_node(ptp_machine *mach, char *name, char *state, char *user, char *group, char *mode)
-{
-	static int node_number = 0;
-	ptp_node *	n = (ptp_node *)malloc(sizeof(ptp_node));
-	
-	memset((char *)n, 0, sizeof(ptp_node));
-	n->id = generate_id();
-	n->number = node_number++;
-	if (name != NULL)
-		n->name = strdup(name);
-	if (state != NULL)
-		n->state = strdup(state);
-	if (user != NULL)
-		n->user = strdup(user);
-	if (group != NULL)
-		n->group = strdup(group);
-	if (mode != NULL)
-		n->mode = strdup(mode);
-    AddToList(mach->nodes, (void *)n);
-    return n;
-}
-
-/*
- * Very expensive!
- */
-static ptp_node *
-find_node_by_name(char *name)
-{
-	ptp_machine *	m;
-	ptp_node *		n;
-	
-	for (SetList(gMachineList); (m = (ptp_machine *)GetListElement(gMachineList)) != NULL; ) {
-		for (SetList(m->nodes); (n = (ptp_node *)GetListElement(m->nodes)) != NULL; ) {
-			if (strcmp(name, n->name) == 0)
-				return n;
-		}
-	}
-	
-	return NULL;
-}
-
-/*
- * Create a new process.
- */
-static ptp_process *
-new_process(ptp_job *job, int node_id, int task_id, int pid)
-{
-	ptp_process *	p = (ptp_process *)malloc(sizeof(ptp_process));
-	p->id = generate_id();
-	p->node_id = node_id;
-	p->task_id = task_id;
-	p->pid = pid;
-    job->procs[task_id] = p;
-    insert_in_rangeset(job->set, p->id);
-    return p;
-}
-
-static void
-free_process(ptp_process *p)
-{
-	free(p);
-}
-
-static ptp_process *
-find_process(ptp_job *job, int task_id)
-{
-	if (task_id < 0 || task_id >= job->num_procs)
-		return NULL;
-
-	return job->procs[task_id];
-}
-
-static ptp_queue *
-new_queue(char *name) {
-	ptp_queue *	q = (ptp_queue *)malloc(sizeof(ptp_queue));
-	q->id = generate_id();
-	q->name = strdup(name);
-	AddToList(gQueueList, (void *)q);
-	return q;
-}
-
-static void
-free_queue(ptp_queue *q)
-{
-	free(q->name);
-	free(q);
-}
-
-static ptp_queue *
-find_queue_by_id(int id)
-{
-	ptp_queue *	q;
-
-	for (SetList(gQueueList); (q = (ptp_queue *)GetListElement(gQueueList)) != NULL; ) {
-		if (q->id == id) {
-			return q;
-		}
-	}
-	return NULL;
-}
-
-static ptp_queue *
-find_queue_by_name(char *name)
-{
-	ptp_queue *	q;
-
-	for (SetList(gQueueList); (q = (ptp_queue *)GetListElement(gQueueList)) != NULL; ) {
-		if (strcmp(q->name, name) == 0) {
-			return q;
-		}
-	}
-	return NULL;
-}
-
-/*
- * Find the name of the queue from the PBS job attributes
- */
-static char *
-find_pbs_queue_name(struct attrl *attrs)
-{
-	struct attrl *attr;
-
-	for (attr = attrs; attr != NULL; attr = attr->next) {
-		if (strcmp(attr->name, PBS_QUEUE_ATTR) == 0) {
-			return attr->value;
-		}
-	}
-
-	return NULL;
-}
-
-/*
- * Keep a list of the jobs that we have created. If they are
- * debug jobs, keep the debug jobid as well.
- */
-static ptp_job *
-new_job(int num_procs, bool debug, ptp_queue *queue, char *jobsubid, char *pbs_jobid)
-{
-	ptp_job *	j = (ptp_job *)malloc(sizeof(ptp_job));
-	j->queue = queue;
-	j->ptp_jobid = generate_id();
-	j->pbs_jobid = strdup(pbs_jobid);
-	j->jobsubid = NULL;
-	if (jobsubid != NULL) {
-		j->jobsubid = strdup(jobsubid);
-	}
-    j->num_procs = 0;
-    j->procs = NULL;
-    j->debug = debug;
-    j->state = JOB_CREATED;
-    j->iof = false;
-    j->set = new_rangeset();
-    //j->procs = (ptp_process **)malloc(sizeof(ptp_process *) * num_procs);
-    //memset(j->procs, 0, sizeof(ptp_process *) * num_procs);
-    AddToList(gJobList, (void *)j);
-    HashInsert(gJobHash, HashCompute(pbs_jobid, strlen(pbs_jobid)), (void *)j);
-    return j;
-}
-
-static void
-free_job(ptp_job *j)
-{
-	int	i;
-	
-	RemoveFromList(gJobList, (void *)j);
-	HashRemove(gJobHash, HashCompute(j->pbs_jobid, strlen(j->pbs_jobid)));
-	free(j->pbs_jobid);
-	free(j->jobsubid);
-	for (i = 0; i < j->num_procs; i++) {
-		if (j->procs[i] != NULL)
-			free_process(j->procs[i]);
-	}
-	if (j->procs != NULL) {
-		free(j->procs);
-	}
-	free_rangeset(j->set);
-	free(j);
-}
-
-/*
- * Find a job on the list using the PTP job ID
- */
-static ptp_job *
-find_job_by_id(int jobid)
-{
-	ptp_job *	j;
-	
-	for (SetList(gJobList); (j = (ptp_job *)GetListElement(gJobList)) != NULL; ) {
-		if (j->ptp_jobid == jobid) {
-			return j;
-		}
-	}
-	return NULL;
-}
-
-static int
-get_pbs_attr_count(struct attrl *attrs)
-{
-	int 			count = 0;
-	struct attrl *	attr;
-
-	for (attr = attrs; attr != NULL; attr = attr->next) {
-		count++;
-	}
-
-	return count;
-}
-
-static void
-add_pbs_attributes(proxy_msg *m, struct attrl *attrs)
-{
-	struct attrl *attr;
-
-	for (attr = attrs; attr != NULL; attr = attr->next) {
-		proxy_add_string_attribute(m, attr->name, attr->value);
-	}
-}
-
-static void
-shutdown_pbs()
-{
-	pbs_disconnect(stream);
-}
-
-static void
-sendOKEvent(int trans_id)
-{
-	proxy_svr_queue_msg(conn, proxy_ok_event(trans_id));
-}
-
-static void
-sendShutdownEvent(int trans_id)
-{
-	proxy_svr_queue_msg(conn, proxy_shutdown_event(trans_id));
-}
-
-static void
-sendMessageEvent(int trans_id, char *level, int code, char *fmt, ...)
-{
-	va_list		ap;
-
-	va_start(ap, fmt);
-	proxy_svr_queue_msg(conn, proxy_message_event(trans_id, level, code, fmt, ap));
-	va_end(ap);
-}
-
-static void
-sendErrorEvent(int trans_id, int code, char *fmt, ...)
-{
-	va_list		ap;
-
-	va_start(ap, fmt);
-	if (debug_level > 0) {
-		fprintf(stderr, "sendErrorEvent(%d, %d, ", trans_id, code);
-		vfprintf(stderr, fmt, ap);
-		fprintf(stderr, ")\n");
-		fflush(stderr);
-	}
-	proxy_svr_queue_msg(conn, proxy_error_event(trans_id, code, fmt, ap));
-	va_end(ap);
-}
-
-static void
-sendJobSubErrorEvent(int trans_id, char *jobSubId, char *msg)
-{
-	proxy_svr_queue_msg(conn, proxy_submitjob_error_event(trans_id, jobSubId, RTEV_ERROR_SUBMIT, msg));
-}
-
-static void
-sendJobTerminateErrorEvent(int trans_id, int id, char *msg)
-{
-	char *	job_id;
-	
-	asprintf(&job_id, "%d", id);
-	
-	proxy_svr_queue_msg(conn, proxy_terminatejob_error_event(trans_id, job_id, RTEV_ERROR_JOB, msg));
-}
-
-static void
-sendNewMachineEvent(int trans_id, int id, char *name)
-{
-	char *	rm_id;
-	char *	machine_id;
-	
-	asprintf(&rm_id, "%d", gBaseID);	
-	asprintf(&machine_id, "%d", id);	
-	
-	proxy_svr_queue_msg(conn, proxy_new_machine_event(trans_id, rm_id, machine_id, name, PTP_MACHINE_STATE_UP));
-	
-	free(machine_id);
-	free(rm_id);
-}
-
-static void
-sendNewQueueEvent(int trans_id, int id, char *name, struct attrl *attrs)
-{
-	char *		rm_id;
-	char *		queue_id;
-	proxy_msg *	m;
-
-	asprintf(&rm_id, "%d", gBaseID);
-	asprintf(&queue_id, "%d", id);
-
-    m = proxy_new_queue_event(trans_id, rm_id, queue_id, name, get_pbs_attr_count(attrs) + 1);
-    proxy_msg_add_keyval_string(m, PTP_QUEUE_STATE_ATTR, PTP_QUEUE_STATE_NORMAL);
-    add_pbs_attributes(m, attrs);
-	proxy_svr_queue_msg(conn, m);
-
-	free(queue_id);
-	free(rm_id);
-}
-
-static int
-num_node_attrs(ptp_node *node)
-{
-	int	cnt = 0;
-	if (node->number >= 0)
-		cnt++;
-	return cnt;	
-}
-
-/*
- * NOTE: sending a NODE_NUMBER_ATTR will enable the node number ruler in the machines view.
- */
-static void
-add_node_attrs(proxy_msg *m, ptp_node *node)
-{
-	if (node->number >= 0)
-		proxy_add_int_attribute(m, PTP_NODE_NUMBER_ATTR, node->number);
-}
-
-static ptp_filter *
-new_filter()
-{
-	ptp_filter *	f = (ptp_filter *)malloc(sizeof(ptp_filter));
-
-	f->hash = HashCreate(DEFAULT_FILTER_ATTR_HASH_SIZE);
-	f->num_attrs = 0;
-	f->children = false;
-
-	return f;
-}
-
-static void
-add_filter_attribute(ptp_filter *f, char *attr)
-{
-	char *	name = proxy_copy_attribute_name_filter(attr);
-	char *	value = proxy_get_attribute_value_str(attr);
-
-	if (name != NULL && value != NULL) {
-		regex_t *	reg = (regex_t *)malloc(sizeof(regex_t));
-		int idx = HashCompute(name, strlen(name));
-		if (regcomp(reg, value, REG_EXTENDED|REG_NOSUB) == 0) {
-			HashInsert(f->hash, idx, reg);
-			f->num_attrs++;
-		} else {
-			free(reg);
-		}
-		free(name);
-	}
-}
-
-static void
-free_filter(ptp_filter *f)
-{
-	HashDestroy(f->hash, free);
-	free(f);
-}
-
-static bool
-match_filter_str(int id, bool is_child, struct attrl *attrs)
-{
-	struct attrl *	attr;
-	ptp_filter *	f = (ptp_filter *)HashSearch(gFilters, id);
-
-	if (f != NULL && (f->children | !is_child)) {
-		for (attr = attrs; attr != NULL; attr = attr->next) {
-			regex_t	*	reg = (regex_t *)HashFind(f->hash, attr->name);
-			if (reg != NULL && regexec(reg, attr->value, 0, NULL, 0) != 0) {
-				return false;
-			}
-		}
-	}
-
-	return true;
-}
-
-void
-update_filter(int id, ptp_filter *nf)
-{
-	ptp_filter *	f = (ptp_filter *)HashSearch(gFilters, id);
-
-	if (f != NULL) {
-		/*
-		 * If no attributes specified, remove existing filter otherwise
-		 * remove current filter and replace with new
-		 */
-		HashRemove(gFilters, id);
-		free_filter(f);
-
-		if (nf->num_attrs == 0) {
-			free_filter(nf);
-			return;
-		}
-	}
-
-	HashInsert(gFilters, id, (void *)nf);
-}
-
-static void
-sendNewJobEvent(int trans_id, ptp_job *j)
-{
-	char *		job_id;
-	char *		queue_id;
-	proxy_msg *	m;
-
-	asprintf(&job_id, "%d", j->ptp_jobid);
-	asprintf(&queue_id, "%d", j->queue->id);
-
-	m = proxy_new_job_event(trans_id, queue_id, job_id, j->pbs_jobid, PTP_JOB_STATE_STARTING, j->jobsubid);
-	proxy_svr_queue_msg(conn, m);
-
-	free(job_id);
-	free(queue_id);
-}
-
-static void
-sendNewNodeEvent(int trans_id, int machid, ptp_machine *mach)
-{
-	ptp_node *	n;
-	proxy_msg *	m;
-	char *		machine_id;
-	char *		node_id;
-	
-	asprintf(&machine_id, "%d", machid);
-	
-	m = proxy_new_node_event(trans_id, machine_id, SizeOfList(mach->nodes));
-	
-	for (SetList(mach->nodes); (n = (ptp_node *)GetListElement(mach->nodes)) != NULL; ) {
-		asprintf(&node_id, "%d", n->id);
-		proxy_add_node(m, node_id, n->name, n->state, num_node_attrs(n));
-		add_node_attrs(m, n);
-		free(node_id);
-	}
-	
-	proxy_svr_queue_msg(conn, m);
-	
-	free(machine_id);
-}
-
-static void
-sendNewProcessEvent(int trans_id, int jobid, ptp_process *p, char *state)
-{
-	proxy_msg *	m;
-	char *		job_id;
-	char *		proc_id;
-	char *		name;
-	
-	asprintf(&job_id, "%d", jobid);
-	asprintf(&proc_id, "%d", p->id);
-	asprintf(&name, "%d",  p->task_id);
-	
-	m = proxy_new_process_event(trans_id, job_id, 1);
-	proxy_add_process(m, proc_id, name, state, 3);
-	proxy_add_int_attribute(m, PTP_PROC_NODEID_ATTR, p->node_id);
-	proxy_add_int_attribute(m, PTP_PROC_INDEX_ATTR, p->task_id);
-	proxy_add_int_attribute(m, PTP_PROC_PID_ATTR, p->pid);
-	
-	proxy_svr_queue_msg(conn, m);
-	
-	free(job_id);
-	free(proc_id);
-	free(name);
-}
-
-static void
-sendProcessStateChangeEvent(int trans_id, ptp_job *j, char *state)
-{
-	proxy_msg *	m;
-	
-	if (j == NULL || j->num_procs == 0)
-		return;
-		
-	m = proxy_process_change_event(trans_id, rangeset_to_string(j->set), 1);
-	proxy_add_string_attribute(m, PTP_PROC_STATE_ATTR, state);
-	proxy_svr_queue_msg(conn, m);
-}
-
-static void
-sendRMAttributesEvent(int trans_id, struct attrl *attr)
-{
-	proxy_msg *	m;
-	char *rm_id;
-
-	asprintf(&rm_id, "%d", gBaseID);
-
-	m = proxy_rm_change_event(trans_id, rm_id, get_pbs_attr_count(attr));
-	add_pbs_attributes(m, attr);
-	proxy_svr_queue_msg(conn, m);
-
-	free(rm_id);
-}
-	
-static void
-sendJobChangeEvent(int trans_id, ptp_job *j, struct attrl *attrs)
-{
-	char *	job_id;
-	proxy_msg *	m;
-
-	asprintf(&job_id, "%d", j->ptp_jobid);
-	m = proxy_job_change_event(trans_id, job_id, get_pbs_attr_count(attrs));
-	add_pbs_attributes(m, attrs);
-	proxy_svr_queue_msg(conn, m);
-	free(job_id);
-}
-
-static void
-sendJobStateChangeEvent(int trans_id, int jobid, char *state)
-{
-	char *		job_id;
-	proxy_msg *	m;
-	
-	asprintf(&job_id, "%d", jobid);
-
-	m = proxy_job_change_event(trans_id, job_id, 1);
-	proxy_add_string_attribute(m, PTP_JOB_STATE_ATTR, state);
-	proxy_svr_queue_msg(conn, m);
-	
-	free(job_id);
-}
-
-static void
-sendProcessChangeEvent(int trans_id, ptp_process *p, int node_id, int task_id, int pid)
-{
-	int			cnt = 0;
-	char *		proc_id;
-	proxy_msg *	m;
-	
-	if (p->node_id != node_id || p->task_id != task_id || p->pid != pid) {
-		if (p->node_id != node_id) {
-			cnt++;	
-		}
-		if (p->task_id != task_id) {
-			cnt++;	
-		}
-		if (p->pid != pid) {
-			cnt++;	
-		}
-		
-		asprintf(&proc_id, "%d", p->id);
-
-		m = proxy_process_change_event(trans_id, proc_id, cnt);
-		
-		if (p->node_id != node_id) {
-			p->node_id = node_id;
-			proxy_add_int_attribute(m, PTP_ELEMENT_ID_ATTR, node_id);
-		}
-		if (p->task_id != task_id) {
-			p->task_id = task_id;
-			proxy_add_int_attribute(m, PTP_PROC_INDEX_ATTR, task_id);
-		}
-		if (p->pid != pid) {
-			p->pid = pid;
-			proxy_add_int_attribute(m, PTP_PROC_PID_ATTR, pid);
-		}
-		
-		proxy_svr_queue_msg(conn, m);
-		
-		free(proc_id);
-	}
-}
-
-/*
- * TODO: optimize this so that we don't send one event for
- * every process, even if the output is identical.
- */
-static void
-sendProcessOutputEvent(int trans_id, int procid, char *output)
-{
-	char *		proc_id;
-	proxy_msg *	m;
-	
-	asprintf(&proc_id, "%d", procid);
-	
-	m = proxy_process_change_event(trans_id, proc_id, 1);
-	proxy_add_string_attribute(m, PTP_PROC_STDOUT_ATTR, output);
-	proxy_svr_queue_msg(conn, m);
-	
-	free(proc_id);	
-}
-
-/*
- * Set initial filter on queues
- */
-static void
-initialize_queue_filter(ptp_queue *q)
-{
-	char *			attr;
-	ptp_filter *	f = new_filter();
-
-	f->children = true;
-	asprintf(&attr, "Job_OwnerFilter=%s@.*", gUserName);
-	add_filter_attribute(f, attr);
-	update_filter(q->id, f);
-	free(attr);
-}
-
-/******************************
- * START OF DISPATCH ROUTINES *
- ******************************/
-int
-PBS_Initialize(int trans_id, int nargs, char **args)
-{
-	int						i;
-	ptp_machine *			mach;
-	struct batch_status *	s;
-	struct batch_status *	status;
-	
-	if (debug_level > 0) {
-		fprintf(stderr, "PBS_Initialize (%d):\n", trans_id); fflush(stderr);
-	}
-	
-	if (proxy_state != STATE_INIT) {
-		sendErrorEvent(trans_id, RTEV_ERROR_INIT, "already initialized");
-		return PTP_PROXY_RES_OK;
-	}
-	
-	/*
-	 * Process arguments for the init command
-	 */
-	for (i = 0; i < nargs; i++) {
-		if (proxy_test_attribute(PTP_PROTOCOL_VERSION_ATTR, args[i])) {
-			if (strcmp(proxy_get_attribute_value_str(args[i]), WIRE_PROTOCOL_VERSION) != 0) {
-				sendErrorEvent(trans_id, RTEV_ERROR_INIT, "wire protocol version \"%s\" not supported", args[0]);
-				return PTP_PROXY_RES_OK;
-			}
-		} else if (proxy_test_attribute(PTP_BASE_ID_ATTR, args[i])) {
-			gBaseID = proxy_get_attribute_value_int(args[i]);
-		}
-	}
-
-	/*
-	 * It's an error if no base ID was supplied
-	 */
-	if (gBaseID < 0) {
-		sendErrorEvent(trans_id, RTEV_ERROR_INIT, "no base ID supplied");
-		return PTP_PROXY_RES_OK;
-	}
-	
-	stream = pbs_connect(NULL);
-	if (stream < 0) {
-		sendErrorEvent(trans_id, RTEV_ERROR_INIT, "could not connect to PBS daemon");
-		return PTP_PROXY_RES_OK;
-	}
-
-	status = pbs_statserver(stream, NULL, NULL);
-	if (status == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_INIT, pbs_geterrmsg(stream));
-		return PTP_PROXY_RES_OK;
-	}
-
-	/*
-	 * Create the server machine
-	 */
-	mach = new_machine(status->name);
-
-	pbs_statfree(status);
-
-	/*
-	 * Get queues and queue attributes
-	 */
-	status = pbs_statque(stream, NULL, NULL, NULL);
-	if (status == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_INIT, pbs_geterrmsg(stream));
-		return PTP_PROXY_RES_OK;
-	}
-
-	for (s=status; s != NULL; s = s->next) {
-		ptp_queue * q = new_queue(s->name);
-		initialize_queue_filter(q);
-	}
-
-	pbs_statfree(status);
-
-	proxy_state = STATE_RUNNING;
-		
-	sendOKEvent(trans_id);
-		
-	return PTP_PROXY_RES_OK;
-}
-
-/**
- * Initiate the model definition phase
- */
-int
-PBS_ModelDef(int trans_id, int nargs, char **args)
-{
-	if (debug_level > 0) {
-		fprintf(stderr, "PBS_ModelDef (%d):\n", trans_id); fflush(stderr);
-	}
-	
-	/*
-	 * Send attribute definitions
-	 */
-	/*
-	 * Send default filters
-	 */
-	sendOKEvent(trans_id);
-	return PTP_PROXY_RES_OK;
-}
-
-/**
- * Stop polling for LSF change events
- */
- int
-PBS_StopEvents(int trans_id, int nargs, char **args)
-{
-	if (debug_level > 0) {
-		fprintf(stderr, "  PBS_StopEvents (%d):\n", trans_id); fflush(stderr);
-	}
-	/* notification that start events have completed */
-	sendOKEvent(gTransID);
-	gTransID = 0;
-	sendOKEvent(trans_id);
-	return PTP_PROXY_RES_OK;
-}
-
-/**
- * Submit a job with the given executable path and arguments (remote call from a client proxy)
- *
- * TODO - what about queues, should there be a LSF_Submit?
- */
-int
-PBS_SubmitJob(int trans_id, int nargs, char **args)
-{
-	int						i;
-	int						a;
-	int						debug = false;
-	int						num_args = 0;
-	int						num_env = 0;
-	int						debug_argc = 0;
-	char *					jobsubid = NULL;
-	char *					pbs_jobid = NULL;
-	char *					queue_name = NULL;
-	char *					full_path;
-	char *					pgm_name = NULL;
-	char *					cwd = NULL;
-	char *					exec_path = NULL;
-	char *					debug_exec_name = NULL;
-	char *					debug_exec_path = NULL;
-	char *					debug_full_path;
-	char **					debug_args = NULL;
-	char **					env = NULL;
-	ptp_queue *				queue;
-
-	if (debug_level > 0) {
-		fprintf(stderr, "  PBS_SubmitJob (%d):\n", trans_id);
-	}
-
-	for (i = 0; i < nargs; i++) {
-		if (debug_level > 0) {
-			fprintf(stderr, "\t%s\n", args[i]);
-		}
-		if (proxy_test_attribute(PTP_JOB_SUB_ID_ATTR, args[i])) {
-			jobsubid = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(PTP_QUEUE_ID_ATTR, args[i])) {
-			queue_name = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(PTP_JOB_EXEC_NAME_ATTR, args[i])) {
-			pgm_name = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(PTP_JOB_EXEC_PATH_ATTR, args[i])) {
-			exec_path = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(PTP_JOB_WORKING_DIR_ATTR, args[i])) {
-			cwd = proxy_get_attribute_value_str(args[i]);
-		} else if (proxy_test_attribute(PTP_JOB_PROG_ARGS_ATTR, args[i])) {
-			num_args++;
-		} else if (proxy_test_attribute(PTP_JOB_ENV_ATTR, args[i])) {
-			num_env++;
-		} else if (proxy_test_attribute(PTP_JOB_DEBUG_ARGS_ATTR, args[i])) {
-			debug_argc++;
-		} else if (proxy_test_attribute(PTP_JOB_DEBUG_FLAG_ATTR, args[i])) {
-			debug = proxy_get_attribute_value_bool(args[i]);
-		}
-	}
-
-	if (debug_level > 0) {
-		fflush(stderr);
-	}
-	
-	if (jobsubid == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_SUBMIT, "missing ID on job submission");
-		return PTP_PROXY_RES_OK;
-	}
-	
-	if (proxy_state != STATE_RUNNING) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "must call INIT first");
-		return PTP_PROXY_RES_OK;
-	}
-	
-	if (queue_name == NULL) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "no queue specified");
-		return PTP_PROXY_RES_OK;
-	}
-
-	if ((queue = find_queue_by_name(queue_name)) == NULL) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "unknown queue specified");
-		return PTP_PROXY_RES_OK;
-	}
-
-	if (nargs < 1) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "incorrect arg count");
-		return PTP_PROXY_RES_OK;
-	}
-	
-	/*
-	 * Do some checking first
-	 */
-	 
-	if (pgm_name == NULL) {
-		sendJobSubErrorEvent(trans_id, jobsubid, "Must specify a program name");
-		return PTP_PROXY_RES_OK;
-	}
-	
-	/*
-	 * Get supplied environment. It is used to locate executable if necessary.
-	 */
-	
-	if (num_env > 0) {
-		env = (char **)malloc((num_env + 1) * sizeof(char *));
-		for (i = 0, a = 0; i < nargs; i++) {
-			if (proxy_test_attribute(PTP_JOB_ENV_ATTR, args[i]))
-				env[a++] = strdup(proxy_get_attribute_value_str(args[i]));
-		}
-		env[a] = NULL;
-	}
-		
-	/*
-	 * If no path is specified, then try to locate executable.
-	 */		
-	if (exec_path == NULL) {
-		full_path = pgm_name;
-	} else {
-		asprintf(&full_path, "%s/%s", exec_path, pgm_name);
-	}
-	
-	if (access(full_path, X_OK) < 0) {
-		sendJobSubErrorEvent(trans_id, jobsubid, strerror(errno));
-		return PTP_PROXY_RES_OK;
-	}
-	
-	if (debug) {		
-		debug_argc++;
-		debug_args = (char **)malloc((debug_argc+1) * sizeof(char *));
-		for (i = 0, a = 1; i < nargs; i++) {
-			if (proxy_test_attribute(PTP_JOB_DEBUG_ARGS_ATTR, args[i])) {
-				debug_args[a++] = proxy_get_attribute_value_str(args[i]);
-			} else if (proxy_test_attribute(PTP_JOB_DEBUG_EXEC_NAME_ATTR, args[i])) {
-				debug_exec_name = proxy_get_attribute_value_str(args[i]);
-			} else if (proxy_test_attribute(PTP_JOB_DEBUG_EXEC_PATH_ATTR, args[i])) {
-				debug_exec_path = proxy_get_attribute_value_str(args[i]);
-			}
-		}
-		debug_args[a] = NULL;
-		
-		/*
-		 * If no path is specified, then try to locate executable.
-		 */		
-		if (debug_exec_path == NULL) {
-			debug_full_path = debug_exec_name;
-		} else {
-			asprintf(&debug_full_path, "%s/%s", debug_exec_path, debug_exec_name);
-		}
-		
-		if (access(debug_full_path, X_OK) < 0) {
-			sendJobSubErrorEvent(trans_id, jobsubid, strerror(errno));
-			return PTP_PROXY_RES_OK;
-		}
-
-		debug_args[0] = strdup(debug_full_path);
-	}
-
-	/* app_jobid = pbs_submit(stream, ...); */
-	
-	if (pbs_jobid == NULL) {
-		sendJobSubErrorEvent(trans_id, jobsubid, pbs_geterrmsg(stream));
-		return PTP_PROXY_RES_OK;
-	}
-	
-	new_job(0, false, queue, jobsubid, pbs_jobid);
-
-	/*
-	 * Send ok for job submission.
-	 */	
-	sendOKEvent(trans_id);
-	
-	return PTP_PROXY_RES_OK;
-}
-
-/* 
- * terminate a job, given a jobid 
- */
-int
-PBS_TerminateJob(int trans_id, int nargs, char **args)
-{
-	int			i;
-	int			jobid = -1;
-	ptp_job *	j;
-	
-	if (proxy_state != STATE_RUNNING) {
-		sendErrorEvent(trans_id, RTEV_ERROR_JOB, "Must call INIT first");
-		return PTP_PROXY_RES_OK;
-	}
-	
-	for (i = 0; i < nargs; i++) {
-		if (proxy_test_attribute(PTP_JOB_ID_ATTR, args[i])) {
-			jobid = proxy_get_attribute_value_int(args[i]);
-		}
-	}
-	
-	if (jobid < 0) {
-		sendJobTerminateErrorEvent(trans_id, jobid, "Invalid job ID");
-		return PTP_PROXY_RES_OK;
-	}
-	
-	if ((j = find_job_by_id(jobid)) != NULL) {
-		if (j->state == JOB_TERMINATING) {
-			sendJobTerminateErrorEvent(trans_id, jobid, "Job termination already requested");
-			return PTP_PROXY_RES_OK;
-		}
-		
-		j->state = JOB_TERMINATING;
-
-		/* pbs_terminate(j->pbs_jobid); */
-		
-		sendOKEvent(trans_id);
-	}
-	
-	return PTP_PROXY_RES_OK;
-}
-
-/*
- * Enables sending of events. The first thing that must be sent is a
- * description of the model. This comprises new model element events
- * for each element in the model. Once the model description has been
- * sent, model change events will be sent as detected.
- * 
- */
- int
-PBS_StartEvents(int trans_id, int nargs, char **args)
-{
-	ptp_machine *			mach;
-	struct batch_status *	s;
-	struct batch_status *	status;
-	
-	if (debug_level > 0) {
-		fprintf(stderr, "  PBS_StartEvents (%d):\n", trans_id); fflush(stderr);
-	}
-
-	if (proxy_state != STATE_RUNNING) {
-		sendErrorEvent(trans_id, RTEV_ERROR_START_EVENTS, "must call INIT first");
-		return PTP_PROXY_RES_OK;
-	}
-
-	gTransID = trans_id;
-	
-	/*
-	 * Send the RM attributes
-	 */
-	status = pbs_statserver(stream, NULL, NULL);
-	if (status == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_START_EVENTS, pbs_geterrmsg(stream));
-		return PTP_PROXY_RES_OK;
-	}
-
-	sendRMAttributesEvent(trans_id, status->attribs);
-
-	/*
-	 * Send the machines
-	 */
-	for (SetList(gMachineList); (mach = (ptp_machine *)GetListElement(gMachineList)) != NULL; ) {
-		sendNewMachineEvent(trans_id, mach->id, mach->name);
-	}
-
-	pbs_statfree(status);
-
-	/*
-	 * Send queues and queue attributes
-	 */
-	status = pbs_statque(stream, NULL, NULL, NULL);
-	if (status == NULL) {
-		sendErrorEvent(trans_id, RTEV_ERROR_START_EVENTS, pbs_geterrmsg(stream));
-		return PTP_PROXY_RES_OK;
-	}
-
-	for (s=status; s != NULL; s = s->next) {
-		ptp_queue * q = find_queue_by_name(s->name);
-		if (q != NULL) {
-			sendNewQueueEvent(trans_id, q->id, q->name, s->attribs);
-		}
-	}
-
-	pbs_statfree(status);
-
-	if (debug_level > 0) {
-		fprintf(stderr, "  end PBS_StartEvents (%d):\n", trans_id); fflush(stderr);
-	}
-
-	return PTP_PROXY_RES_OK;
-}
-
-int
-PBS_Quit(int trans_id, int nargs, char **args)
-{
-	int old_state = proxy_state;
-	
-	if (debug_level > 0) {
-		fprintf(stderr, "PBS_Quit called!\n"); fflush(stderr);
-	}
-	
-	proxy_state = STATE_SHUTTING_DOWN;
-
-	if (old_state == STATE_RUNNING) {
-		shutdown_pbs();
-	}
-	
-	sendShutdownEvent(trans_id);
-	
-	return PTP_PROXY_RES_OK;
-}
-
-int
-PBS_FilterEvents(int trans_id, int nargs, char **args)
-{
-	int				i;
-	int				id = 0;
-	bool			filter_children = false;
-	ptp_filter *	f;
-
-	if (debug_level > 0) {
-		fprintf(stderr, "  PBS_FilterEvents (%d):\n", trans_id); fflush(stderr);
-	}
-
-	f = new_filter();
-
-	for (i = 0; i < nargs; i++) {
-		if (proxy_test_attribute(PTP_ELEMENT_ID_ATTR, args[i])) {
-			id = atoi(proxy_get_attribute_value_str(args[i]));
-		} else if (proxy_test_attribute(PTP_FILTER_CHILDREN_ATTR, args[i])) {
-			filter_children = proxy_get_attribute_value_bool(args[i]);
-		} else {
-			add_filter_attribute(f, args[i]);
-		}
-	}
-
-	if (id == 0) {
-		sendErrorEvent(trans_id, RTEV_ERROR_FILTER, "no element ID specified");
-		return PTP_PROXY_RES_OK;
-	}
-
-	f->children = filter_children;
-
-	update_filter(id, f);
-
-	return PTP_PROXY_RES_OK;
-}
-
-static int
-poll_pbs()
-{
-	int						new_jobs = 0;
-	int						changed_jobs = 0;
-	int						removed_jobs = 0;
-	HashEntry *				h;
-	Hash *					tmpJobHash;
-	ptp_job *				j;
-	struct batch_status *	status;
-	struct batch_status *	s;
-
-	status = pbs_statjob(stream, NULL, NULL, NULL);
-	if (status < 0) {
-		if (debug_level > 0) {
-			fprintf(stderr, "pbs_statjob: %s\n", pbs_geterrmsg(stream));
-		}
-		return -1;
-	}
-
-	/*
-	 * Create tmp job hash
-	 * Create tmp job list
-	 * foreach (job in status) {
-	 * 	add job and attributes to tmp job hash
-	 *  if (job not in job hash) {
-	 *  	add to tmp job list
-	 *  }
-	 * }
-	 * foreach (job in job hash) {
-	 * 	if job does not exist in tmp hash, remove job
-	 * }
-	 * foreach (job in tmp job list) {
-	 * 	add to job hash
-	 * }
-	 */
-	tmpJobHash = HashCreate(DEFAULT_HASH_SIZE);
-
-	for (s = status; s != NULL; s = s->next) {
-		int idx = HashCompute(s->name, strlen(s->name));
-		HashInsert(tmpJobHash, idx, (void *)s);
-	}
-
-	for (HashSet(gJobHash); (h = HashGet(gJobHash)) != NULL; ) {
-		j = (ptp_job *)h->h_data;
-		if (HashFind(tmpJobHash, j->pbs_jobid) == NULL) {
-			sendJobStateChangeEvent(gTransID, j->ptp_jobid, PTP_JOB_STATE_COMPLETED);
-			//sendRemoveJobEvent(gTransID, j);
-			removed_jobs++;
-		}
-	}
-
-	for (HashSet(tmpJobHash); (h = HashGet(tmpJobHash)) != NULL; ) {
-		j = (ptp_job *)HashSearch(gJobHash, h->h_hval);
-		s = (struct batch_status *)h->h_data;
-		if (j == NULL) {
-			char * queue_name = NULL;
-			ptp_queue * queue = NULL;
-
-			queue_name = find_pbs_queue_name(s->attribs);
-
-			if (queue_name == NULL || ((queue = find_queue_by_name(queue_name)) == NULL)) {
-				break;
-			}
-
-			/*
-			 * Check for queue filters
-			 */
-			if (match_filter_str(queue->id, true, s->attribs)) {
-				j = new_job(0, false, queue, NULL, s->name);
-
-				if (debug_level > 0) {
-					fprintf(stderr, "creating new job for %s\n", s->name); fflush(stderr);
-				}
-			} else if (debug_level > 0) {
-				fprintf(stderr, "filtered job %s\n", s->name); fflush(stderr);
-			}
-		}
-		if (j->state == JOB_CREATED) {
-			sendNewJobEvent(gTransID, j);
-			j->state = JOB_NORMAL;
-			new_jobs++;
-		}
-		changed_jobs++;
-	}
-
-	if (debug_level > 0) {
-		fprintf(stderr, "poll_pbs: new=%d, changed=%d, removed=%d\n", new_jobs, changed_jobs, removed_jobs); fflush(stderr);
-	}
-
-	HashDestroy(tmpJobHash, NULL);
-
-	return 0;
-}
-
-static void
-initialize()
-{
-	struct passwd *	pw;
-
-	gJobList = NewList();
-	gJobHash = HashCreate(DEFAULT_HASH_SIZE);
-	gMachineList = NewList();
-	gQueueList = NewList();
-	gFilters = HashCreate(DEFAULT_FILTER_HASH_SIZE);
-
-	pw = getpwuid(getuid());
-	if (pw != NULL) {
-		gUserName = strdup(pw->pw_name);
-	}
-}
-
-static int
-server(char *name, char *host, int port)
-{
-	int				rc = 0;
-	int				poll_timeout = 0;
-	struct timeval	timeout = {0, PROXY_TIMEOUT};
-	
-	initialize();
-	
-	if (proxy_svr_init(name, &timeout, &helper_funcs, &command_tab, &conn) != PTP_PROXY_RES_OK) {
-		if (debug_level > 0) {
-			fprintf(stderr, "proxy failed to initialized\n"); fflush(stderr);
-		}
-		return 0;
-	}
-	
-	if (proxy_svr_connect(conn, host, port) == PTP_PROXY_RES_OK) {
-		if (debug_level > 0) {
-			fprintf(stderr, "proxy connected\n"); fflush(stderr);
-		}
-		
-		while (ptp_signal_exit == 0 && proxy_state != STATE_SHUTDOWN) {
-			if (proxy_state == STATE_SHUTTING_DOWN) {
-				proxy_state = STATE_SHUTDOWN;
-			}
-			if (gTransID > 0) {
-				if ((poll_timeout -= PROXY_TIMEOUT) <= 0) {
-					if (poll_pbs() < 0) {
-						break;
-					}
-					poll_timeout = PBS_POLL_INTERVAL;
-				}
-			}
-			if (proxy_svr_progress(conn) != PTP_PROXY_RES_OK) {
-				break;
-			}
-		}
-		
-		if (ptp_signal_exit != 0) {
-			if (ptp_signal_exit != SIGCHLD && proxy_state != STATE_SHUTTING_DOWN
-					&& proxy_state != STATE_SHUTDOWN) {
-				shutdown_pbs();
-			}
-			/* our return code = the signal that fired */
-			rc = ptp_signal_exit;
-		}
-	} else if (debug_level > 0) {
-		fprintf(stderr, "proxy connection failed\n"); fflush(stderr);
-	}
-	
-	proxy_svr_finish(conn);
-	
-	return rc;
-}
-
-RETSIGTYPE
-ptp_signal_handler(int sig)
-{
-		int	ret;
-		if (sig == SIGCHLD)
-			wait(&ret);
-		ptp_signal_exit = sig;
-		if(sig >= 0 && sig < NSIG) {
-			RETSIGTYPE (*saved_signal)(int) = saved_signals[sig];
-			if(saved_signal != SIG_ERR && saved_signal != SIG_IGN && saved_signal != SIG_DFL) {
-				saved_signal(sig);
-			}
-		}
-}
-
-int
-main(int argc, char *argv[])
-{
-	int				ch;
-	int				port = PTP_PROXY_TCP_PORT;
-	char *			host = DEFAULT_HOST;
-	char *			proxy_str = DEFAULT_PROXY;
-	int				rc;
-	
-	while ((ch = getopt_long(argc, argv, "P:p:h:d:", longopts, NULL)) != -1)
-	switch (ch) {
-	case 'P':
-		proxy_str = optarg;
-		break;
-	case 'p':
-		port = (int)strtol(optarg, NULL, 10);
-		break;
-	case 'h':
-		host = optarg;
-		break;
-	case 'd':
-		debug_level = (int)strtol(optarg, NULL, 10);
-		break;
-	default:
-		fprintf(stderr, "%s [--proxy=proxy] [--host=host_name] [--port=port] [--debug=level]\n", argv[0]);
-		return 1;
-	}
-	
-	/* 
-	 * signal can happen any time after handlers are installed, so
-	 * make sure we catch it
-	 */
-	ptp_signal_exit = 0;
-	
-#if 0
-	/* setup our signal handlers */
-	saved_signals[SIGINT] = signal(SIGINT, ptp_signal_handler);
-	saved_signals[SIGHUP] = signal(SIGHUP, ptp_signal_handler);
-	saved_signals[SIGILL] = signal(SIGILL, ptp_signal_handler);
-	saved_signals[SIGSEGV] = signal(SIGSEGV, ptp_signal_handler);
-	saved_signals[SIGTERM] = signal(SIGTERM, ptp_signal_handler);
-	saved_signals[SIGQUIT] = signal(SIGQUIT, ptp_signal_handler);
-	saved_signals[SIGABRT] = signal(SIGABRT, ptp_signal_handler);
-	saved_signals[SIGCHLD] = signal(SIGCHLD, ptp_signal_handler);
-	
-	if(saved_signals[SIGINT] != SIG_ERR && saved_signals[SIGINT] != SIG_IGN && saved_signals[SIGINT] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGINT was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-	if(saved_signals[SIGHUP] != SIG_ERR && saved_signals[SIGHUP] != SIG_IGN && saved_signals[SIGHUP] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGHUP was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-	if(saved_signals[SIGILL] != SIG_ERR && saved_signals[SIGILL] != SIG_IGN && saved_signals[SIGILL] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGILL was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-	if(saved_signals[SIGSEGV] != SIG_ERR && saved_signals[SIGSEGV] != SIG_IGN && saved_signals[SIGSEGV] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGSEGV was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}	
-	if(saved_signals[SIGTERM] != SIG_ERR && saved_signals[SIGTERM] != SIG_IGN && saved_signals[SIGTERM] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGTERM was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-	if(saved_signals[SIGQUIT] != SIG_ERR && saved_signals[SIGQUIT] != SIG_IGN && saved_signals[SIGQUIT] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGQUIT was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-	if(saved_signals[SIGABRT] != SIG_ERR && saved_signals[SIGABRT] != SIG_IGN && saved_signals[SIGABRT] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGABRT was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}	
-	if(saved_signals[SIGCHLD] != SIG_ERR && saved_signals[SIGABRT] != SIG_IGN && saved_signals[SIGCHLD] != SIG_DFL) {
-		fprintf(stderr, "  ---> SIGNAL SIGABRT was previously already defined.  Shadowing.\n"); fflush(stderr);
-	}
-#endif
-	rc = server(proxy_str, host, port);
-	
-	return rc;
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/.classpath b/rms/org.eclipse.ptp.rm.pbs.ui/.classpath
deleted file mode 100644
index 0329adc..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/ptp/rm/remote/core/*"/>
-			<accessrule kind="accessible" pattern="org/eclipse/rm/remote/ui/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/.project b/rms/org.eclipse.ptp.rm.pbs.ui/.project
deleted file mode 100644
index 6e88743..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.pbs.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/.settings/org.eclipse.jdt.core.prefs b/rms/org.eclipse.ptp.rm.pbs.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4cba101..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Mon Aug 31 21:13:46 CDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.pbs.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 04aa366..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.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.pbs.ui;singleton:=true
-Bundle-Version: 5.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.pbs.ui.PBSUIPlugin
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.ptp.services.core,
- org.eclipse.ptp.services.ui,
- org.eclipse.ptp.core,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui,
- org.eclipse.ptp.utils.ui,
- org.eclipse.ptp.rm.pbs.core,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.launch,
- org.eclipse.ptp.rm.ui,
- org.eclipse.ptp.rm.core,
- com.ibm.icu;bundle-version="4.2.1"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.ptp.rm.pbs.ui;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/about.html b/rms/org.eclipse.ptp.rm.pbs.ui/about.html
deleted file mode 100644
index 3106f3a..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">

-<html>

-<head>

-<title>About</title>

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

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

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

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the

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

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

-

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

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

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

-

-</body>

-</html>
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/build.properties b/rms/org.eclipse.ptp.rm.pbs.ui/build.properties
deleted file mode 100644
index f1d8491..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html,\
-               src/rm_configurations.properties
-               
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/plugin.properties b/rms/org.eclipse.ptp.rm.pbs.ui/plugin.properties
deleted file mode 100644
index 593c882..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-pluginName=PTP PBS UI
-pluginProvider=Eclipse.org
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/plugin.xml b/rms/org.eclipse.ptp.rm.pbs.ui/plugin.xml
deleted file mode 100644
index d5c9bce..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

-   <extension

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

-      <launchConfiguration

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

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

-   </extension>

-   <extension

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

-      <providerContributor

-            class="org.eclipse.ptp.ui.wizards.RMProviderContributor"

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

-      </providerContributor>

-   </extension>

-   <extension

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

-      <configurationWizard

-            class="org.eclipse.ptp.rm.pbs.ui.wizards.PBSRMConfigurationWizardPageFactory"

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

-      </configurationWizard>

-   </extension>

-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSUIPlugin.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSUIPlugin.java
deleted file mode 100644
index f6652db..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/PBSUIPlugin.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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 
- *     Albert L. Rossi (NCSA) - full implementation (bug 310188)
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- * 
- * @since 4.0
- */
-public class PBSUIPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	private static final String PLUGIN_ID = "org.eclipse.ptp.rm.pbs.ui"; //$NON-NLS-1$
-
-	// The shared instance
-	private static PBSUIPlugin plugin;
-
-	/**
-	 * The constructor
-	 */
-	public PBSUIPlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
-	 * )
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (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 active workbench shell or <code>null</code> if none
-	 * 
-	 * @return the active workbench shell or <code>null</code> if none
-	 * @since 5.0
-	 */
-	public static Shell getActiveWorkbenchShell() {
-		IWorkbenchWindow window = getActiveWorkbenchWindow();
-		if (window != null)
-			return window.getShell();
-		return null;
-	}
-
-	/**
-	 * Convenience method to get the currently active workbench window
-	 * 
-	 * @return currently active workbench window
-	 * @since 5.0
-	 */
-	public static IWorkbenchWindow getActiveWorkbenchWindow() {
-		return getDefault().getWorkbench().getActiveWorkbenchWindow();
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static PBSUIPlugin 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);
-	}
-
-	/**
-	 * Generate a unique identifier
-	 * 
-	 * @return unique identifier string
-	 * @since 5.0
-	 */
-	public static String getUniqueIdentifier() {
-		if (getDefault() == null)
-			return PLUGIN_ID;
-		return getDefault().getBundle().getSymbolicName();
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/dialogs/ComboEntryDialog.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/dialogs/ComboEntryDialog.java
deleted file mode 100644
index f098dc9..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/dialogs/ComboEntryDialog.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois. All rights
- * reserved. This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0 which accompanies this
- * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors:
- * 	Albert L. Rossi (NCSA) - design and implementation
- *                         - modified (09/14/2010) to use non-nls interface
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.dialogs;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.ui.utils.WidgetUtils;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Allows the user to make a selection from a combo box with fixed entries.
- * 
- * @author arossi
- */
-public class ComboEntryDialog extends Dialog implements IPBSNonNLSConstants {
-	private String[] choices;
-
-	private String chosen;
-	private Combo combo;
-	private final String title;
-
-	public ComboEntryDialog(Shell parentShell, String dialogTitle, String[] initialValues) {
-		super(parentShell);
-		this.title = dialogTitle;
-		if (initialValues == null)
-			choices = new String[0];
-		else
-			choices = initialValues;
-	}
-
-	public String getChoice() {
-		return chosen;
-	}
-
-	@Override
-	public int open() {
-		super.open();
-		return getReturnCode();
-	}
-
-	@Override
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID)
-			chosen = WidgetUtils.getSelected(combo);
-		else
-			chosen = null;
-		super.buttonPressed(buttonId);
-	}
-
-	@Override
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		if (title != null)
-			shell.setText(title);
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite composite = (Composite) super.createDialogArea(parent);
-		combo = WidgetUtils.createItemCombo(composite, title, choices, ZEROSTR, ZEROSTR, true, null, 2);
-		combo.setFocus();
-		applyDialogFont(composite);
-		return composite;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/dialogs/ScrollingEditableMessageDialog.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/dialogs/ScrollingEditableMessageDialog.java
deleted file mode 100644
index 1ede94d..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/dialogs/ScrollingEditableMessageDialog.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois. All rights
- * reserved. This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0 which accompanies this
- * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors:
- * 	Albert L. Rossi (NCSA) - design and implementation
- *                           added readOnly option 05/11/2010
- *                         - modified (09/14/2010) to use non-nls interface
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.dialogs;
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.ui.messages.Messages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Displays text contents for editing/saving. Note: the font used is fixed to be
- * Courier, which should be available on Mac, Windows and Linux platforms. More
- * lightweight than a full-blown text editor.
- * 
- * @author arossi
- */
-public class ScrollingEditableMessageDialog extends MessageDialog implements IPBSNonNLSConstants {
-	public static final int DEFAULT_INDEX = 0;
-	public static final String[] DEFAULT_LABELS = { Messages.DialogClose };
-
-	protected Button okButton;
-	protected boolean readOnly;
-	protected Text scrollable;
-	protected String title;
-	protected String value;
-
-	public ScrollingEditableMessageDialog(Shell parentShell, String name, String value) {
-		this(parentShell, name, value, false);
-	}
-
-	public ScrollingEditableMessageDialog(Shell parentShell, String name, String value, boolean readOnly) {
-		this(parentShell, name, value, name, null, MessageDialog.NONE, DEFAULT_LABELS, DEFAULT_INDEX);
-		this.readOnly = readOnly;
-	}
-
-	public ScrollingEditableMessageDialog(Shell parentShell, String name, String value, String dialogTitle, Image dialogTitleImage,
-			int dialogImageType, String[] dialogButtonLabels, int defaultIndex) {
-		super(parentShell, dialogTitle, dialogTitleImage, name, dialogImageType, dialogButtonLabels, defaultIndex);
-		this.value = value;
-		readOnly = false;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	@Override
-	public int open() {
-		createDialogArea(getParentShell());
-		return super.open();
-	}
-
-	@Override
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID)
-			value = scrollable.getText();
-		else
-			value = null;
-		super.buttonPressed(buttonId);
-	}
-
-	@Override
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		if (title != null)
-			shell.setText(title);
-	}
-
-	@Override
-	protected void createButtonsForButtonBar(Composite parent) {
-		// create OK and Cancel buttons by default
-		okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-		// do this here because setting the text will also set enablement on the
-		// OK button
-		scrollable.setFocus();
-		if (value != null) {
-			scrollable.setText(value);
-			scrollable.selectAll();
-		}
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Control c = super.createDialogArea(parent);
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL);
-		data.grabExcessHorizontalSpace = true;
-		data.grabExcessVerticalSpace = true;
-		data.heightHint = 550;
-		data.widthHint = convertWidthInCharsToPixels(160);
-
-		scrollable = new Text(parent, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.H_SCROLL | SWT.V_SCROLL);
-		scrollable.setLayoutData(data);
-		scrollable.setEditable(!readOnly);
-		Display d = Display.getCurrent();
-		// three fonts for Mac, Linux, Windows ...
-		FontData[][] f = { d.getFontList(COURIER, true), d.getFontList(COURIER, false), d.getFontList(COURIER, true),
-				d.getFontList(COURIER, false), d.getFontList(COURIER, true), d.getFontList(COURIER, false) };
-		int i = 0;
-		for (; i < f.length; i++)
-			if (f[i].length > 0) {
-				scrollable.setFont(new Font(d, f[i]));
-				break;
-			}
-		if (i == f.length)
-			applyDialogFont(scrollable);
-		return c;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index ca63a0b..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,830 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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 
- *     Albert L. Rossi (NCSA) - full implementation (bug 310188)
- *     		                  - further modifications (04/30/2010)
- *                            - rewritten (05/11/2010)
- *                            - modified (10/01/2010) to use non-nls interface; 
- *                              moved the queue-name combo functionality into 
- *                              the launch tab (5.0)
- *                            - fixed load to get config, not working copy
- *                            - eliminated static map (not necessary) (11/12/2010)
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.launch;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-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.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-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.launch.ui.extensions.RMLaunchValidation;
-import org.eclipse.ptp.rm.pbs.core.ConfigUtils;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.core.attributes.AttributePlaceholder;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManager;
-import org.eclipse.ptp.rm.pbs.core.templates.PBSBatchScriptTemplate;
-import org.eclipse.ptp.rm.pbs.ui.PBSUIPlugin;
-import org.eclipse.ptp.rm.pbs.ui.dialogs.ScrollingEditableMessageDialog;
-import org.eclipse.ptp.rm.pbs.ui.messages.Messages;
-import org.eclipse.ptp.rm.pbs.ui.utils.WidgetUtils;
-import org.eclipse.ptp.rm.pbs.ui.wizards.PBSBatchScriptTemplateWizard;
-import org.eclipse.ptp.rm.pbs.ui.wizards.PBSRMLaunchConfigurationDynamicTabWizardPage;
-import org.eclipse.ptp.rm.ui.launch.BaseRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabDataSource;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabWidgetListener;
-import org.eclipse.ptp.rm.ui.utils.WidgetListener;
-import org.eclipse.ptp.rmsystem.IResourceManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.progress.UIJob;
-
-/**
- * Furnishes the options for configuring the PBS launch/submission. <br>
- * <br>
- * Both PBS Job Attributes as well as other extension properties can be set. <br>
- * <br>
- * The dynamic part of the control is built from the template selected.
- * 
- * @author arossi
- */
-public class PBSRMLaunchConfigurationDynamicTab extends BaseRMLaunchConfigurationDynamicTab implements IPBSNonNLSConstants {
-
-	private class DestinationComboListener extends RMLaunchConfigurationDynamicTabWidgetListener implements MouseListener {
-		public DestinationComboListener(BaseRMLaunchConfigurationDynamicTab dynamicTab) {
-			super(dynamicTab);
-		}
-
-		@Override
-		public void modifyText(ModifyEvent e) {
-			if (!templateChangeListener.isEnabled()) {
-				return;
-			}
-			super.modifyText(e);
-		}
-
-		public void mouseDoubleClick(MouseEvent e) {
-			// unused
-		}
-
-		public void mouseDown(MouseEvent e) {
-			Combo c = (Combo) e.getSource();
-			if (c.getItemCount() != 0) {
-				return;
-			}
-			disable();
-			String text = c.getText();
-			c.setItems(ConfigUtils.getCurrentQueues(getResourceManager()));
-			c.setText(text);
-			enable();
-		}
-
-		public void mouseUp(MouseEvent e) {
-			// usused
-		}
-	}
-
-	/*
-	 * (non-Javadoc) Provides communication between the template and the
-	 * underlying store (configuration) on the one hand, and the template and
-	 * the display widgets on the other. The extra fields are there to maintain
-	 * the correct options for rebuilding the controls.
-	 */
-	private class PBSRMLaunchDataSource extends RMLaunchConfigurationDynamicTabDataSource {
-		protected PBSRMLaunchDataSource(BaseRMLaunchConfigurationDynamicTab page) {
-			super(page);
-		}
-
-		/*
-		 * (non-Javadoc) Overridden to record changes in resource manager.
-		 * 
-		 * @see
-		 * org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabDataSource
-		 * #setResourceManager(org.eclipse.ptp.core.elements.IPResourceManager)
-		 */
-		@Override
-		public void setResourceManager(IResourceManager rm) {
-			super.setResourceManager(rm);
-		}
-
-		/*
-		 * (non-Javadoc) Widgets-to-Model (attribute).
-		 */
-		@Override
-		protected void copyFromFields() throws ValidationException {
-			if (dynamicControl == null || dynamicControl.isDisposed()) {
-				return;
-			}
-			PBSBatchScriptTemplate template = pbsRM.getTemplateManager().getCurrent();
-			if (template == null) {
-				return;
-			}
-
-			AttributePlaceholder ap = null;
-			Object value = null;
-
-			for (Iterator<Entry<Control, AttributePlaceholder>> i = valueWidgets.entrySet().iterator(); i.hasNext();) {
-				Entry<Control, AttributePlaceholder> e = i.next();
-				Control c = e.getKey();
-				ap = e.getValue();
-				value = null;
-				if (c instanceof Text) {
-					value = ((Text) c).getText();
-				} else if (c instanceof Combo) {
-					value = ((Combo) c).getText();
-				} else if (c instanceof Spinner) {
-					value = ((Spinner) c).getSelection();
-				} else if (c instanceof Button) {
-					value = ((Button) c).getSelection();
-				}
-				if (value != null) {
-					try {
-						ap.getAttribute().setValueAsString(value.toString());
-					} catch (IllegalValueException t) {
-						throw new ValidationException(t.toString());
-					}
-				}
-			}
-
-			if (templateChangeListener.isEnabled() && mpiCommand != null) {
-				value = WidgetUtils.getSelected(mpiCommand).trim();
-				try {
-					template.setMPIAttributes((String) value);
-				} catch (Throwable t) {
-					throw new ValidationException(t.getMessage() + CO + SP + t.getCause());
-				}
-			}
-		}
-
-		/*
-		 * (non-Javadoc) Model-to-widget (valueWidgets, combo box).
-		 */
-		@Override
-		protected void copyToFields() {
-			if (dynamicControl == null || dynamicControl.isDisposed()) {
-				return;
-			}
-			PBSBatchScriptTemplate template = pbsRM.getTemplateManager().getCurrent();
-			if (template == null) {
-				return;
-			}
-			AttributePlaceholder ap = null;
-			IAttribute<?, ?, ?> attr = null;
-			Object value = null;
-			for (Iterator<Entry<Control, AttributePlaceholder>> i = valueWidgets.entrySet().iterator(); i.hasNext();) {
-				Entry<Control, AttributePlaceholder> e = i.next();
-				ap = e.getValue();
-				attr = ap.getAttribute();
-				if (attr != null) {
-					value = attr.getValue();
-				}
-				Control c = e.getKey();
-				if (value != null) {
-					if (c instanceof Text) {
-						applyText((Text) c, (String) value);
-					} else if (c instanceof Combo) {
-						applyText((Combo) c, (String) value);
-					} else if (c instanceof Spinner) {
-						((Spinner) c).setSelection((Integer) value);
-					} else if (c instanceof Button) {
-						((Button) c).setSelection((Boolean) value);
-					}
-				}
-			}
-
-			ap = template.getMpiCommand();
-			if (ap != null) {
-				attr = ap.getAttribute();
-				if (attr != null) {
-					value = attr.getValue();
-				}
-				if (value != null) {
-					WidgetUtils.select(mpiCommand, (String) value);
-				}
-			}
-
-			WidgetUtils.select(templates, template.getName());
-		}
-
-		/*
-		 * (non-Javadoc) Attribute values to configuration. We also maintain a
-		 * map in memory of the most current configurations, in order to enable
-		 * preservation of values when switching between templates and/or
-		 * resource managers within the ResourceTab object.
-		 */
-		@Override
-		protected void copyToStorage() {
-			ILaunchConfigurationWorkingCopy config = getConfigurationWorkingCopy();
-			if (config == null) {
-				return;
-			}
-			PBSBatchScriptTemplate template = pbsRM.getTemplateManager().getCurrent();
-			if (template != null) {
-				template.saveValues(config);
-			}
-		}
-
-		/*
-		 * (non-Javadoc)
-		 */
-		@Override
-		protected void loadDefault() {
-		}
-
-		/*
-		 * (non-Javadoc) Configuration to model (attributes).
-		 */
-		@Override
-		protected void loadFromStorage() {
-			ILaunchConfiguration config = getConfiguration();
-			if (config != null) {
-				PBSBatchScriptTemplate template = pbsRM.getTemplateManager().getCurrent();
-				if (template == null) {
-					return;
-				}
-				template.setConfiguration(config);
-				try {
-					template.configure();
-				} catch (Throwable t) {
-					t.printStackTrace();
-				}
-			}
-		}
-
-		/*
-		 * (non-Javadoc) Checks the consistency of string values, particularly
-		 * empty strings where a default string is defined.
-		 */
-		@Override
-		protected void validateLocal() throws ValidationException {
-			if (dynamicControl == null || dynamicControl.isDisposed()) {
-				return;
-			}
-			for (Iterator<Control> i = valueWidgets.keySet().iterator(); i.hasNext();) {
-				Control c = i.next();
-				if (c instanceof Text) {
-					Text t = (Text) c;
-					String value = t.getText().trim();
-					AttributePlaceholder ap = valueWidgets.get(c);
-					String defaultString = ap.getDefaultString();
-					/*
-					 * maybe restore default
-					 */
-					if (ZEROSTR.equals(value) && !ZEROSTR.equals(defaultString)) {
-						t.setText(defaultString);
-					}
-				} else if (c instanceof Combo) {
-					Combo cmb = (Combo) c;
-					String value = cmb.getText();
-					AttributePlaceholder ap = valueWidgets.get(c);
-					if (value.indexOf(QM) >= 0) {
-						throw new ValidationException(ap.getName() + CO + SP + Messages.PBSRMLaunchDataSource_ValueNotSet);
-					}
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc) General purpose listener for all widgets except the
-	 * template choice. Overridden methods support opening of dialog for editing
-	 * template.
-	 */
-	private class PBSRMLaunchWidgetListener extends RMLaunchConfigurationDynamicTabWidgetListener {
-		public PBSRMLaunchWidgetListener(BaseRMLaunchConfigurationDynamicTab dynamicTab) {
-			super(dynamicTab);
-		}
-
-		/*
-		 * (non-Javadoc) Overridden to stop proliferation of events when the
-		 * control is being rebuilt.
-		 * 
-		 * @see org.eclipse.ptp.rm.ui.launch.
-		 * RMLaunchConfigurationDynamicTabWidgetListener
-		 * #modifyText(org.eclipse.swt.events.ModifyEvent)
-		 */
-		@Override
-		public void modifyText(ModifyEvent e) {
-			Object o = e.getSource();
-			if (valueWidgets.containsKey(o)) {
-				if (!templateChangeListener.isEnabled()) {
-					return;
-				}
-			}
-			super.modifyText(e);
-		}
-
-		/*
-		 * (non-Javadoc) Overridden to provide for opening of editors.
-		 * 
-		 * @see org.eclipse.ptp.rm.ui.launch.
-		 * RMLaunchConfigurationDynamicTabWidgetListener
-		 * #widgetSelected(org.eclipse.swt.events.SelectionEvent)
-		 */
-		@Override
-		public void widgetDefaultSelected(SelectionEvent e) {
-			Object o = e.getSource();
-			if (o == editPrepended || o == editPostpended || o == viewScript || o == editTemplates) {
-				widgetSelected(e);
-			} else {
-				super.widgetDefaultSelected(e);
-			}
-		}
-
-		/*
-		 * (non-Javadoc) Overridden to provide for opening of editors.
-		 * 
-		 * @see org.eclipse.ptp.rm.ui.launch.
-		 * RMLaunchConfigurationDynamicTabWidgetListener
-		 * #widgetSelected(org.eclipse.swt.events.SelectionEvent)
-		 */
-		@Override
-		public void widgetSelected(SelectionEvent e) {
-			PBSBatchScriptTemplate template = pbsRM.getTemplateManager().getCurrent();
-			if (template == null) {
-				return;
-			}
-			AttributePlaceholder ap = null;
-			Object o = e.getSource();
-			String title = ZEROSTR;
-			if (o == editPrepended) {
-				title = Messages.PBSBatchScriptTemplateEditPrepend_title;
-				ap = template.getPrependedBashCommands();
-			} else if (o == editPostpended) {
-				title = Messages.PBSBatchScriptTemplateEditPostpend_title;
-				ap = template.getPostpendedBashCommands();
-			}
-
-			try {
-				if (ap != null) {
-					openEditor(ap, title);
-				} else if (o == viewScript) {
-					openReadOnly(template.realize());
-					super.widgetSelected(e);
-				}
-			} catch (Throwable t) {
-				t.printStackTrace();
-			}
-		}
-
-		/*
-		 * Editor for adding or editing user-provided script commands.
-		 */
-		private void openEditor(AttributePlaceholder ap, String title) {
-			try {
-				IAttribute<?, ?, ?> attr = ap.getAttribute();
-				String attrval = attr.getValueAsString();
-				ScrollingEditableMessageDialog dialog = new ScrollingEditableMessageDialog(control.getShell(), title, attrval);
-				if (dialog.open() == Window.CANCEL) {
-					return;
-				}
-				attr.setValueAsString(dialog.getValue());
-			} catch (Throwable t) {
-				WidgetUtils.errorMessage(control.getShell(), t, Messages.PBSBatchScriptTemplateEditError_message,
-						Messages.PBSBatchScriptTemplateEditError_title, false);
-			}
-		}
-
-		/*
-		 * For viewing the script realized from the current template with the
-		 * provided values.
-		 */
-		private void openReadOnly(String script) {
-			try {
-				new ScrollingEditableMessageDialog(control.getShell(), Messages.PBSBatchScriptDisplay, script, true).open();
-			} catch (Throwable t) {
-				t.printStackTrace();
-			}
-		}
-	}
-
-	/*
-	 * Separate listener for template combo box and button.
-	 */
-	private class TemplateChangeListener extends WidgetListener {
-		@Override
-		protected void doModifyText(ModifyEvent e) {
-			fireTemplateChange(WidgetUtils.getSelected(templates));
-		}
-
-		@Override
-		protected void doWidgetSelected(SelectionEvent e) {
-			Object o = e.getSource();
-			if (o == editTemplates) {
-				handleEditTemplates();
-			}
-		}
-	}
-
-	private final Map<Control, AttributePlaceholder> valueWidgets;
-
-	private PBSRMLaunchDataSource dataSource;
-	private ScrolledComposite parent;
-	private Composite dynamicControl;
-	private Composite control;
-	private Button editPostpended;
-	private Button editPrepended;
-	private Button viewScript;
-	private Button editTemplates;
-	private Combo mpiCommand;
-	private Combo templates;
-	private final TemplateChangeListener templateChangeListener;
-	private PBSRMLaunchWidgetListener listener;
-	private DestinationComboListener destComboListener;
-	private PBSResourceManager pbsRM;
-
-	/**
-	 * Creates the templateManager and templateChangeListener.
-	 * 
-	 * @param resourceManager
-	 */
-	public PBSRMLaunchConfigurationDynamicTab(IResourceManager rm, ILaunchConfigurationDialog dialog) {
-		super(dialog);
-		setResourceManager(rm);
-		templateChangeListener = new TemplateChangeListener();
-		valueWidgets = new HashMap<Control, AttributePlaceholder>();
-	}
-
-	/**
-	 * The control has two panels: <br>
-	 * <br>
-	 * The first panel allows for choosing the template and inspecting the
-	 * generated script.<br>
-	 * <br>
-	 * The second is dynamically populated, and has two sub-panels. The first
-	 * has MPI command configuration and buttons for opening editors for
-	 * modifying the areas of the batch script surrounding the actual
-	 * application execution command. The second sub-panel is a wizard page
-	 * which adds widgets on the basis of the PBS Job Attributes present in the
-	 * template.
-	 */
-	public void createControl(Composite parent, IResourceManager rm, IPQueue queue) throws CoreException {
-		control = WidgetUtils.createComposite(parent, 1);
-		setResourceManager(rm);
-		if (parent instanceof ScrolledComposite) {
-			this.parent = (ScrolledComposite) parent;
-		}
-		createSelectionGroup(control);
-		rmNotRunningWarning();
-	}
-
-	public synchronized RMLaunchConfigurationDynamicTabWidgetListener createDestinationComboListener() {
-		if (destComboListener == null) {
-			destComboListener = new DestinationComboListener(this);
-		}
-		return destComboListener;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#
-	 * getControl()
-	 */
-	public Control getControl() {
-		return control;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rm.ui.launch.BaseRMLaunchConfigurationDynamicTab#getImage
-	 * ()
-	 */
-	@Override
-	public Image getImage() {
-		return null;
-	}
-
-	public synchronized PBSResourceManager getResourceManager() {
-		return pbsRM;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rm.ui.launch.BaseRMLaunchConfigurationDynamicTab#getText
-	 * ()
-	 */
-	@Override
-	public String getText() {
-		return Messages.PBSConfigurationWizardPage_title;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rm.ui.launch.BaseRMLaunchConfigurationDynamicTab#performApply
-	 * (org.eclipse.debug.core.ILaunchConfigurationWorkingCopy,
-	 * org.eclipse.ptp.core.elements.IPResourceManager,
-	 * org.eclipse.ptp.core.elements.IPQueue)
-	 */
-	@Override
-	public RMLaunchValidation performApply(ILaunchConfigurationWorkingCopy configuration, IResourceManager rm, IPQueue queue) {
-		setResourceManager(rm);
-		RMLaunchValidation rmv = super.performApply(configuration, getResourceManager(), queue);
-		return rmv;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab#
-	 * setDefaults(org.eclipse.debug.core.ILaunchConfigurationWorkingCopy,
-	 * org.eclipse.ptp.core.elements.IPResourceManager,
-	 * org.eclipse.ptp.core.elements.IPQueue)
-	 */
-	public RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy configuration, IResourceManager rm, IPQueue queue) {
-		setResourceManager(rm);
-		return new RMLaunchValidation(true, null);
-	}
-
-	/*
-	 * (non-Javadoc) Unused; all updates handled by the dataSource.
-	 * 
-	 * @see org.eclipse.ptp.rm.ui.launch.BaseRMLaunchConfigurationDynamicTab#
-	 * updateControls()
-	 */
-	@Override
-	public void updateControls() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.ptp.rm.ui.launch.BaseRMLaunchConfigurationDynamicTab#
-	 * createDataSource()
-	 */
-	@Override
-	protected synchronized RMLaunchConfigurationDynamicTabDataSource createDataSource() {
-		if (dataSource == null) {
-			dataSource = new PBSRMLaunchDataSource(this);
-		}
-		return dataSource;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @seeorg.eclipse.ptp.rm.ui.launch.BaseRMLaunchConfigurationDynamicTab#
-	 * createListener()
-	 */
-	@Override
-	protected synchronized RMLaunchConfigurationDynamicTabWidgetListener createListener() {
-		if (listener == null) {
-			listener = new PBSRMLaunchWidgetListener(this);
-		}
-		return listener;
-	}
-
-	/*
-	 * Nests child control which can be disposed when rebuild is called for.
-	 */
-	private void buildDynamicPart(ILaunchConfiguration lconfig) {
-		if (dynamicControl != null) {
-			dynamicControl.dispose();
-			valueWidgets.clear();
-		}
-		if (control.isDisposed()) {
-			return;
-		}
-		dynamicControl = WidgetUtils.createComposite(control, 1);
-		PBSBatchScriptTemplate template = pbsRM.getTemplateManager().getCurrent();
-		if (template == null && lconfig != null) {
-			pbsRM.getTemplateManager().loadTemplate(pbsRM.getTemplateManager().getCurrentTemplateName(), lconfig);
-			template = pbsRM.getTemplateManager().getCurrent();
-		}
-		if (template != null) {
-			createOptionalGroup(dynamicControl, template);
-			PBSRMLaunchConfigurationDynamicTabWizardPage wizardPage = new PBSRMLaunchConfigurationDynamicTabWizardPage(this,
-					valueWidgets, getListener(), template);
-			wizardPage.createControl(dynamicControl);
-		}
-		/*
-		 * We need to repeat this here (the ResourcesTab does it when it
-		 * initially builds the control).
-		 */
-		if (parent != null) {
-			parent.setMinSize(control.computeSize(SWT.DEFAULT, SWT.DEFAULT));
-		}
-	}
-
-	/*
-	 * Constructs lower part of control, containing combo selection for MPI
-	 * command and buttons for editing optional sections, if these are present
-	 * in the template.
-	 */
-	private void createOptionalGroup(Composite parent, PBSBatchScriptTemplate template) {
-		if (template == null) {
-			return;
-		}
-		boolean[] nonNull = new boolean[] { null != template.getMpiCommand(), null != template.getPrependedBashCommands(),
-				null != template.getPostpendedBashCommands() };
-
-		if (!nonNull[0] && !nonNull[1] && !nonNull[2]) {
-			return;
-		}
-
-		Group options = WidgetUtils.createFillingGroup(parent, Messages.PBSRMLaunchConfigGroup2_title, 3, 1, false);
-		options.setForeground(WidgetUtils.DKMG);
-
-		if (nonNull[0]) {
-			mpiCommand = WidgetUtils.createItemCombo(options, Messages.PBSBatchScriptTemplateMPICommand, MPICMDS, MPICMDS[0], null,
-					true, listener, 2);
-		}
-		if (nonNull[1]) {
-			editPrepended = WidgetUtils.createButton(options, Messages.PBSBatchScriptTemplateEditPrepend_title, null, SWT.PUSH, 1,
-					false, listener);
-		}
-		if (nonNull[2]) {
-			editPostpended = WidgetUtils.createButton(options, Messages.PBSBatchScriptTemplateEditPostpend_title, null, SWT.PUSH,
-					1, false, listener);
-		}
-	}
-
-	/*
-	 * Constructs upper part of control, containing combo selection for changing
-	 * template and button for viewing the script. Calls set template to
-	 * establish the dynamic components.
-	 */
-	private void createSelectionGroup(Composite parent) {
-		Composite composite = WidgetUtils.createComposite(parent, 1);
-		Group selection = WidgetUtils.createFillingGroup(composite, Messages.PBSRMLaunchConfigGroup1_title, 5, 1, false);
-		selection.setForeground(WidgetUtils.DKMG);
-		templates = WidgetUtils.createItemCombo(selection, null, pbsRM.getTemplateManager().findAvailableTemplates(), null, null,
-				true, templateChangeListener, 2);
-		((GridData) templates.getLayoutData()).widthHint = 200;
-		editTemplates = WidgetUtils.createButton(selection, Messages.PBSRMLaunchConfigEditTemplates_title, null, SWT.PUSH, 1, true,
-				templateChangeListener);
-		viewScript = WidgetUtils.createButton(selection, Messages.PBSRMLaunchConfigViewScript_title, null, SWT.PUSH, 1, true,
-				listener);
-		Label l = WidgetUtils.createLabel(selection, rmNotRunningWarning(), SWT.LEFT, 1);
-		l.setForeground(WidgetUtils.DKRD);
-
-		WidgetUtils.select(templates, pbsRM.getTemplateManager().getCurrentTemplateName());
-	}
-
-	/*
-	 * Saves the current template, loads a new one and reconfigures the dynamic
-	 * widgets on the basis of its placeholders.
-	 */
-	private void fireTemplateChange(final String name) {
-		new UIJob(TEMPLATE_CHANGE) {
-			@Override
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				try {
-					dataSource.copyFromFields();
-					templateChangeListener.disable();
-					dataSource.copyToStorage();
-					ILaunchConfiguration c = dataSource.getConfiguration();
-					pbsRM.getTemplateManager().loadTemplate(name, c);
-					buildDynamicPart(c);
-					dataSource.loadFromStorage();
-					dataSource.copyToFields();
-				} catch (Throwable t) {
-					t.printStackTrace();
-				} finally {
-					templateChangeListener.enable();
-				}
-				return Status.OK_STATUS;
-			}
-		}.schedule();
-	}
-
-	/*
-	 * First checks for the base template configuration. It then brings up
-	 * wizard for editing or deleting templates.
-	 */
-	private void handleEditTemplates() {
-		new UIJob(EDIT_TEMPLATES) {
-			@Override
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				try {
-					try {
-						Shell shell = PBSUIPlugin.getActiveWorkbenchShell();
-						if (getResourceManager() == null || !getResourceManager().getState().equals(IResourceManager.STARTED_STATE)) {
-							MessageDialog dialog = new MessageDialog(shell, Messages.PBSAttributeTemplateManager_requestStartTitle,
-									null, Messages.PBSAttributeTemplateManager_requestStartMessage, MessageDialog.QUESTION,
-									new String[] { Messages.PBSAttributeTemplateManager_requestStartContinue,
-											Messages.PBSAttributeTemplateManager_requestStartCancel }, 1);
-							if (MessageDialog.CANCEL == dialog.open()) {
-								return Status.OK_STATUS;
-							}
-						}
-						if (!pbsRM.getTemplateManager().handleBaseTemplates()) {
-							new MessageDialog(shell, Messages.PBSAttributeTemplateManager_requestInitializeTitle, null,
-									Messages.PBSAttributeTemplateManager_requestInitializeMessage, MessageDialog.WARNING,
-									new String[] { Messages.PBSAttributeTemplateManager_requestStartCancel }, 0).open();
-							return Status.OK_STATUS;
-						}
-					} catch (Throwable t) {
-						t.printStackTrace();
-					}
-					PBSBatchScriptTemplateWizard templateWizard = new PBSBatchScriptTemplateWizard(pbsRM);
-					if (Window.CANCEL != new WizardDialog(control.getShell(), templateWizard).open()) {
-						repopulateTemplates(templateWizard.getSelectedTemplate());
-					}
-				} catch (Throwable t) {
-					t.printStackTrace();
-				}
-				return Status.OK_STATUS;
-			}
-		}.schedule();
-	}
-
-	/*
-	 * Called when the template wizard is closed with OK button. Updates the
-	 * template list from the template manager's list of available templates.
-	 */
-	private void repopulateTemplates(final String oldTemplate) {
-		new UIJob(REPOPULATE_TEMPLATES) {
-			@Override
-			public IStatus runInUIThread(IProgressMonitor monitor) {
-				templateChangeListener.disable();
-				String[] tempNames = pbsRM.getTemplateManager().findAvailableTemplates();
-				templates.setItems(tempNames);
-				int i = 0;
-				for (; i < tempNames.length; i++) {
-					if (tempNames[i].equals(oldTemplate)) {
-						templates.select(i);
-						break;
-					}
-				}
-				templateChangeListener.enable();
-				if (tempNames.length > 0 && i == tempNames.length) {
-					templates.select(0);
-				} else {
-					fireTemplateChange(WidgetUtils.getSelected(templates));
-				}
-				return Status.OK_STATUS;
-			}
-		}.schedule();
-	}
-
-	/*
-	 * Displays warning about template configurations being out of date if the
-	 * RM is not running.
-	 */
-	private String rmNotRunningWarning() {
-		IResourceManager rm = getResourceManager();
-		StringBuffer text = new StringBuffer();
-		if (rm != null) {
-			text.append(Messages.PBSAttributeTemplateManager_rmState);
-			String state = rm.getState();
-			text.append(state);
-			if (!IResourceManager.STARTED_STATE.equals(state)) {
-				text.append(Messages.PBSAttributeTemplateManager_rmNotStartedMessage);
-			}
-		}
-		return text.toString();
-	}
-
-	/*
-	 * For consistency.
-	 */
-	private synchronized void setResourceManager(IResourceManager resourceManager) {
-		try {
-			pbsRM = (PBSResourceManager) resourceManager;
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationFactory.java
deleted file mode 100644
index 79dc7e2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/launch/PBSRMLaunchConfigurationFactory.java
+++ /dev/null
@@ -1,48 +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
- *     Albert L. Rossi - modification of doCreate construction
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManager;
-import org.eclipse.ptp.rmsystem.IResourceManager;
-
-public class PBSRMLaunchConfigurationFactory extends AbstractRMLaunchConfigurationFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory
-	 * #getResourceManagerClass()
-	 */
-	@Override
-	public Class<? extends IResourceManager> getResourceManagerClass() {
-		return PBSResourceManager.class;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory
-	 * #doCreate(org.eclipse.ptp.rmsystem.IResourceManager,
-	 * org.eclipse.debug.ui.ILaunchConfigurationDialog)
-	 */
-	@Override
-	protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm, ILaunchConfigurationDialog dialog)
-			throws CoreException {
-		return new PBSRMLaunchConfigurationDynamicTab(rm, dialog);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/Messages.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/Messages.java
deleted file mode 100644
index d61121f..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/Messages.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 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 
- *     Albert L. Rossi (NCSA) - full implementation (bug 310188)
- *     			      - modifications 04/30/2010
- *                    - modifications 05/11/2010
- *                    - these now correctly reflect only the externally
- *                      exposed (through UI widgets) strings (09/14/2010)
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	public static String DialogClose;
-
-	public static String DynamicTabWizardPage_ATTRIBUTE;
-	public static String DynamicTabWizardPage_DESCRIPTION;
-
-	public static String DynamicTabWizardPage_VALUE;
-
-	public static String PBSAttributeTemplateManager_rmState;
-	public static String PBSAttributeTemplateManager_rmNotStartedMessage;
-	public static String PBSAttributeTemplateManager_requestStartTitle;
-	public static String PBSAttributeTemplateManager_requestStartMessage;
-	public static String PBSAttributeTemplateManager_requestStartContinue;
-	public static String PBSAttributeTemplateManager_requestStartCancel;
-	public static String PBSAttributeTemplateManager_requestInitializeTitle;
-	public static String PBSAttributeTemplateManager_requestInitializeMessage;
-
-	public static String PBSBatchScriptDisplay;
-
-	public static String PBSBatchScriptTemplateEditError_message;
-	public static String PBSBatchScriptTemplateEditError_title;
-	public static String PBSBatchScriptTemplateEditPostpend_title;
-	public static String PBSBatchScriptTemplateEditPrepend_title;
-	public static String PBSBatchScriptTemplateMPICommand;
-
-	public static String PBSConfigurationWizardPage_description;
-	public static String PBSConfigurationWizardPage_name;
-	public static String PBSConfigurationWizardPage_title;
-
-	public static String PBSResourceManagerConfigurationWizardPage_description;
-	public static String PBSResourceManagerConfigurationWizardPage_name;
-	public static String PBSResourceManagerConfigurationWizardPage_title;
-
-	public static String PBSRMLaunchConfigDeleteButton_title;
-	public static String PBSRMLaunchConfigDeleteError_message;
-	public static String PBSRMLaunchConfigDeleteError_title;
-	public static String PBSRMLaunchConfigEditButton_title;
-	public static String PBSRMLaunchConfigEditChoose_message;
-	public static String PBSRMLaunchConfigEditChoose_new;
-	public static String PBSRMLaunchConfigEditChoose_new_name;
-	public static String PBSRMLaunchConfigEditError_message;
-	public static String PBSRMLaunchConfigEditError_title;
-	public static String PBSRMLaunchConfigExportButton_title;
-	public static String PBSRMLaunchConfigExportButton_message;
-	public static String PBSRMLaunchConfigExportError_message;
-	public static String PBSRMLaunchConfigExportError_title;
-	public static String PBSRMLaunchConfigExportRename;
-	public static String PBSRMLaunchConfigExportRename_new;
-	public static String PBSRMLaunchConfigExportJobMessage0;
-	public static String PBSRMLaunchConfigExportJobMessage1;
-	public static String PBSRMLaunchConfigImportButton_title;
-	public static String PBSRMLaunchConfigImportButton_message;
-	public static String PBSRMLaunchConfigImportError_message;
-	public static String PBSRMLaunchConfigImportError_title;
-	public static String PBSRMLaunchConfigImportJobMessage;
-	public static String PBSRMLaunchConfigGroup1_title;
-	public static String PBSRMLaunchConfigGroup2_title;
-	public static String PBSRMLaunchConfigPreferences_column_0;
-	public static String PBSRMLaunchConfigPreferences_column_1;
-	public static String PBSRMLaunchConfigPreferences_column_2;
-	public static String PBSRMLaunchConfigPreferences_message;
-	public static String PBSRMLaunchConfigTemplate_message;
-	public static String PBSRMLaunchConfigTemplate_title;
-	public static String PBSRMLaunchConfigViewScript_title;
-	public static String PBSRMLaunchConfigEditTemplates_title;
-
-	public static String PBSRMLaunchDataSource_ValueNotSet;
-
-	public static String PBSProxyConfigComboTitle;
-
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.pbs.ui.messages.messages"; //$NON-NLS-1$
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/messages.properties b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/messages.properties
deleted file mode 100644
index ca01aa9..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/messages/messages.properties
+++ /dev/null
@@ -1,67 +0,0 @@
-DialogClose=Close
-
-DynamicTabWizardPage_ATTRIBUTE=Attribute
-DynamicTabWizardPage_DESCRIPTION=Description
-DynamicTabWizardPage_VALUE=Value
-
-PBSAttributeTemplateManager_rmState=Resource Manager state: 
-PBSAttributeTemplateManager_rmNotStartedMessage=; template configurations may not be up to date.
-PBSAttributeTemplateManager_requestStartTitle=Resource Manager not started
-PBSAttributeTemplateManager_requestStartMessage=The current resource manager appears not to be running; to assure that the base template is up to date, please start the resource manager and then click Set/Edit Templates again; otherwise, choose "Continue".
-PBSAttributeTemplateManager_requestStartContinue=Continue
-PBSAttributeTemplateManager_requestStartCancel=Cancel
-PBSAttributeTemplateManager_requestInitializeTitle=Initialize Base Template?
-PBSAttributeTemplateManager_requestInitializeMessage=The current base template has never been initialized;  please start the resource manager and then click Set/Edit Templates.
-
-PBSBatchScriptDisplay=Script
-
-PBSBatchScriptTemplateEditError_message=Cannot edit/save commands: 
-PBSBatchScriptTemplateEditError_title=Edit Commands Error
-PBSBatchScriptTemplateEditPostpend_title=Edit Postpended Commands
-PBSBatchScriptTemplateEditPrepend_title=Edit Prepended Commands
-PBSBatchScriptTemplateMPICommand=MPI Command:
-
-PBSConfigurationWizardPage_description=Enter information to configure PBS Batch Script Templates
-PBSConfigurationWizardPage_name=PBS Batch Script Configuration
-PBSConfigurationWizardPage_title=PBS Batch Script Configuration
-
-PBSResourceManagerConfigurationWizardPage_description=Enter information to connect to an PBS proxy server
-PBSResourceManagerConfigurationWizardPage_name=PBS Proxy Configuration
-PBSResourceManagerConfigurationWizardPage_title=PBS Proxy Configuration
-
-PBSRMLaunchConfigDeleteButton_title=Delete Template
-PBSRMLaunchConfigDeleteError_message=Cannot delete configuration
-PBSRMLaunchConfigDeleteError_title=Delete Attribute Configuration Error
-PBSRMLaunchConfigEditButton_title=Edit Template
-PBSRMLaunchConfigEditChoose_message=Edit/Copy Configuration
-PBSRMLaunchConfigEditChoose_new=New Configuration
-PBSRMLaunchConfigEditChoose_new_name=Name [_template]
-PBSRMLaunchConfigEditError_message=Cannot edit configuration
-PBSRMLaunchConfigEditError_title=Edit Attribute Configuration Error
-PBSRMLaunchConfigExportButton_title=Export Template
-PBSRMLaunchConfigExportButton_message=Select Directory for File Export:
-PBSRMLaunchConfigExportError_message=Cannot export template
-PBSRMLaunchConfigExportError_title=Export Template Error
-PBSRMLaunchConfigExportRename=Rename Template?
-PBSRMLaunchConfigExportRename_new=New Name:
-PBSRMLaunchConfigExportJobMessage0=Exporting template file: 
-PBSRMLaunchConfigExportJobMessage1= to directory: 
-PBSRMLaunchConfigImportButton_title=Import Template
-PBSRMLaunchConfigImportButton_message=Select Template File to Import:
-PBSRMLaunchConfigImportError_message=Cannot import template
-PBSRMLaunchConfigImportError_title=Import Template Error
-PBSRMLaunchConfigImportJobMessage=Importing template file: 
-PBSRMLaunchConfigGroup1_title=Current Template
-PBSRMLaunchConfigGroup2_title=Optional Commands
-PBSRMLaunchConfigPreferences_column_0=Name
-PBSRMLaunchConfigPreferences_column_2=Tool Tip
-PBSRMLaunchConfigPreferences_column_1=Default Value
-PBSRMLaunchConfigPreferences_message=Attribute Placeholders
-PBSRMLaunchConfigTemplate_message=Select a template for the attributes to be displayed
-PBSRMLaunchConfigTemplate_title=Available Templates:
-PBSRMLaunchConfigViewScript_title=View Script
-PBSRMLaunchConfigEditTemplates_title=Set/Edit Templates
-
-PBSRMLaunchDataSource_ValueNotSet=Required value not set
-
-PBSProxyConfigComboTitle=Choose proxy configuration:
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/providers/AttributeContentProvider.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/providers/AttributeContentProvider.java
deleted file mode 100644
index fe799e4..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/providers/AttributeContentProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Albert L. Rossi (NCSA) - design and implementation (bug 310188)
- *     						  - modified 05/11/2010
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.providers;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.ptp.rm.pbs.core.attributes.AttributePlaceholder;
-import org.eclipse.ptp.rm.pbs.core.templates.PBSBatchScriptTemplate;
-
-/**
- * Used to populate viewers whose model is the AttributePlaceholder. <br>
- * <br>
- * Assumes top-level PBSBatchScriptTemplate and also maps whose values are
- * AttributePlaceholders.
- * 
- * @see org.eclipse.ptp.rm.pbs.core.attributes.AttributePlaceholder
- * @author arossi
- */
-public class AttributeContentProvider implements IStructuredContentProvider {
-	public void dispose() {
-	}
-
-	@SuppressWarnings("unchecked")
-	public Object[] getElements(Object inputElement) {
-		if (inputElement instanceof PBSBatchScriptTemplate) {
-			PBSBatchScriptTemplate t = (PBSBatchScriptTemplate) inputElement;
-			List<AttributePlaceholder> all = new ArrayList<AttributePlaceholder>();
-			all.addAll(t.getPbsJobAttributes().values());
-			all.addAll(t.getInternalAttributes().values());
-			return all.toArray(new AttributePlaceholder[0]);
-		} else if (inputElement instanceof Map<?, ?>) {
-			Map<?, ?> m = (Map<?, ?>) inputElement;
-			Collection<AttributePlaceholder> c = (Collection<AttributePlaceholder>) m.values();
-			return c.toArray(new AttributePlaceholder[0]);
-		} else if (inputElement instanceof AttributePlaceholder)
-			return new Object[] { inputElement };
-		return new Object[0];
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/providers/AttributeLabelProvider.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/providers/AttributeLabelProvider.java
deleted file mode 100644
index 479c573..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/providers/AttributeLabelProvider.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Albert L. Rossi (NCSA) - design and implementation (bug 310188)
- *                            - added column 05/11/2010
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.providers;
-
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.ptp.rm.pbs.core.attributes.AttributePlaceholder;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * Used to extract labels for viewers whose model is the AttributePlaceholder.
- * 
- * @see org.eclipse.ptp.rm.pbs.core.attributes.AttributePlaceholder
- * @author arossi
- */
-public class AttributeLabelProvider implements ITableLabelProvider {
-	public AttributeLabelProvider() {
-		super();
-	}
-
-	public void addListener(ILabelProviderListener listener) {
-	}
-
-	public void dispose() {
-	}
-
-	public Image getColumnImage(Object element, int columnIndex) {
-		return null;
-	}
-
-	public String getColumnText(Object obj, int index) {
-		AttributePlaceholder ap = (AttributePlaceholder) obj;
-		switch (index) {
-		case 0:
-			return ap.getName();
-		case 1:
-			return ap.getDefaultString();
-		case 2:
-			return ap.getToolTip();
-		default:
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/utils/WidgetUtils.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/utils/WidgetUtils.java
deleted file mode 100644
index 904b79b..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/utils/WidgetUtils.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois 
- * All rights reserved. This program and the accompanying materials are made 
- * available under the terms of the Eclipse Public License v1.0 which accompanies 
- * this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- *                  - modified, eliminated unused methods 05/11/2010
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.utils;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.ptp.rm.pbs.core.ConfigUtils;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * A set of convenience wrappers around JFace and SWT widget construction
- * routines.
- * 
- * @author arossi
- */
-public class WidgetUtils implements IPBSNonNLSConstants {
-	public static final Color DKBL = Display.getDefault().getSystemColor(SWT.COLOR_DARK_BLUE);
-	public static final Color DKMG = Display.getDefault().getSystemColor(SWT.COLOR_DARK_MAGENTA);
-	public static final Color DKRD = Display.getDefault().getSystemColor(SWT.COLOR_DARK_RED);
-
-	private WidgetUtils() {
-	}
-
-	public static TableColumn addTableColumn(final TableViewer viewer, final String columnName, int style, SelectionListener l) {
-		Table t = viewer.getTable();
-
-		TableColumn c = new TableColumn(t, style);
-		c.setText(columnName);
-		if (l != null)
-			c.addSelectionListener(l);
-		return c;
-	}
-
-	public static Group createAnonymousNonFillingGroup(Composite parent, int columns) {
-		GridData data = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-		data.horizontalAlignment = SWT.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.horizontalSpan = 1;
-		data.verticalAlignment = SWT.LEFT;
-		data.grabExcessVerticalSpace = false;
-
-		GridLayout layout = new GridLayout();
-		layout.numColumns = columns;
-		layout.verticalSpacing = 1;
-
-		Group group = new Group(parent, SWT.SHADOW_NONE | SWT.NO_TRIM);
-		group.setLayout(layout);
-		group.setLayoutData(data);
-
-		return group;
-	}
-
-	public static Button createButton(Composite parent, String buttonText, Image image, int style, int colSpan, boolean fill,
-			SelectionListener l) {
-
-		Button button = new Button(parent, style);
-		button.setText(buttonText);
-		if (image != null)
-			button.setImage(image);
-
-		if (l != null)
-			button.addSelectionListener(l);
-
-		GridData data = new GridData();
-		if (fill)
-			data.horizontalAlignment = SWT.FILL;
-		data.grabExcessHorizontalSpace = false;
-		data.horizontalSpan = colSpan;
-		button.setLayoutData(data);
-
-		return button;
-	}
-
-	public static Composite createComposite(Composite parent, int columns) {
-		GridLayout layout = new GridLayout();
-		layout.numColumns = columns;
-		layout.verticalSpacing = 1;
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(layout);
-		return composite;
-	}
-
-	public static Group createFillingGroup(Composite parent, String text, int columns, int colSpan, boolean verticalFill) {
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.verticalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.grabExcessVerticalSpace = verticalFill;
-		if (colSpan != -1)
-			data.horizontalSpan = colSpan;
-
-		GridLayout layout = new GridLayout();
-		layout.numColumns = columns;
-		layout.verticalSpacing = 9;
-
-		Group group = new Group(parent, SWT.NO_TRIM | SWT.SHADOW_NONE);
-		if (text != null)
-			group.setText(text);
-		group.setLayout(layout);
-		group.setLayoutData(data);
-		return group;
-	}
-
-	public static Table createFillingTable(Composite parent, int numColumns, int suggestedWidth, int colSpan, int tableStyle) {
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.verticalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.grabExcessVerticalSpace = true;
-		data.widthHint = 200;
-		data.horizontalSpan = colSpan;
-		data.heightHint = 150;
-
-		Table t = new Table(parent, tableStyle);
-		t.setHeaderVisible(true);
-		t.setLinesVisible(true);
-		t.setLayoutData(data);
-
-		TableLayout layout = new TableLayout();
-		for (int i = 0; i < numColumns; i++)
-			layout.addColumnData(new ColumnPixelData(suggestedWidth / numColumns));
-		t.setLayout(layout);
-		return t;
-	}
-
-	public static Combo createItemCombo(Composite container, String labelString, String[] items, String initial, String tooltip,
-			boolean fill, ModifyListener listener, int colSpan) {
-		if (labelString != null) {
-			Label label = new Label(container, SWT.NONE);
-			label.setText(labelString);
-			if (tooltip != null)
-				label.setToolTipText(tooltip);
-		}
-
-		GridData data = new GridData();
-		if (fill)
-			data.horizontalAlignment = SWT.FILL;
-		data.grabExcessHorizontalSpace = false;
-		if (colSpan != -1)
-			data.horizontalSpan = colSpan;
-		data.widthHint = 100;
-
-		Combo combo = new Combo(container, SWT.BORDER);
-		combo.setItems(items);
-		combo.setLayoutData(data);
-		if (initial != null)
-			combo.setText(initial);
-		if (listener != null)
-			combo.addModifyListener(listener);
-		return combo;
-	}
-
-	public static Label createLabel(Composite container, String text, int style, int colSpan) {
-		GridData data = new GridData();
-		data.horizontalSpan = colSpan;
-
-		Label label = new Label(container, style);
-		if (text == null)
-			text = ConfigUtils.ZEROSTR;
-		label.setText(text.trim());
-		label.setLayoutData(data);
-		return label;
-	}
-
-	public static Spinner createSpinner(Composite container, String labelString, int min, int max, int initial, int colSpan,
-			boolean fill, ModifyListener listener) {
-		if (labelString != null) {
-			GridData data = new GridData();
-			Label label = new Label(container, SWT.NONE);
-			label.setText(labelString);
-			label.setLayoutData(data);
-		}
-
-		GridData data = new GridData();
-		if (fill)
-			data.horizontalAlignment = SWT.FILL;
-		data.grabExcessHorizontalSpace = false;
-		data.horizontalSpan = colSpan;
-
-		Spinner s = new Spinner(container, SWT.NONE);
-		s.setMaximum(max);
-		s.setMinimum(min);
-		s.setSelection(initial);
-		s.setLayoutData(data);
-		if (listener != null)
-			s.addModifyListener(listener);
-		return s;
-	}
-
-	public static Text createText(Composite container, String initialValue, boolean fill, ModifyListener listener, Color color) {
-
-		GridData data = new GridData();
-		if (fill)
-			data.horizontalAlignment = SWT.FILL;
-		data.grabExcessHorizontalSpace = true;
-		Text text = new Text(container, SWT.BORDER);
-		if (color != null)
-			text.setBackground(color);
-		text.setLayoutData(data);
-		if (initialValue != null)
-			text.setText(initialValue);
-		if (listener != null)
-			text.addModifyListener(listener);
-		return text;
-	}
-
-	public static void errorMessage(Shell s, Throwable e, String message, String title, boolean causeTrace) {
-		String append = e == null ? ConfigUtils.ZEROSTR : e.getMessage();
-		Throwable t = e == null ? null : e.getCause();
-		String lineSep = ConfigUtils.LINE_SEP;
-		if (causeTrace) {
-			StringWriter sw = new StringWriter();
-			PrintWriter pw = new PrintWriter(sw);
-			if (t != null) {
-				t.printStackTrace(pw);
-				append = sw.toString();
-			}
-		} else if (t != null)
-			append = t.getMessage();
-		MessageDialog.openError(s, title, message + lineSep + lineSep + append);
-	}
-
-	/**
-	 * Normalizes text for display to fit into lines of the given length,
-	 * without further tabs or breaks. This is useful for labels and read-only
-	 * text messages.
-	 * 
-	 * @param length
-	 * @param text
-	 */
-	public static String fitToLineLength(int length, String text) {
-		if (text == null)
-			return null;
-		if (length < 1)
-			length = Integer.MAX_VALUE;
-		StringBuffer newLine = new StringBuffer();
-		int strln = text.length();
-		int current = 0;
-		char lastChar = 0;
-		for (int i = 0; i < strln; i++) {
-			char c = text.charAt(i);
-			switch (c) {
-			case '\t':
-			case ' ':
-			case '\n':
-			case '\r':
-				if (current >= length) {
-					newLine.append(LINE_SEP);
-					current = 0;
-				} else if (lastChar != SP.charAt(0)) {
-					newLine.append(SP);
-					current++;
-					lastChar = SP.charAt(0);
-				}
-				break;
-			default:
-				newLine.append(c);
-				current++;
-				lastChar = c;
-			}
-		}
-		return newLine.toString();
-	}
-
-	public static String getSelected(Combo combo) {
-		if (combo.getItemCount() == 0)
-			return combo.getText();
-		int i = combo.getSelectionIndex();
-		if (i < 0)
-			return combo.getText();
-		return combo.getItem(i);
-	}
-
-	public static String select(Combo combo, String name) {
-		String[] items = combo.getItems();
-		if (items.length == 0)
-			return ZEROSTR;
-		int i = 0;
-		for (; i < items.length; i++)
-			if (items[i].equals(name)) {
-				combo.select(i);
-				break;
-			}
-		if (i == items.length) {
-			i = 0;
-			combo.select(i);
-		}
-		return combo.getItem(i);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSBatchScriptTemplateWizard.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSBatchScriptTemplateWizard.java
deleted file mode 100644
index 90338f2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSBatchScriptTemplateWizard.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois All rights reserved. This program
- * and the accompanying materials are made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html 
- * 	
- * Contributors: 
- * 	Albert L. Rossi - implementation
-					  replaces earlier ResourceManager wizard page
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.wizards;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManager;
-
-public class PBSBatchScriptTemplateWizard extends Wizard {
-
-	private final PBSBatchScriptTemplateWizardPage page;
-	private boolean added;
-
-	public PBSBatchScriptTemplateWizard(PBSResourceManager manager) throws Throwable {
-		page = new PBSBatchScriptTemplateWizardPage(manager);
-		added = false;
-	}
-
-	@Override
-	public void addPages() {
-		if (!added) {
-			super.addPage(page);
-			added = true;
-		}
-	}
-
-	public String getSelectedTemplate() {
-		return page.getSelectedTemplate();
-	}
-
-	@Override
-	public boolean performFinish() {
-		return true;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSBatchScriptTemplateWizardPage.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSBatchScriptTemplateWizardPage.java
deleted file mode 100644
index 74e1df6..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSBatchScriptTemplateWizardPage.java
+++ /dev/null
@@ -1,355 +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 Contributors:
- * 	Albert L. Rossi (NCSA) - full implementation
- *                         - modifications 05/11/2010
- *                  - modifications to use new converter class; non-nls
- *                    constants interface (09/14/2010)
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.wizards;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.InputDialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManager;
-import org.eclipse.ptp.rm.pbs.core.templates.PBSBatchScriptTemplate;
-import org.eclipse.ptp.rm.pbs.core.templates.PBSBatchScriptTemplateManager;
-import org.eclipse.ptp.rm.pbs.ui.PBSUIPlugin;
-import org.eclipse.ptp.rm.pbs.ui.dialogs.ScrollingEditableMessageDialog;
-import org.eclipse.ptp.rm.pbs.ui.messages.Messages;
-import org.eclipse.ptp.rm.pbs.ui.providers.AttributeContentProvider;
-import org.eclipse.ptp.rm.pbs.ui.providers.AttributeLabelProvider;
-import org.eclipse.ptp.rm.pbs.ui.utils.WidgetUtils;
-import org.eclipse.ptp.rm.ui.utils.WidgetListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.progress.UIJob;
-
-/**
- * Allows the user to create or modify new templates for use in the Launch Tab.
- * 
- * @author arossi
- */
-public class PBSBatchScriptTemplateWizardPage extends WizardPage implements IPBSNonNLSConstants {
-
-	/*
-	 * Associated with the selection of a choice of configuration file.
-	 */
-	private class ConfigurationChangeListener extends WidgetListener implements ISelectionChangedListener {
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			if (event.getSource() == readOnlyView)
-				updateSettings();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see
-		 * org.eclipse.ptp.rm.ui.utils.WidgetListener#doModifyText(org.eclipse
-		 * .swt.events.ModifyEvent)
-		 */
-		@Override
-		protected void doModifyText(ModifyEvent e) {
-			if (e.getSource() == templates)
-				updateSettings();
-		}
-	}
-
-	/*
-	 * Associated with the delete button.
-	 */
-	private class DeleteConfigurationSelectionAdapter implements SelectionListener {
-		public void widgetDefaultSelected(SelectionEvent e) {
-			widgetSelected(e);
-		}
-
-		/**
-		 * Deletes the selected configuration file, and updates the combo box
-		 * selections, as well as clearing the table viewer if the deleted file
-		 * was the one selected.
-		 */
-		public void widgetSelected(SelectionEvent e) {
-			try {
-				String name = WidgetUtils.getSelected(templates);
-				resourceManager.getTemplateManager().removeTemplate(name);
-				updateTemplates(name);
-				updateSettings();
-			} catch (Throwable t) {
-				t.printStackTrace();
-				WidgetUtils.errorMessage(getShell(), t, Messages.PBSRMLaunchConfigDeleteError_message,
-						Messages.PBSRMLaunchConfigDeleteError_title, false);
-			}
-		}
-	}
-
-	/*
-	 * Associated with the edit button.
-	 */
-	private class EditConfigurationSelectionAdapter implements SelectionListener {
-		public void widgetDefaultSelected(SelectionEvent e) {
-			widgetSelected(e);
-		}
-
-		/**
-		 * Opens the selected file for editing. If a new name is provided, the
-		 * changes are written to a new file by that name. Else changes are
-		 * overwritten to the existing file.
-		 */
-		public void widgetSelected(SelectionEvent e) {
-			FileWriter fw = null;
-			try {
-				Shell shell = getShell();
-				String newName = null;
-				String oldName = WidgetUtils.getSelected(templates);
-				InputDialog nameDialog = new InputDialog(shell, Messages.PBSRMLaunchConfigEditChoose_new + QM,
-						Messages.PBSRMLaunchConfigEditChoose_new_name, oldName, null);
-				if (nameDialog.open() == Window.CANCEL)
-					return;
-				newName = resourceManager.getTemplateManager().validateTemplateNameForEdit(nameDialog.getValue());
-
-				PBSBatchScriptTemplate template = resourceManager.getTemplateManager().loadTemplate(oldName, null);
-				ScrollingEditableMessageDialog dialog = new ScrollingEditableMessageDialog(getShell(),
-						Messages.PBSRMLaunchConfigEditChoose_message, template.getText());
-				if (dialog.open() == Window.CANCEL)
-					return;
-				String edited = dialog.getValue();
-				resourceManager.getTemplateManager().storeTemplate(edited, newName);
-				updateTemplates(newName);
-				updateSettings();
-			} catch (Throwable t) {
-				t.printStackTrace();
-				WidgetUtils.errorMessage(getShell(), t, Messages.PBSRMLaunchConfigEditError_message,
-						Messages.PBSRMLaunchConfigEditError_title, false);
-			} finally {
-				if (fw != null)
-					try {
-						fw.close();
-					} catch (IOException t) {
-						t.printStackTrace();
-					}
-			}
-		}
-	}
-
-	/*
-	 * Associated with the export button.
-	 */
-	private class ExportConfigurationSelectionAdapter implements SelectionListener {
-		public void widgetDefaultSelected(SelectionEvent e) {
-			widgetSelected(e);
-		}
-
-		/**
-		 * Stores the selected template to a file on the local file system.
-		 * 
-		 */
-		public void widgetSelected(SelectionEvent e) {
-			final String original = WidgetUtils.getSelected(templates);
-			String input = original;
-			if (ZEROSTR.equals(original))
-				return;
-			final String dir = handleExportBrowseButtonSelected();
-			if (ZEROSTR.equals(dir))
-				return;
-			InputDialog nameDialog = new InputDialog(PBSUIPlugin.getActiveWorkbenchShell(), Messages.PBSRMLaunchConfigExportRename,
-					Messages.PBSRMLaunchConfigExportRename_new, original, null);
-			if (nameDialog.open() != Window.CANCEL)
-				input = nameDialog.getValue();
-			final String renamed = input;
-			new UIJob(Messages.PBSRMLaunchConfigExportJobMessage0 + renamed + Messages.PBSRMLaunchConfigExportJobMessage1) {
-				@Override
-				public IStatus runInUIThread(IProgressMonitor monitor) {
-					try {
-						monitor.beginTask(Messages.PBSRMLaunchConfigImportJobMessage, 2);
-						resourceManager.getTemplateManager().exportTemplate(dir, original, renamed);
-						monitor.worked(2);
-					} catch (Throwable t) {
-						t.printStackTrace();
-						WidgetUtils.errorMessage(getShell(), t, Messages.PBSRMLaunchConfigExportError_message,
-								Messages.PBSRMLaunchConfigExportError_title, false);
-					} finally {
-						monitor.done();
-					}
-					return Status.OK_STATUS;
-				}
-			}.schedule();
-		}
-	}
-
-	/*
-	 * Associated with the import button.
-	 */
-	private class ImportConfigurationSelectionAdapter implements SelectionListener {
-		public void widgetDefaultSelected(SelectionEvent e) {
-			widgetSelected(e);
-		}
-
-		/**
-		 * Imports a template from a file selected from the local file system.
-		 * 
-		 */
-		public void widgetSelected(SelectionEvent e) {
-			String file = handleImportBrowseButtonSelected();
-			final File imported = new File(file);
-			new UIJob(Messages.PBSRMLaunchConfigImportJobMessage + imported.getName()) {
-				@Override
-				public IStatus runInUIThread(IProgressMonitor monitor) {
-					try {
-						monitor.beginTask(Messages.PBSRMLaunchConfigImportJobMessage, 2);
-						resourceManager.getTemplateManager().addImportedTemplate(imported);
-						monitor.worked(1);
-						updateTemplates(imported.getName());
-						updateSettings();
-					} catch (Throwable t) {
-						t.printStackTrace();
-						WidgetUtils.errorMessage(getShell(), t, Messages.PBSRMLaunchConfigImportError_message,
-								Messages.PBSRMLaunchConfigImportError_title, false);
-					} finally {
-						monitor.done();
-					}
-					return Status.OK_STATUS;
-				}
-			}.schedule();
-		}
-	}
-
-	private boolean isValid;
-
-	private ConfigurationChangeListener listener;
-	private TableViewer readOnlyView;
-	private final PBSResourceManager resourceManager;
-	private Combo templates;
-	private String selected;
-
-	public PBSBatchScriptTemplateWizardPage(PBSResourceManager rm) throws Throwable {
-		super(Messages.PBSConfigurationWizardPage_name);
-		setTitle(Messages.PBSConfigurationWizardPage_title);
-		setDescription(Messages.PBSConfigurationWizardPage_description);
-		this.resourceManager = rm;
-		selected = ZEROSTR;
-		setValid(true);
-	}
-
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout topLayout = new GridLayout();
-		composite.setLayout(topLayout);
-		createContents(composite);
-		PBSBatchScriptTemplate current = resourceManager.getTemplateManager().getCurrent();
-		String last = current == null ? PBSBatchScriptTemplateManager.FULL_TEMPLATE : current.getName();
-		WidgetUtils.select(templates, last);
-		setControl(composite);
-	}
-
-	public String getSelectedTemplate() {
-		return selected;
-	}
-
-	private void createContents(Composite parent) {
-		Group templateContainer = WidgetUtils.createFillingGroup(parent, ZEROSTR, 4, 1, false);
-		listener = new ConfigurationChangeListener();
-		String[] available = resourceManager.getTemplateManager().findAvailableTemplates();
-		String initial = available.length == 0 ? null : available[0];
-		templates = WidgetUtils.createItemCombo(templateContainer, Messages.PBSRMLaunchConfigTemplate_title, available, initial,
-				Messages.PBSRMLaunchConfigTemplate_message, true, listener, 2);
-		WidgetUtils.createLabel(templateContainer, ZEROSTR, SWT.LEFT, 1);
-		WidgetUtils.createButton(templateContainer, Messages.PBSRMLaunchConfigEditButton_title, null, SWT.PUSH, 1, true,
-				new EditConfigurationSelectionAdapter());
-		WidgetUtils.createButton(templateContainer, Messages.PBSRMLaunchConfigDeleteButton_title, null, SWT.PUSH, 1, true,
-				new DeleteConfigurationSelectionAdapter());
-		WidgetUtils.createButton(templateContainer, Messages.PBSRMLaunchConfigImportButton_title, null, SWT.PUSH, 1, true,
-				new ImportConfigurationSelectionAdapter());
-		WidgetUtils.createButton(templateContainer, Messages.PBSRMLaunchConfigExportButton_title, null, SWT.PUSH, 1, true,
-				new ExportConfigurationSelectionAdapter());
-
-		Group preferencesContainer = WidgetUtils.createFillingGroup(parent, Messages.PBSRMLaunchConfigPreferences_message, 1, 1,
-				false);
-		Table t = WidgetUtils.createFillingTable(preferencesContainer, 3, 500, 1, SWT.FULL_SELECTION | SWT.MULTI);
-		readOnlyView = new TableViewer(t);
-		readOnlyView.setContentProvider(new AttributeContentProvider());
-		readOnlyView.setLabelProvider(new AttributeLabelProvider());
-		WidgetUtils.addTableColumn(readOnlyView, Messages.PBSRMLaunchConfigPreferences_column_0, SWT.LEFT, null);
-		WidgetUtils.addTableColumn(readOnlyView, Messages.PBSRMLaunchConfigPreferences_column_1, SWT.LEFT, null);
-		WidgetUtils.addTableColumn(readOnlyView, Messages.PBSRMLaunchConfigPreferences_column_2, SWT.LEFT, null);
-		readOnlyView.getTable().setHeaderVisible(true);
-	}
-
-	private String handleExportBrowseButtonSelected() {
-		DirectoryDialog dialog = new DirectoryDialog(PBSUIPlugin.getActiveWorkbenchShell());
-		dialog.setText(Messages.PBSRMLaunchConfigExportButton_message);
-		return dialog.open();
-	}
-
-	private String handleImportBrowseButtonSelected() {
-		FileDialog dialog = new FileDialog(PBSUIPlugin.getActiveWorkbenchShell(), SWT.SINGLE);
-		dialog.setText(Messages.PBSRMLaunchConfigImportButton_message);
-		return dialog.open();
-	}
-
-	/**
-	 * @param b
-	 */
-	private void setValid(boolean b) {
-		isValid = b;
-		setPageComplete(isValid);
-	}
-
-	/*
-	 * Populates the table viewer with the attributes from the selected template
-	 * file.
-	 * 
-	 * @param choice the configuration file selected
-	 */
-	private void updateSettings() {
-		PBSBatchScriptTemplate template = null;
-		selected = WidgetUtils.getSelected(templates);
-		if (!ZEROSTR.equals(selected))
-			template = resourceManager.getTemplateManager().loadTemplate(selected, null);
-		if (template == null)
-			readOnlyView.setInput(this);
-		else
-			readOnlyView.setInput(template);
-	}
-
-	/*
-	 * Called after the Edit and Delete actions; refreshes the choices in the
-	 * combo box.
-	 * 
-	 * @param current the edited or deleted template
-	 */
-	private void updateTemplates(String current) {
-		listener.disable();
-		templates.setItems(resourceManager.getTemplateManager().findAvailableTemplates());
-		String next = WidgetUtils.select(templates, current);
-		listener.enable();
-		if (!next.equals(current))
-			WidgetUtils.select(templates, next);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSRMConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSRMConfigurationWizardPageFactory.java
deleted file mode 100644
index b9d8aa2..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSRMConfigurationWizardPageFactory.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.wizards;
-
-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-
-public class PBSRMConfigurationWizardPageFactory extends RMConfigurationWizardPageFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory#getPages(
-	 * org.eclipse.ptp.ui.wizards.IRMConfigurationWizard)
-	 */
-	@Override
-	public RMConfigurationWizardPage[] getPages(IRMConfigurationWizard wizard) {
-		RMConfigurationWizardPage wizardPages[];
-
-		wizardPages = new RMConfigurationWizardPage[1];
-		wizardPages[0] = new PBSResourceManagerConfigurationWizardPage(wizard);
-		return wizardPages;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSRMLaunchConfigurationDynamicTabWizardPage.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSRMLaunchConfigurationDynamicTabWizardPage.java
deleted file mode 100644
index 97b4b7d..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSRMLaunchConfigurationDynamicTabWizardPage.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois 
- * All rights reserved. This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0 which accompanies this
- * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
- * 	
- * Contributors: 
- * 	Albert L. Rossi - design and implementation
- *                  - modifications 05/11/2010
- *                  - modifications to use new converter class; non-nls
- *                    constants interface (09/14/2010); moved the
- *                    queue-name combo functionality into this class from
- *                    the launch tab (5.0) and added parameter to constructor
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.wizards;
-
-import java.util.Arrays;
-import java.util.Map;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.ptp.core.attributes.BooleanAttribute;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.rm.pbs.core.ConfigUtils;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.core.attributes.AttributePlaceholder;
-import org.eclipse.ptp.rm.pbs.core.templates.PBSBaseAttributeToTemplateConverter;
-import org.eclipse.ptp.rm.pbs.core.templates.PBSBatchScriptTemplate;
-import org.eclipse.ptp.rm.pbs.ui.launch.PBSRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.pbs.ui.messages.Messages;
-import org.eclipse.ptp.rm.pbs.ui.utils.WidgetUtils;
-import org.eclipse.ptp.rm.ui.launch.RMLaunchConfigurationDynamicTabWidgetListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * Used to display the PBS Job Attributes for configuration on the basis of the
- * selected template.
- * 
- * @author arossi
- * 
- */
-public class PBSRMLaunchConfigurationDynamicTabWizardPage extends WizardPage implements IPBSNonNLSConstants {
-	private Map<String, String[]> constrained;
-	private Composite container;
-	private final RMLaunchConfigurationDynamicTabWidgetListener listener;
-	private Map<String, AttributePlaceholder> pbsJobAttributes;
-	private final Map<Control, AttributePlaceholder> valueWidgets;
-	private final PBSRMLaunchConfigurationDynamicTab launchTab;
-
-	public PBSRMLaunchConfigurationDynamicTabWizardPage(PBSRMLaunchConfigurationDynamicTab launchTab,
-			Map<Control, AttributePlaceholder> valueWidgets, RMLaunchConfigurationDynamicTabWidgetListener listener,
-			PBSBatchScriptTemplate template) {
-		super(ZEROSTR);
-		this.launchTab = launchTab;
-		this.valueWidgets = valueWidgets;
-		this.listener = listener;
-		if (template != null) {
-			pbsJobAttributes = template.getPbsJobAttributes();
-			try {
-				constrained = template.getConverter().getData().getConstrained();
-			} catch (Throwable t) {
-				t.printStackTrace();
-			}
-		}
-	}
-
-	public void createControl(Composite parent) {
-		container = WidgetUtils.createAnonymousNonFillingGroup(parent, 3);
-		WidgetUtils.createLabel(container, Messages.DynamicTabWizardPage_ATTRIBUTE, SWT.LEFT, 1).setForeground(WidgetUtils.DKMG);
-		WidgetUtils.createLabel(container, Messages.DynamicTabWizardPage_VALUE, SWT.LEFT, 1).setForeground(WidgetUtils.DKMG);
-		WidgetUtils.createLabel(container, Messages.DynamicTabWizardPage_DESCRIPTION, SWT.LEFT, 1).setForeground(WidgetUtils.DKMG);
-		if (pbsJobAttributes != null) {
-			String[] attrNames = pbsJobAttributes.keySet().toArray(new String[0]);
-			Arrays.sort(attrNames, PBSBaseAttributeToTemplateConverter.getSorter());
-			for (String key : attrNames) {
-				AttributePlaceholder ap = pbsJobAttributes.get(key);
-				if (TAG_INTERNAL.equals(ap.getToolTip()))
-					continue;
-				IAttribute<?, ?, ?> attr = ap.getAttribute();
-				String name = ap.getName();
-				String descr = WidgetUtils.fitToLineLength(-1, attr.getDefinition().getDescription());
-				Label l = WidgetUtils.createLabel(container, name, SWT.LEFT, 1);
-				l.setToolTipText(WidgetUtils.fitToLineLength(40, ap.getToolTip()));
-				valueWidgets.put(getValueWidget(container, ap.getDefaultString(), attr), ap);
-				l = WidgetUtils.createLabel(container, descr, SWT.LEFT, 1);
-				l.setForeground(WidgetUtils.DKBL);
-			}
-		}
-		setControl(container);
-	}
-
-	/*
-	 * Constructs the appropriate widget based on the type of attribute. Only
-	 * four mappings implemented here: Integer : Spinner, Boolean : Button,
-	 * Constrained : Combo, else : Text.
-	 */
-	private Control getValueWidget(Composite container, String defaultString, IAttribute<?, ?, ?> attr) {
-		String value = attr.getValueAsString();
-		Control c = null;
-		if (attr instanceof BooleanAttribute) {
-			Button b = WidgetUtils.createButton(container, ZEROSTR, null, SWT.CHECK, 1, false, listener);
-			if (TRUE.equals(value))
-				b.setSelection(true);
-			c = b;
-		} else if (attr instanceof IntegerAttribute) {
-			/*
-			 * For spinners, the default string should represent the minimum
-			 * value
-			 */
-			IntegerAttribute iattr = (IntegerAttribute) attr;
-			c = WidgetUtils.createSpinner(container, null, iattr.getDefinition().getMinValue(),
-					iattr.getDefinition().getMaxValue(), Integer.parseInt(value), 1, false, listener);
-		} else {
-			String name = attr.getDefinition().getName();
-			String[] constraints = constrained.get(name);
-			if (constraints != null)
-				c = WidgetUtils.createItemCombo(container, null, constraints, constraints[0], ZEROSTR, false, listener, 1);
-			else if (name.equals(TAG_QUEUE)) {
-				String[] items = ConfigUtils.getCurrentQueues(launchTab.getResourceManager());
-				String first = items.length == 0 ? null : items[0];
-				RMLaunchConfigurationDynamicTabWidgetListener l = launchTab.createDestinationComboListener();
-				c = WidgetUtils.createItemCombo(container, null, items, first, ZEROSTR, false, l, 1);
-				c.addMouseListener((MouseListener) l);
-			} else
-				c = WidgetUtils.createText(container, value, true, listener, null);
-			c.setForeground(WidgetUtils.DKRD);
-		}
-		return c;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSResourceManagerConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSResourceManagerConfigurationWizardPage.java
deleted file mode 100644
index b3f1867..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/org/eclipse/ptp/rm/pbs/ui/wizards/PBSResourceManagerConfigurationWizardPage.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Albert L. Rossi - modifications to expose proxy type configuration (2010/11/04)
- ******************************************************************************/
-package org.eclipse.ptp.rm.pbs.ui.wizards;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.rm.pbs.core.IPBSNonNLSConstants;
-import org.eclipse.ptp.rm.pbs.core.rmsystem.PBSResourceManagerConfiguration;
-import org.eclipse.ptp.rm.pbs.ui.PBSUIPlugin;
-import org.eclipse.ptp.rm.pbs.ui.messages.Messages;
-import org.eclipse.ptp.rm.pbs.ui.utils.WidgetUtils;
-import org.eclipse.ptp.rm.ui.wizards.AbstractRemoteProxyResourceManagerConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.osgi.framework.Bundle;
-
-/**
- * Class provides for choice of configuration file to deploy with proxy.
- * 
- * @author arossi
- * 
- */
-public final class PBSResourceManagerConfigurationWizardPage extends AbstractRemoteProxyResourceManagerConfigurationWizardPage
-		implements IPBSNonNLSConstants {
-
-	private String[] types;
-	private Combo proxyTypes;
-	private final Properties proxyConfigs;
-	private PBSResourceManagerConfiguration pbsConfig;
-
-	public PBSResourceManagerConfigurationWizardPage(IRMConfigurationWizard wizard) {
-		super(wizard, Messages.PBSResourceManagerConfigurationWizardPage_name);
-		setTitle(Messages.PBSResourceManagerConfigurationWizardPage_title);
-		setDescription(Messages.PBSResourceManagerConfigurationWizardPage_description);
-		proxyPathEnabled = false;
-		fManualLaunchEnabled = false;
-		proxyConfigs = new Properties();
-		setAvailableConfigurations();
-	}
-
-	@Override
-	public boolean performOk() {
-		pbsConfig.setProxyConfiguration(proxyConfigs.getProperty(proxyTypes.getText()));
-		return super.performOk();
-	}
-
-	@Override
-	protected void addCustomWidgets(Composite parent) {
-		proxyTypes = WidgetUtils.createItemCombo(parent, Messages.PBSProxyConfigComboTitle, types, ZEROSTR, ZEROSTR, true, null, 2);
-		proxyTypes.addSelectionListener(listener);
-	}
-
-	@Override
-	protected void initContents() {
-		super.initContents();
-		pbsConfig = (PBSResourceManagerConfiguration) getConfiguration();
-		String proxyPath = pbsConfig.getProxyConfiguration();
-		if (proxyPath != null && proxyPath.length() != 0) {
-			for (int i = 0; i < types.length; i++) {
-				String path = proxyConfigs.getProperty(types[i]);
-				if (proxyPath.equals(path)) {
-					proxyTypes.select(i);
-					break;
-				}
-			}
-		}
-	}
-
-	@Override
-	protected boolean isValidSetting() {
-		String choice = proxyTypes.getText();
-		if (choice == null || choice.length() == 0) {
-			return false;
-		}
-		return super.isValidSetting();
-	}
-
-	private void getAvailableConfigurations() throws IOException {
-		proxyConfigs.clear();
-		URL url = null;
-		if (PBSUIPlugin.getDefault() != null) {
-			Bundle bundle = PBSUIPlugin.getDefault().getBundle();
-			url = FileLocator.find(bundle, new Path(SRC + PATH_SEP + RM_CONFIG_PROPS), null);
-		} else {
-			url = new File(RM_CONFIG_PROPS).toURL();
-		}
-
-		if (url == null) {
-			return;
-		}
-		InputStream s = null;
-		try {
-			s = url.openStream();
-			proxyConfigs.load(s);
-		} finally {
-			try {
-				if (s != null) {
-					s.close();
-				}
-			} catch (IOException e) {
-			}
-		}
-	}
-
-	private void setAvailableConfigurations() {
-		try {
-			getAvailableConfigurations();
-			types = proxyConfigs.keySet().toArray(new String[0]);
-		} catch (IOException t) {
-			t.printStackTrace();
-			types = new String[0];
-		}
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.pbs.ui/src/rm_configurations.properties b/rms/org.eclipse.ptp.rm.pbs.ui/src/rm_configurations.properties
deleted file mode 100644
index 4506fba..0000000
--- a/rms/org.eclipse.ptp.rm.pbs.ui/src/rm_configurations.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-PBS_Pro=PBS_Pro.job_attributes.xml
-PBS_Torque_Standard=PBS_Torque_Standard.job_attributes.xml
-PBS_Torque_SMP=PBS_Torque_SMP.job_attributes.xml
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/.classpath b/rms/org.eclipse.ptp.rm.smoa.core/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/.project b/rms/org.eclipse.ptp.rm.smoa.core/.project
deleted file mode 100644
index 833a372..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.smoa.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.smoa.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 28d9c06..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,64 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.smoa.core;singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.smoa.core.SMOACoreActivator
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
-Bundle-ClassPath: .
-Require-Bundle: com.smoa.comp,
- org.eclipse.core.runtime,
- org.eclipse.core.filesystem,
- org.eclipse.debug.core,
- org.eclipse.ptp;bundle-version="4.0.0",
- org.eclipse.ptp.core,
- org.eclipse.ptp.proxy.protocol,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.rm.core,
- org.eclipse.ptp.services.core,
- org.eclipse.search,
- org.eclipse.ui
-Export-Package: org.eclipse.ptp.rm.smoa.core;
-  uses:="org.eclipse.core.runtime,
-   org.eclipse.ptp.remote.core,
-   org.eclipse.ptp.rm.core.rmsystem,
-   org.osgi.framework,
-   com.smoa.comp.stubs.factory,
-   org.eclipse.ptp.rm.smoa.core.rservices",
- org.eclipse.ptp.rm.smoa.core.attrib;uses:="org.eclipse.ptp.core.attributes",
- org.eclipse.ptp.rm.smoa.core.rmsystem;
-  uses:="org.eclipse.ptp.rtsystem,
-   com.smoa.comp.sdk.types,
-   org.eclipse.core.runtime,
-   com.smoa.comp.sdk,
-   org.eclipse.ptp.core.elements.attributes,
-   org.eclipse.ptp.rmsystem,
-   org.eclipse.ptp.rm.smoa.core,
-   org.eclipse.ptp.core.attributes,
-   org.eclipse.ptp.core.elementcontrols,
-   org.eclipse.ptp.rm.smoa.core.rtsystem,
-   org.eclipse.ptp.core.elements",
- org.eclipse.ptp.rm.smoa.core.rservices;
-  uses:="org.eclipse.core.filesystem.provider,
-   org.eclipse.core.runtime,
-   com.smoa.comp.sdk.types,
-   com.smoa.core.sdk.attachments,
-   com.smoa.comp.sdk,
-   org.eclipse.ptp.remote.core,
-   org.eclipse.ptp.rm.smoa.core,
-   org.eclipse.core.filesystem",
- org.eclipse.ptp.rm.smoa.core.rtsystem;
-  uses:="org.eclipse.ptp.rtsystem,
-   org.eclipse.core.runtime,
-   org.eclipse.ptp.rm.smoa.core,
-   org.eclipse.ptp.core.attributes,
-   org.eclipse.ptp.core.elements",
- org.eclipse.ptp.rm.smoa.core.util
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: javax.xml.bind,
- org.eclipse.core.filesystem,
- org.eclipse.core.internal.filesystem,
- org.eclipse.equinox.security.storage,
- org.eclipse.ptp.utils.core
-Bundle-ActivationPolicy: lazy
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/NOTICE.txt b/rms/org.eclipse.ptp.rm.smoa.core/NOTICE.txt
deleted file mode 100644
index d4e7c4b..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/NOTICE.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Apache Geronimo JAX-WS 2.1 API
-Copyright 2003-2008 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/about.html b/rms/org.eclipse.ptp.rm.smoa.core/about.html
deleted file mode 100644
index 061df82..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/about.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-<h3>Acknowledgements</h3>
-
-<p>This work is sponsored by the UCOMS project (System rozproszonego
-przetwarzania i montorowania komputerowego stosowany w odkrywaniu nowych źródeÅ‚
-energii oraz zarzÄ…dzania surowcami energetycznymi) under award number MNiSW Nr
-469/1/N - USA/2009 (z dnia 24 listopada 2009r.) in close collaboration with U.S.
-research institutions involved in the U.S. Department of Energy (DOE) funded
-grant under award number DE-FG02-04ER46136 and the Board of Regents, State of
-Louisiana, under contact no. DOE/LEQSF(2004-07).</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/build.properties b/rms/org.eclipse.ptp.rm.smoa.core/build.properties
deleted file mode 100644
index 0dc34f7..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/plugin.properties b/rms/org.eclipse.ptp.rm.smoa.core/plugin.properties
deleted file mode 100644
index d134e9e..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-pluginName=PTP SMOA Computing Core
-Bundle-Vendor = Poznan Supercomputing and Networking Center
-remoteServices.name = SMOA Computing
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/plugin.xml b/rms/org.eclipse.ptp.rm.smoa.core/plugin.xml
deleted file mode 100644
index 81490a3..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/plugin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<plugin>

-	<extension

-         point="org.eclipse.ptp.remote.core.remoteServices">

-      <remoteServices

-            class="org.eclipse.ptp.rm.smoa.core.SMOARemoteServicesFactory"

-            id="org.eclipse.ptp.remote.SMOARemoteServices"

-            name="%remoteServices.name" scheme="smoa-comp">

-      </remoteServices>

-   </extension>

-   

-     <!-- needed for PTP -->

-  <extension

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

-  >

-    <provider

-      class="org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManagerConfiguration"

-      id="org.eclipse.ptp.rm.smoa.SMOAServiceProvider"

-      name="SMOA Computing"

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

-    />

-  </extension>

-   <extension

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

-      <resourceManager

-            class="org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManagerFactory"

-            id="org.eclipse.ptp.rm.smoa.SMOAServiceProvider">

-         <resourceManagerControl

-             class="org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManagerFactory"

-             id="org.eclipse.ptp.rm.smoa.control">

-         </resourceManagerControl>

-         <resourceManagerMonitor

-            class="org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManagerFactory"

-            id="org.eclipse.ptp.rm.smoa.monitor">

-         </resourceManagerMonitor>

-      </resourceManager>

-   </extension>

-

-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOAConfiguration.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOAConfiguration.java
deleted file mode 100644
index 4ce3723..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOAConfiguration.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core;
-
-import java.util.List;
-
-import org.eclipse.ptp.rm.core.rmsystem.IRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManager;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOAConnection;
-
-import com.smoa.comp.stubs.factory.ApplicationsType.Application;
-
-/**
- * Holds values needed by {@link SMOAResourceManager} to operate - that is RM
- * configuration and connection options.
- * 
- * Is also informed by {@link SMOAResourceManager} about the available
- * applications.
- * 
- * Implemented by {@link SMOAServiceProvider}
- */
-public interface SMOAConfiguration extends IRemoteResourceManagerConfiguration {
-
-	/** Authentication mechanisms used to connect to SMOA Computing */
-	enum AuthType {
-		Anonymous, UsernamePassword, GSI
-	}
-
-	/** Returns application for given name */
-	Application getAppForName(String name);
-
-	/** Returns the method of authentication */
-	AuthType getAuthType();
-
-	/** List of predefined applications on the host */
-	List<String> getAvailableAppList();
-
-	/** Path to CA certificate */
-	String getCaCertPath();
-
-	/* If the authentication type needs no <insert name here>, result undefined. */
-
-	/** For convenience, returns the associated connection */
-	SMOAConnection getConnection();
-
-	/** Returns the password. */
-	String getPassword();
-
-	/** port number for the SMOA computing */
-	Integer getPort();
-
-	/** Service designed name */
-	String getServiceDN();
-
-	/* Managing available applications */
-
-	/** must return SMOA computing URL - host name */
-	String getUrl();
-
-	/** Returns the user name. */
-	String getUser();
-
-	/** Sets predefined application list */
-	void setAvailableAppList(List<Application> apps);
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOACoreActivator.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOACoreActivator.java
deleted file mode 100644
index f21100e..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOACoreActivator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The plug-in activator.
- */
-public class SMOACoreActivator extends Plugin {
-
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.smoa.core"; //$NON-NLS-1$
-
-	private static SMOACoreActivator plugin;
-
-	public static SMOACoreActivator getDefault() {
-		return plugin;
-	}
-
-	public SMOACoreActivator() {
-		plugin = this;
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOARemoteServicesFactory.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOARemoteServicesFactory.java
deleted file mode 100644
index a07a8a0..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/SMOARemoteServicesFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core;
-
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.IRemoteServicesDescriptor;
-import org.eclipse.ptp.remote.core.IRemoteServicesFactory;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOARemoteServices;
-
-/**
- * Passed to proper extension point (in plugin.xml) adds
- * {@link SMOARemoteServices} to the public list of {@link IRemoteSrvices}
- */
-public class SMOARemoteServicesFactory implements IRemoteServicesFactory {
-
-	public static final String ID = SMOARemoteServices.class.getName();
-	private SMOARemoteServices services;
-
-	public IRemoteServices getServices(IRemoteServicesDescriptor descriptor) {
-
-		if (services == null) {
-			services = new SMOARemoteServices(ID, "SMOA Computing"); //$NON-NLS-1$
-		}
-
-		return services;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/Messages.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/Messages.java
deleted file mode 100644
index a4138a5..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/Messages.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.attrib;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.smoa.core.attrib.messages"; //$NON-NLS-1$
-	public static String SMOAJobAttributes_0;
-	public static String SMOAJobAttributes_Application;
-	public static String SMOAJobAttributes_CustomApplication;
-	public static String SMOAJobAttributes_CustomMakeCommand;
-	public static String SMOAJobAttributes_JobDescription;
-	public static String SMOAJobAttributes_JobNativeSpec;
-	public static String SMOAJobAttributes_MaxCpus;
-	public static String SMOAJobAttributes_MinCpus;
-	public static String SMOAJobAttributes_PreferredMachines;
-	public static String SMOAJobAttributes_QueueName;
-	public static String SMOAJobAttributes_RunDirectly;
-	public static String SMOAJobAttributes_SmoaUUID;
-	public static String SMOANodeAttributes_CpuArch;
-	public static String SMOANodeAttributes_CpuCount;
-	public static String SMOANodeAttributes_PhysicalMemory;
-	public static String SMOARMAttributes_AcceptsNewActvities;
-	public static String SMOARMAttributes_CommonName;
-	public static String SMOARMAttributes_QueueingSystem;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAJobAttributes.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAJobAttributes.java
deleted file mode 100644
index 84c89b2..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAJobAttributes.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.attrib;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-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.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-
-/**
- * Keeps attributes specific for SMOA Jobs.
- * 
- * Also keeps environmental variables
- */
-public class SMOAJobAttributes extends AttributeManager {
-
-	/** Variable name requesting to run 'make' before starting task */
-	public static final String ENV_IF_MAKE = "SMOA_COMP_PTP_RUN_MAKE"; //$NON-NLS-1$
-	/** Variable name requesting to run 'make' before starting task */
-	public static final String ENV_MAKE_COMMAND = "SMOA_COMP_PTP_MAKE_COMMAND"; //$NON-NLS-1$
-	/** Environment variable containing file name for stdout */
-	public static final String ENV_STDOUT = "SMOA_COMP_PTP_STDOUT"; //$NON-NLS-1$
-	/** Environment variable containing file name for stderr */
-	public static final String ENV_STDERR = "SMOA_COMP_PTP_STDERR"; //$NON-NLS-1$
-	/** Environment variable containing for all processes their node names */
-	public static final String ENV_MACHINEFILE = "SMOA_COMP_PTP_MACHINEFILE"; //$NON-NLS-1$
-
-	/** Text displayed in GUI launch configuration for no wrapper script */
-	public static final String NO_WRAPPER_SCRIPT = Messages.SMOAJobAttributes_RunDirectly;
-
-	public final static StringAttributeDefinition getAppNameDef() {
-		return new StringAttributeDefinition("applicationName", Messages.SMOAJobAttributes_Application, //$NON-NLS-1$
-				Messages.SMOAJobAttributes_Application, true, Messages.SMOAJobAttributes_CustomApplication);
-	}
-
-	public final static StringAttributeDefinition getCustomMakeCommandDef() {
-		return new StringAttributeDefinition("customMakeCommand", //$NON-NLS-1$
-				Messages.SMOAJobAttributes_CustomMakeCommand, Messages.SMOAJobAttributes_CustomMakeCommand, true, null);
-	}
-
-	public final static StringAttributeDefinition getDescDef() {
-		return new StringAttributeDefinition("job_desc", Messages.SMOAJobAttributes_JobDescription, //$NON-NLS-1$
-				Messages.SMOAJobAttributes_JobDescription, true, ""); //$NON-NLS-1$
-	}
-
-	public final static StringMapAttributeDefinition getEnvDef() {
-		return new StringMapAttributeDefinition("org.eclipse.debug.core.environmentVariables", //$NON-NLS-1$
-				"Enviornment vars", "Enviornment vars", false); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	public final static BooleanAttributeDefinition getIfCustomMakeDef() {
-		return new BooleanAttributeDefinition("ifCustomMakeCommand", //$NON-NLS-1$
-				"ifCustomMakeCommand", "ifCustomMakeCommand", false, false); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	/**
-	 * Returns set of possible SMOA Activity attributes.
-	 * 
-	 * Used in LaunchConfiguration for filtering attributes.
-	 */
-	public static Map<String, IAttributeDefinition<?, ?, ?>> getLaunchAttributes() {
-		final Map<String, IAttributeDefinition<?, ?, ?>> map = new TreeMap<String, IAttributeDefinition<?, ?, ?>>();
-
-		putFromDef(map, ElementAttributes.getNameAttributeDefinition());
-
-		putFromDef(map, JobAttributes.getWorkingDirectoryAttributeDefinition());
-		putFromDef(map, JobAttributes.getQueueIdAttributeDefinition());
-
-		putFromDef(map, JobAttributes.getDebugFlagAttributeDefinition());
-		putFromDef(map, JobAttributes.getDebuggerArgumentsAttributeDefinition());
-		putFromDef(map,
-				JobAttributes.getDebuggerExecutableNameAttributeDefinition());
-		putFromDef(map,
-				JobAttributes.getDebuggerExecutablePathAttributeDefinition());
-		putFromDef(map, JobAttributes.getDebuggerIdAttributeDefinition());
-		putFromDef(map,
-				JobAttributes.getDebuggerStopInMainFlagAttributeDefinition());
-
-		putFromDef(map, getMinCpuDef());
-		putFromDef(map, getMaxCpuDef());
-		putFromDef(map, getDescDef());
-		putFromDef(map, getNativeSpecDef());
-		putFromDef(map, getPrefferedDef());
-		putFromDef(map, getEnvDef());
-		putFromDef(map, getAppNameDef());
-		putFromDef(map, getMakeDef());
-		putFromDef(map, getIfCustomMakeDef());
-		putFromDef(map, getCustomMakeCommandDef());
-		putFromDef(map, getQueueNameDef());
-
-		return map;
-	}
-
-	public final static BooleanAttributeDefinition getMakeDef() {
-		return new BooleanAttributeDefinition("runMake", Messages.SMOAJobAttributes_0, "runMake", //$NON-NLS-1$ //$NON-NLS-2$
-				false, false);
-	}
-
-	public final static IntegerAttributeDefinition getMaxCpuDef() {
-		return new IntegerAttributeDefinition("cpu_max", Messages.SMOAJobAttributes_MaxCpus, //$NON-NLS-1$
-				Messages.SMOAJobAttributes_MaxCpus, true, 1);
-	}
-
-	public final static IntegerAttributeDefinition getMinCpuDef() {
-		return new IntegerAttributeDefinition("cpu_min", Messages.SMOAJobAttributes_MinCpus, //$NON-NLS-1$
-				Messages.SMOAJobAttributes_MinCpus, true, 1);
-	}
-
-	public final static StringAttributeDefinition getNativeSpecDef() {
-		return new StringAttributeDefinition("job_native_spec", //$NON-NLS-1$
-				Messages.SMOAJobAttributes_JobNativeSpec, Messages.SMOAJobAttributes_JobNativeSpec, true, ""); //$NON-NLS-1$
-	}
-
-	public final static ArrayAttributeDefinition<String> getPrefferedDef() {
-		return new ArrayAttributeDefinition<String>("preffered_machines", //$NON-NLS-1$
-				Messages.SMOAJobAttributes_PreferredMachines, Messages.SMOAJobAttributes_PreferredMachines, true, new String[0]);
-	}
-
-	public final static StringAttributeDefinition getQueueNameDef() {
-		return new StringAttributeDefinition("queue_name", Messages.SMOAJobAttributes_QueueName, //$NON-NLS-1$
-				Messages.SMOAJobAttributes_QueueName, true, null);
-	}
-
-	public final static StringAttributeDefinition getSmoaUuidDef() {
-		return new StringAttributeDefinition("smoa_uid", Messages.SMOAJobAttributes_SmoaUUID, //$NON-NLS-1$
-				Messages.SMOAJobAttributes_SmoaUUID, true, null);
-	}
-
-	private static void putFromDef(
-			Map<String, IAttributeDefinition<?, ?, ?>> map,
-			IAttributeDefinition<?, ?, ?> def) {
-		map.put(def.getId(), def);
-	}
-
-	public SMOAJobAttributes() {
-		addAttribute(JobAttributes.getJobIdAttributeDefinition().create());
-		addAttribute(JobAttributes.getStateAttributeDefinition().create());
-		addAttribute(JobAttributes.getUserIdAttributeDefinition().create());
-		addAttribute(ElementAttributes.getNameAttributeDefinition().create());
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAMachineAttributes.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAMachineAttributes.java
deleted file mode 100644
index a86810e..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAMachineAttributes.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.attrib;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-
-/**
- * Keeps attributes specific for SMOA Machines
- */
-public class SMOAMachineAttributes extends AttributeManager {
-
-	public SMOAMachineAttributes() {
-		try {
-			addAttribute(MachineAttributes.getNumNodesAttributeDefinition()
-					.create());
-			addAttribute(MachineAttributes.getStateAttributeDefinition()
-					.create(MachineAttributes.State.UP));
-		} catch (final IllegalValueException e) {
-			throw new RuntimeException("This will never hapen", e); //$NON-NLS-1$
-		}
-		addAttribute(ElementAttributes.getNameAttributeDefinition().create());
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOANodeAttributes.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOANodeAttributes.java
deleted file mode 100644
index 9f0d95f..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOANodeAttributes.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.attrib;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IntegerAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-
-/**
- * Keeps attributes specific for SMOA Node
- */
-
-public class SMOANodeAttributes extends AttributeManager {
-
-	private static final IntegerAttributeDefinition cpuCount = new IntegerAttributeDefinition(
-			"cpu_count", Messages.SMOANodeAttributes_CpuCount, Messages.SMOANodeAttributes_CpuCount, true, 1); //$NON-NLS-1$
-
-	private static final StringAttributeDefinition cpuArch = new StringAttributeDefinition(
-			"cpu_arch", Messages.SMOANodeAttributes_CpuArch, Messages.SMOANodeAttributes_CpuArch, true, ""); //$NON-NLS-1$ //$NON-NLS-2$
-
-	private static final StringAttributeDefinition memorySize = new StringAttributeDefinition(
-			"phys_mem", Messages.SMOANodeAttributes_PhysicalMemory, Messages.SMOANodeAttributes_PhysicalMemory, true, null); //$NON-NLS-1$
-
-	public static StringAttributeDefinition getCpuArchDef() {
-		return cpuArch;
-	}
-
-	public static IntegerAttributeDefinition getCpuCountDef() {
-		return cpuCount;
-	}
-
-	public static StringAttributeDefinition getMemorySizeDef() {
-		return memorySize;
-	}
-
-	public SMOANodeAttributes() {
-		addAttribute(ElementAttributes.getNameAttributeDefinition().create());
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAQueueAttributes.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAQueueAttributes.java
deleted file mode 100644
index cfe3034..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOAQueueAttributes.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.attrib;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.QueueAttributes;
-
-/**
- * Keeps attributes specific for SMOA Queues
- */
-
-public class SMOAQueueAttributes extends AttributeManager {
-	public SMOAQueueAttributes() {
-		addAttribute(QueueAttributes.getStateAttributeDefinition().create());
-		addAttribute(ElementAttributes.getNameAttributeDefinition().create());
-		addAttribute(ElementAttributes.getIdAttributeDefinition().create());
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOARMAttributes.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOARMAttributes.java
deleted file mode 100644
index 95c64f4..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/SMOARMAttributes.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.attrib;
-
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.BooleanAttributeDefinition;
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-
-/**
- * Keeps attributes specific for SMOA ResourceManager
- */
-
-public class SMOARMAttributes extends AttributeManager {
-
-	static private StringAttributeDefinition queuingSystem = new StringAttributeDefinition(
-			"queuingSystem", Messages.SMOARMAttributes_QueueingSystem, Messages.SMOARMAttributes_QueueingSystem, true, null); //$NON-NLS-1$
-	static private StringAttributeDefinition commonName = new StringAttributeDefinition(
-			"commonName", Messages.SMOARMAttributes_CommonName, Messages.SMOARMAttributes_CommonName, true, null); //$NON-NLS-1$
-
-	static private BooleanAttributeDefinition acceptsActivities = new BooleanAttributeDefinition(
-			"isIsAcceptingNewActivities", Messages.SMOARMAttributes_AcceptsNewActvities, //$NON-NLS-1$
-			Messages.SMOARMAttributes_AcceptsNewActvities, true, null);
-
-	static public final BooleanAttributeDefinition getAcceptsActivitiesDef() {
-		return acceptsActivities;
-	}
-
-	static public final StringAttributeDefinition getCommonNameDef() {
-		return commonName;
-	}
-
-	static public final StringAttributeDefinition getQueuingSystemDef() {
-		return queuingSystem;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/StringMapAttribute.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/StringMapAttribute.java
deleted file mode 100644
index 4666b16..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/StringMapAttribute.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.attrib;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.ptp.core.attributes.AbstractAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-
-/**
- * A {@link AbstractAttribute} that holds string-to-string map.
- * 
- * For the definition, see {@link StringMapAttributeDefinition}.
- */
-public class StringMapAttribute
-		extends
-		AbstractAttribute<Map<String, String>, StringMapAttribute, StringMapAttributeDefinition> {
-
-	Map<String, String> value = new HashMap<String, String>();
-
-	public StringMapAttribute(
-			StringMapAttributeDefinition mapAttributeDefinition,
-			Map<String, String> value) {
-		super(mapAttributeDefinition);
-
-		this.value.putAll(value);
-	}
-
-	public StringMapAttribute(
-			StringMapAttributeDefinition mapAttributeDefinition, String value)
-			throws IllegalValueException {
-		super(mapAttributeDefinition);
-		setValueAsString(value);
-	}
-
-	@Override
-	protected int doCompareTo(StringMapAttribute other) {
-		return getDefinition().getName().compareToIgnoreCase(
-				other.getDefinition().getName());
-	}
-
-	@Override
-	protected StringMapAttribute doCopy() {
-		return new StringMapAttribute(getDefinition(), value);
-	}
-
-	@Override
-	protected boolean doEquals(StringMapAttribute other) {
-		return value.equals(other.value);
-	}
-
-	@Override
-	protected int doHashCode() {
-		return value.hashCode();
-	}
-
-	public Map<String, String> getValue() {
-		return Collections.unmodifiableMap(value);
-	}
-
-	public String getValueAsString() {
-		final StringBuilder result = new StringBuilder();
-		for (final Entry<String, String> element : value.entrySet()) {
-			result.append(element.getKey().replaceAll(" = ", " \\= ") //$NON-NLS-1$ //$NON-NLS-2$
-					.replaceAll(" ; ", " \\; ")); //$NON-NLS-1$ //$NON-NLS-2$
-			result.append(" = "); //$NON-NLS-1$
-			result.append(element.getValue().replaceAll(" ; ", " \\; ")); //$NON-NLS-1$ //$NON-NLS-2$
-			result.append(" ; "); //$NON-NLS-1$
-		}
-		result.delete(result.length() - 3, result.length() - 1);
-		return result.toString();
-	}
-
-	public boolean isValid(String string) {
-		final String[] pairs = string.split(" ; "); //$NON-NLS-1$
-		for (final String pair : pairs) {
-			final String[] keyVal = pair.split(" = ", 2); //$NON-NLS-1$
-			if (keyVal.length != 2) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public void setValue(Map<String, String> value)
-			throws IllegalValueException {
-		this.value.clear();
-		this.value.putAll(value);
-
-	}
-
-	public void setValueAsString(String string) throws IllegalValueException {
-		final Map<String, String> newVal = new HashMap<String, String>();
-
-		final String[] pairs = string.split(" ; "); //$NON-NLS-1$
-
-		for (final String pair : pairs) {
-			final String[] keyVal = pair.replaceAll(" \\; ", " ; ").split(" = ", 2); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			if (keyVal.length != 2) {
-				throw new IllegalValueException("Bad format"); //$NON-NLS-1$
-			}
-			newVal.put(keyVal[0].replaceAll(" \\= ", " = "), keyVal[1]); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-		value = newVal;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/StringMapAttributeDefinition.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/StringMapAttributeDefinition.java
deleted file mode 100644
index dbcd3bd..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/StringMapAttributeDefinition.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.attrib;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ptp.core.attributes.AbstractAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-
-/**
- * A {@link AbstractAttributeDefinition} for storing a string-to-string map.
- * 
- * The attribute is called {@link StringMapAttribute}.
- */
-
-public class StringMapAttributeDefinition
-		extends
-		AbstractAttributeDefinition<Map<String, String>, StringMapAttribute, StringMapAttributeDefinition> {
-
-	private final Map<String, String> defaultValue;
-
-	public StringMapAttributeDefinition(String uniqueId, String name,
-			String description, boolean display) {
-		this(uniqueId, name, description, display,
-				new HashMap<String, String>());
-	}
-
-	public StringMapAttributeDefinition(String uniqueId, String name,
-			String description, boolean display,
-			final Map<String, String> defaultValue) {
-		super(uniqueId, name, description, display);
-		this.defaultValue = defaultValue;
-	}
-
-	public StringMapAttribute create() throws IllegalValueException {
-		return new StringMapAttribute(this, defaultValue);
-	}
-
-	public StringMapAttribute create(Map<String, String> value)
-			throws IllegalValueException {
-		return new StringMapAttribute(this, value);
-	}
-
-	public StringMapAttribute create(String value) throws IllegalValueException {
-		return new StringMapAttribute(this, value);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/messages.properties b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/messages.properties
deleted file mode 100644
index cc8c9c3..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/attrib/messages.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-SMOAJobAttributes_0=runMake
-SMOAJobAttributes_Application=Application
-SMOAJobAttributes_CustomApplication=Custom
-SMOAJobAttributes_CustomMakeCommand=Custom make command
-SMOAJobAttributes_JobDescription=Job description
-SMOAJobAttributes_JobNativeSpec=Job native specification
-SMOAJobAttributes_MaxCpus=Max CPU-s
-SMOAJobAttributes_MinCpus=Min CPU-s
-SMOAJobAttributes_PreferredMachines=Preffered machines
-SMOAJobAttributes_QueueName=Queue name
-SMOAJobAttributes_RunDirectly=Run directly
-SMOAJobAttributes_SmoaUUID=SMOA Comp Job UUID
-SMOANodeAttributes_CpuArch=CPU architecture
-SMOANodeAttributes_CpuCount=CPU count
-SMOANodeAttributes_PhysicalMemory=Physical Memory
-SMOARMAttributes_AcceptsNewActvities=Accepts new activities
-SMOARMAttributes_CommonName=Common name
-SMOARMAttributes_QueueingSystem=Queuing System
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/JobThread.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/JobThread.java
deleted file mode 100644
index 95ce6ca..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/JobThread.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rmsystem;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.BitSet;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPResourceManager;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.rm.smoa.core.rmsystem.PoolingIntervalsAndStatic.SMOAJobState;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOAFileStore;
-import org.eclipse.ptp.rm.smoa.core.util.NotifyShell;
-
-import com.smoa.comp.sdk.SMOAFactory;
-import com.smoa.comp.sdk.exceptions.FileNotFoundException;
-import com.smoa.comp.sdk.exceptions.NotAuthorizedException;
-import com.smoa.comp.sdk.exceptions.UnknownActivityIdentifierException;
-import com.smoa.comp.sdk.types.ActivityEndpointReference;
-import com.smoa.comp.sdk.types.SMOAActivityStatus;
-
-/**
- * Thread for monitoring a single job - checks state and transfers standard
- * output. Allows job's termination.
- */
-class JobThread extends Thread {
-	// The RM that created the job
-	private final SMOAResourceManager rm;
-	private final IPResourceManager pRM;
-
-	// The eclipse job control object
-	private final IPJob jobControl;
-
-	// The SMOA job control object
-	private final ActivityEndpointReference activityIdentifier;
-
-	private final SMOAFactory factory;
-	private final IRemoteFileManager fileManager;
-
-	// Remote files used by launch
-	private final IFileStore out;
-	private final IFileStore err;
-	private final IFileStore sh;
-	private final IFileStore machinefile;
-
-	// Offsets for the output files
-	private int stdOutOffset = 0;
-	private int stdErrOffset = 0;
-
-	/**
-	 * Constructs the job thread for monitoring a single job
-	 */
-	public JobThread(SMOAResourceManager rm, SMOAFactory factory, ActivityEndpointReference activityEndpointReference,
-			IPJob jobControl, String out, String err, String sh, String machinefile) {
-		this.rm = rm;
-		this.pRM = (IPResourceManager) rm.getAdapter(IPResourceManager.class);
-		this.factory = factory;
-		this.activityIdentifier = activityEndpointReference;
-		this.jobControl = jobControl;
-
-		this.setPriority(MIN_PRIORITY);
-		this.setName("JobListener for " + activityIdentifier.getActivityUUID()); //$NON-NLS-1$
-
-		final IRemoteFileManager fileManager_t = PTPRemoteCorePlugin.getDefault()
-				.getRemoteServices(rm.getControlConfiguration().getRemoteServicesId())
-				.getFileManager(rm.getControlConfiguration().getConnection());
-
-		fileManager = fileManager_t;
-
-		this.out = fileManager.getResource(out);
-		this.err = fileManager.getResource(err);
-		if (sh != null) {
-			this.sh = fileManager.getResource(sh);
-		} else {
-			this.sh = null;
-		}
-		if (machinefile != null) {
-			this.machinefile = fileManager.getResource(machinefile);
-		} else {
-			this.machinefile = null;
-		}
-
-	}
-
-	/** Adds given text to standard error, and makes it appear on console */
-	void appendStdErr(String stderr) {
-		final AttributeManager outManager = new AttributeManager();
-		outManager.addAttribute(ProcessAttributes.getStderrAttributeDefinition().create(stderr));
-		final BitSet bs = new BitSet();
-		bs.set(jobControl.getProcessJobRanks().nextSetBit(0));
-		jobControl.addProcessAttributes(bs, outManager);
-	}
-
-	/** Adds given text to standard output, and makes it appear on console */
-	void appendStdOut(String stdout) {
-		final AttributeManager outManager = new AttributeManager();
-		outManager.addAttribute(ProcessAttributes.getStdoutAttributeDefinition().create(stdout));
-		final BitSet bs = new BitSet();
-		bs.set(jobControl.getProcessJobRanks().nextSetBit(0));
-		jobControl.addProcessAttributes(bs, outManager);
-	}
-
-	/**
-	 * Changes job state
-	 */
-	void changeState(JobAttributes.State newState) {
-		if (JobAttributes.State.RUNNING.equals(newState)) {
-			enteredRunPhase();
-		}
-
-		final AttributeManager am = new AttributeManager();
-		am.addAttribute(JobAttributes.getStateAttributeDefinition().create(newState));
-		rm.getMonitor().getRuntimeSystem().changeJob(jobControl.getID(), am);
-	}
-
-	/**
-	 * Called when the process state becomes RUNNING.
-	 * 
-	 * This is the proper moment for identifying where the processes are
-	 * located, so that debug routing files may be written.
-	 */
-	private void enteredRunPhase() {
-		if (machinefile != null) {
-			try {
-				final BufferedReader reader = new BufferedReader(new InputStreamReader(machinefile.openInputStream(0, null)));
-
-				final IPMachine machine = pRM.getMachines()[0];
-
-				final Map<String, String> nodesByName = new HashMap<String, String>();
-				for (final IPNode ipNode : machine.getNodes()) {
-					nodesByName.put(ipNode.getName(), ipNode.getID());
-				}
-
-				String line;
-				int i = 0;
-				while ((line = reader.readLine()) != null) {
-					final BitSet bs = new BitSet();
-					bs.set(i++);
-					final AttributeManager attrs = new AttributeManager();
-
-					if (!nodesByName.containsKey(line)) {
-						rm.getMonitor().getRuntimeSystem().addUnknownNode(machine, line);
-						nodesByName.put(line, ((Integer) nodesByName.size()).toString());
-						NotifyShell.open(Messages.JobThread_UnknownNode_title, Messages.JobThread_UnknownNode_text_1 + line
-								+ Messages.JobThread_UnknownNode_text_2);
-						attrs.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create(nodesByName.get(line)));
-					} else {
-						attrs.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create(nodesByName.get(line)));
-					}
-					jobControl.addProcessesByJobRanks(bs, attrs);
-				}
-				return;
-			} catch (final CoreException e) {
-				NotifyShell.open(Messages.JobThread_ErrorOpeningRemote, e.toString());
-
-				final BitSet bs = new BitSet(1);
-				bs.set(0);
-				final AttributeManager jam = new AttributeManager();
-				jam.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create("0")); //$NON-NLS-1$
-				jobControl.addProcessesByJobRanks(bs, jam);
-			} catch (final IOException e) {
-				NotifyShell.open(Messages.JobThread_ErrorReadingRemote, e.toString());
-
-				if (jobControl.getProcessJobRanks() != null && !jobControl.getProcessJobRanks().isEmpty()) {
-					return;
-				}
-
-				final BitSet bs = new BitSet(1);
-				bs.set(0);
-				final AttributeManager jam = new AttributeManager();
-				jam.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create("0")); //$NON-NLS-1$
-				jobControl.addProcessesByJobRanks(bs, jam);
-			}
-		} else {
-			final BitSet bs = new BitSet(1);
-			bs.set(0);
-			final AttributeManager jam = new AttributeManager();
-			jam.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create("0")); //$NON-NLS-1$
-			jobControl.addProcessesByJobRanks(bs, jam);
-		}
-	}
-
-	/**
-	 * Called if an exception has been thrown while monitoring job
-	 */
-	void exceptionCaught(Exception e) {
-		final AttributeManager am = new AttributeManager();
-
-		am.addAttribute(JobAttributes.getStatusAttributeDefinition().create(Messages.JobThread_ExceptionByMonitoring));
-
-		am.addAttribute(JobAttributes.getStateAttributeDefinition().create(JobAttributes.State.COMPLETED));
-
-		am.addAttribute(PoolingIntervalsAndStatic.exceptionAttrDef.create(e.getLocalizedMessage()));
-
-		NotifyShell.open(Messages.JobThread_ExceptionByMonitoring, e.getLocalizedMessage());
-
-		rm.getMonitor().getRuntimeSystem().changeJob(jobControl.getID(), am);
-	}
-
-	/** Executed after the job reached terminal state */
-	private void jobFinished(SMOAActivityStatus status) {
-
-		try {
-			// If the job jumped from queued to finished state, we didn't
-			// add any processes yet
-			if (jobControl.getProcessJobRanks() == null || jobControl.getProcessJobRanks().isEmpty()) {
-				final BitSet bs = new BitSet(1);
-				bs.set(0);
-				final AttributeManager jam = new AttributeManager();
-				jam.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create("0")); //$NON-NLS-1$
-				jobControl.addProcessesByJobRanks(bs, jam);
-			}
-
-			processOutAndErr();
-
-			try {
-				out.delete(0, null);
-				err.delete(0, null);
-				if (sh != null) {
-					sh.delete(0, null);
-				}
-				if (machinefile != null) {
-					machinefile.delete(0, null);
-				}
-			} catch (final CoreException e) {
-				NotifyShell.open(Messages.JobThread_ErrorDeletingTempFiles_title, Messages.JobThread_ErrorDeletingTempFiles_text
-						+ e.getLocalizedMessage());
-				e.printStackTrace();
-			}
-		} catch (final RuntimeException e) {
-			// Happens if there is a problem with stdout/err file
-		}
-
-		final AttributeManager am = new AttributeManager();
-
-		String jobStatus = null;
-
-		switch (PoolingIntervalsAndStatic.getEquivalentJobState(status)) {
-		case Finished:
-			jobStatus = Messages.JobThread_JobStateFinisedWithStatus + status.getEndStatus().getExitStatus();
-			break;
-		case Failed:
-			jobStatus = Messages.JobThread_JobStateFailed;
-			break;
-		case Cancelled:
-			jobStatus = Messages.JobThread_JobStateCancelled;
-			break;
-		default:
-			jobStatus = Messages.JobThread_JobStateUnknown;
-		}
-
-		am.addAttribute(JobAttributes.getStatusAttributeDefinition().create(jobStatus));
-
-		JobAttributes.State state;
-		state = JobAttributes.State.COMPLETED;
-		am.addAttribute(JobAttributes.getStateAttributeDefinition().create(state));
-
-		rm.getMonitor().getRuntimeSystem().changeJob(jobControl.getID(), am);
-	}
-
-	/**
-	 * Takes care about reading out and err streams and forwards them on console
-	 */
-	private void processOutAndErr() {
-
-		/* Out */
-		InputStream is;
-		try {
-			if (out instanceof SMOAFileStore) {
-				is = ((SMOAFileStore) out).openInputStream(0, null, stdOutOffset);
-			} else {
-				is = out.openInputStream(0, null);
-				is.skip(stdOutOffset);
-			}
-
-			final byte[] buffer = new byte[512];
-
-			for (int count = is.read(buffer); count > 0; count = is.read(buffer)) {
-				stdOutOffset += count;
-				appendStdOut(new String(buffer).substring(0, count));
-			}
-		} catch (final CoreException e) {
-			if (e.getCause() instanceof FileNotFoundException) {
-				return;
-			}
-			throw new RuntimeException(e);
-		} catch (final IOException e) {
-			NotifyShell.open(Messages.JobThread_ErrorOut, e.getLocalizedMessage());
-		}
-
-		/* Err */
-
-		try {
-			if (err instanceof SMOAFileStore) {
-				is = ((SMOAFileStore) err).openInputStream(0, null, stdErrOffset);
-			} else {
-				is = err.openInputStream(0, null);
-				is.skip(stdErrOffset);
-			}
-
-			final byte[] buffer = new byte[512];
-
-			for (int count = is.read(buffer); count > 0; count = is.read(buffer)) {
-				stdErrOffset += count;
-				if (count == buffer.length) {
-					appendStdErr(new String(buffer));
-				} else {
-					appendStdErr(new String(buffer).substring(0, count));
-				}
-			}
-		} catch (final CoreException e) {
-			if (e.getCause() instanceof FileNotFoundException) {
-				return;
-			}
-			throw new RuntimeException(e);
-		} catch (final IOException e) {
-			NotifyShell.open(Messages.JobThread_ErrorErr, e.getLocalizedMessage());
-		}
-	}
-
-	/** Loop for monitoring task */
-	@Override
-	public void run() {
-		try {
-
-			SMOAActivityStatus status = factory.getActivityStatus(activityIdentifier);
-
-			SMOAActivityStatus prevStatus = null;
-
-			long nextStateCheck = System.currentTimeMillis();
-			long nextOutCheck = nextStateCheck;
-
-			// Till the state is not final, we pool the job and out streams
-			while (true) {
-
-				// Status
-				if (nextStateCheck <= System.currentTimeMillis()) {
-					nextStateCheck = System.currentTimeMillis() + PoolingIntervalsAndStatic.getPoolingIntervalTask();
-
-					final SMOAJobState statusS = PoolingIntervalsAndStatic.getEquivalentJobState(status);
-
-					SMOAJobState prevstatusS = null;
-
-					if (prevStatus != null) {
-						prevstatusS = PoolingIntervalsAndStatic.getEquivalentJobState(prevStatus);
-					}
-
-					if (prevStatus == null || !statusS.equals(prevstatusS)) {
-						switch (statusS) {
-						case Stage_in:
-						case Held:
-						case Queued:
-							changeState(JobAttributes.State.STARTING);
-							break;
-						case Stage_out:
-						case Executing:
-							changeState(JobAttributes.State.RUNNING);
-							break;
-						case Suspended:
-							changeState(JobAttributes.State.SUSPENDED);
-							break;
-
-						case Cancelled:
-							break;
-						case Failed:
-							break;
-						case Finished:
-							break;
-						}
-						prevStatus = status;
-					}
-					status = factory.getActivityStatus(activityIdentifier);
-
-					if (status.isFinalState()) {
-						break;
-					}
-				}
-
-				// Out
-				final JobAttributes.State state = jobControl.getAttribute(JobAttributes.getStateAttributeDefinition()).getValue();
-				if (state == JobAttributes.State.RUNNING && nextOutCheck <= System.currentTimeMillis()) {
-					nextOutCheck = System.currentTimeMillis() + PoolingIntervalsAndStatic.getPoolingIntervalOut();
-
-					processOutAndErr();
-				}
-				try {
-					final long nextCheck = Math.min(nextOutCheck - System.currentTimeMillis(),
-							nextStateCheck - System.currentTimeMillis());
-					if (nextCheck > 0) {
-						sleep(nextCheck);
-					}
-				} catch (final InterruptedException e) {
-					// The job has been terminated, ignore
-				}
-			}
-
-			jobFinished(status);
-
-		} catch (final NotAuthorizedException e) {
-			exceptionCaught(e);
-		} catch (final UnknownActivityIdentifierException e) {
-			exceptionCaught(e);
-		}
-
-		rm.removeJobThread(jobControl.getID());
-	}
-
-	/**
-	 * Terminates the monitored job
-	 */
-	public boolean terminate() {
-		try {
-			factory.terminateActivity(activityIdentifier);
-			this.interrupt();
-		} catch (final Exception e) {
-			return false;
-		}
-		return true;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/Messages.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/Messages.java
deleted file mode 100644
index b4e7b88..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/Messages.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rmsystem;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.smoa.core.rmsystem.messages"; //$NON-NLS-1$
-	public static String JobThread_ErrorDeletingTempFiles_text;
-	public static String JobThread_ErrorDeletingTempFiles_title;
-	public static String JobThread_ErrorErr;
-	public static String JobThread_ErrorOpeningRemote;
-	public static String JobThread_ErrorOut;
-	public static String JobThread_ErrorReadingRemote;
-	public static String JobThread_ExceptionByMonitoring;
-	public static String JobThread_JobStateCancelled;
-	public static String JobThread_JobStateFailed;
-	public static String JobThread_JobStateFinisedWithStatus;
-	public static String JobThread_JobStateUnknown;
-	public static String JobThread_UnknownNode_text_1;
-	public static String JobThread_UnknownNode_text_2;
-	public static String JobThread_UnknownNode_title;
-	public static String PoolingIntervalsAndStatic_JobSubmissionFailed;
-	public static String SMOAResourceManager_7;
-	public static String SMOAResourceManager_8;
-	public static String SMOAResourceManager_JobSubmissionFailed;
-	public static String SMOAResourceManager_PortForwardingFailed_text;
-	public static String SMOAResourceManager_PortForwardingFailed_title;
-	public static String SMOAResourceManagerConfiguration_AdditionalConnectionNotAvailable_text;
-	public static String SMOAResourceManagerConfiguration_AdditionalConnectionNotAvailable_title;
-	public static String SMOAResourceManagerConfiguration_CouldNotRetreivePassword;
-	public static String SMOAResourceManagerConfiguration_CouldNotStorePassword;
-	public static String SMOAResourceManagerConfiguration_PrefixAnonymous;
-	public static String SMOAResourceManagerConfiguration_PrefixGsi;
-	public static String SMOAResourceManagerConfiguration_ReusingConnection;
-	public static String SMOAResourceManagerConfiguration_SmoaRmDescription;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/PoolingIntervals.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/PoolingIntervals.java
deleted file mode 100644
index 367c747..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/PoolingIntervals.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rmsystem;
-
-/**
- * Static class holding information about pooling intervals of task and output
- * status.
- */
-
-/*
- * When this functionality has been part of SMOAResourceManager class, a
- * ClassCircularityExcepthion has been thrown under certain circumstances.
- */
-public class PoolingIntervals {
-
-	/** Default interval for checking job state. */
-	public static final int DEFAULT_POOLING_STATE = 10000;
-	/** Default interval for checking job out and err state. */
-	public static final int DEFAULT_POOLING_OUT = 15000;
-
-	/** Interval for checking job state. Global for all jobs. */
-	private static int PoolingIntervalState = DEFAULT_POOLING_STATE;
-	/** Interval for checking job out and err state. Global for all jobs. */
-	private static int PoolingIntervalOut = DEFAULT_POOLING_OUT;
-
-	/** Retrieves value of the output checking interval */
-	public static int getPoolingIntervalOut() {
-		return PoolingIntervalOut;
-	}
-
-	/** Retrieves value of the job state checking interval */
-	public static int getPoolingIntervalTask() {
-		return PoolingIntervalState;
-	}
-
-	/** How often the output will be checked (but not less than 0.1s) */
-	public static void setPoolingIntervalOut(int newVal) {
-		if (newVal >= 100) {
-			PoolingIntervalOut = newVal;
-		}
-	}
-
-	/** How often the job state will be checked (but not less than 0.1s) */
-	public static void setPoolingIntervalTask(int newVal) {
-		if (newVal >= 100) {
-			PoolingIntervalState = newVal;
-		}
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/PoolingIntervalsAndStatic.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/PoolingIntervalsAndStatic.java
deleted file mode 100644
index 7bf20cb..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/PoolingIntervalsAndStatic.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rmsystem;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ptp.core.attributes.StringAttributeDefinition;
-
-import com.smoa.comp.sdk.types.SMOAActivityStatus;
-
-/**
- * Static class holding information about pooling intervals of task and output
- * status.
- * 
- * This class also holds some static methods i order to make
- * {@link SMOAResourceManager} thinner.
- */
-
-/*
- * When this functionality has been part of SMOAResourceManager class, a
- * ClassCircularityExcepthion has been thrown under certain circumstances.
- */
-public class PoolingIntervalsAndStatic {
-
-	/** All possible states returned by getBESState and getBESSubState */
-	public static enum SMOAJobState {
-		Cancelled, Finished, Failed, Executing, Stage_in, Stage_out, Queued, Held, Suspended
-	}
-
-	/** Default interval for checking job state. */
-	public static final int DEFAULT_POOLING_STATE = 10000;
-
-	/** Default interval for checking job out and err state. */
-	public static final int DEFAULT_POOLING_OUT = 15000;
-	/** Interval for checking job state. Global for all jobs. */
-	private static int PoolingIntervalState = DEFAULT_POOLING_STATE;
-
-	/** Interval for checking job out and err state. Global for all jobs. */
-	private static int PoolingIntervalOut = DEFAULT_POOLING_OUT;
-
-	/** Definition of a attribute holding error message */
-	public static StringAttributeDefinition exceptionAttrDef = new StringAttributeDefinition(
-			"exception", Messages.PoolingIntervalsAndStatic_JobSubmissionFailed, Messages.PoolingIntervalsAndStatic_JobSubmissionFailed, //$NON-NLS-1$
-			true, ""); //$NON-NLS-1$
-
-	private static final Map<String, SMOAJobState> besStateNameToEnum = new HashMap<String, SMOAJobState>();
-
-	private static final Map<String, SMOAJobState> besSubStateNameToEnum = new HashMap<String, SMOAJobState>();
-
-	static {
-		besStateNameToEnum.put(
-				SMOAActivityStatus.SMOA_ACTIVITY_STATE_CANCELLED,
-				SMOAJobState.Cancelled);
-		besStateNameToEnum.put(SMOAActivityStatus.SMOA_ACTIVITY_STATE_FAILED,
-				SMOAJobState.Failed);
-		besStateNameToEnum.put(SMOAActivityStatus.SMOA_ACTIVITY_STATE_FINISHED,
-				SMOAJobState.Finished);
-	}
-
-	static {
-		besSubStateNameToEnum.put(
-				SMOAActivityStatus.SMOA_ACTIVITY_STATE_EXECUTING,
-				SMOAJobState.Executing);
-		besSubStateNameToEnum.put(SMOAActivityStatus.SMOA_ACTIVITY_STATE_HELD,
-				SMOAJobState.Held);
-		besSubStateNameToEnum.put(
-				SMOAActivityStatus.SMOA_ACTIVITY_STATE_QUEUED,
-				SMOAJobState.Queued);
-		besSubStateNameToEnum.put(
-				SMOAActivityStatus.SMOA_ACTIVITY_STATE_STAGE_IN,
-				SMOAJobState.Stage_in);
-		besSubStateNameToEnum.put(
-				SMOAActivityStatus.SMOA_ACTIVITY_STATE_STAGE_OUT,
-				SMOAJobState.Stage_out);
-		besSubStateNameToEnum.put(
-				SMOAActivityStatus.SMOA_ACTIVITY_STATE_SUSPENDED,
-				SMOAJobState.Suspended);
-	}
-
-	/** Maps BES state name to SMOA JobState */
-	public static SMOAJobState getEquivalentJobState(SMOAActivityStatus status) {
-		final SMOAJobState result = besStateNameToEnum.get(status.getBESStateName());
-		if (result != null) {
-			return result;
-		}
-		return besSubStateNameToEnum.get(status.getBESSubStateName());
-	}
-
-	/** Retrieves value of the output checking interval */
-	public static int getPoolingIntervalOut() {
-		return PoolingIntervalOut;
-	}
-
-	/** Retrieves value of the job state checking interval */
-	public static int getPoolingIntervalTask() {
-		return PoolingIntervalState;
-	}
-
-	/** How often the output will be checked (but not less than 0.1s) */
-	public static void setPoolingIntervalOut(int newVal) {
-		if (newVal >= 100) {
-			PoolingIntervalOut = newVal;
-		}
-	}
-
-	/** How often the job state will be checked (but not less than 0.1s) */
-	public static void setPoolingIntervalTask(int newVal) {
-		if (newVal >= 100) {
-			PoolingIntervalState = newVal;
-		}
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManager.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManager.java
deleted file mode 100644
index c60c942..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManager.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rmsystem;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.ptp.rtsystem.AbstractRuntimeResourceManager;
-
-public class SMOAResourceManager extends AbstractRuntimeResourceManager {
-
-	/**
-	 * Holds JobThread for each running job (identified by JobID), so that RM
-	 * can inform JobThread to terminate the job
-	 */
-	private final Map<String, JobThread> jobThreadForID = new HashMap<String, JobThread>();
-
-	public SMOAResourceManager(SMOAResourceManagerConfiguration config, SMOAResourceManagerControl control,
-			SMOAResourceManagerMonitor monitor) {
-		super(config, control, monitor);
-	}
-
-	@Override
-	public SMOAResourceManagerControl getControl() {
-		return (SMOAResourceManagerControl) super.getControl();
-	}
-
-	@Override
-	public SMOAResourceManagerConfiguration getControlConfiguration() {
-		return (SMOAResourceManagerConfiguration) super.getControlConfiguration();
-	}
-
-	@Override
-	public SMOAResourceManagerMonitor getMonitor() {
-		return (SMOAResourceManagerMonitor) super.getMonitor();
-	}
-
-	@Override
-	public SMOAResourceManagerConfiguration getMonitorConfiguration() {
-		return (SMOAResourceManagerConfiguration) super.getMonitorConfiguration();
-	}
-
-	protected void addJobThread(String jobId, JobThread job) {
-		jobThreadForID.put(jobId, job);
-	}
-
-	protected JobThread getJobThread(String jobId) {
-		return jobThreadForID.get(jobId);
-	}
-
-	protected void removeJobThread(String jobId) {
-		jobThreadForID.remove(jobId);
-	}
-
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerConfiguration.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerConfiguration.java
deleted file mode 100644
index b2576e0..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerConfiguration.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rmsystem;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.eclipse.equinox.security.storage.ISecurePreferences;
-import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
-import org.eclipse.equinox.security.storage.StorageException;
-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.rm.core.rmsystem.AbstractRemoteResourceManagerConfiguration;
-import org.eclipse.ptp.rm.smoa.core.SMOAConfiguration;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOAConnection;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOARemoteServices;
-import org.eclipse.ptp.rm.smoa.core.util.NotifyShell;
-import org.eclipse.ptp.services.core.IServiceProvider;
-
-import com.smoa.comp.stubs.factory.ApplicationsType.Application;
-
-/**
- * Persistently keeps data about one {@link SMOAResourceManager} configuration,
- * i.e. connection data, authentication methods
- * 
- * Keeps also other things related to the RM, like available applications or the
- * connection
- */
-public class SMOAResourceManagerConfiguration extends AbstractRemoteResourceManagerConfiguration implements SMOAConfiguration {
-
-	// Keys used for storing persistent data
-	private final static String URL_KEY = "url"; //$NON-NLS-1$
-	private final static String PORT_KEY = "port"; //$NON-NLS-1$
-	private static final String AUTH_KEY = "auth"; //$NON-NLS-1$
-	private static final String USER_KEY = "user"; //$NON-NLS-1$
-	private static final String CACERT_KEY = "cacert"; //$NON-NLS-1$
-	private static final String DN_KEY = "dn"; //$NON-NLS-1$
-	private static final String RS_ID_KEY = "rs_id"; //$NON-NLS-1$
-
-	private static final String RS_CONN_KEY = "rs_conn"; //$NON-NLS-1$
-
-	// Place for passwords
-	ISecurePreferences securePrefs = SecurePreferencesFactory.getDefault().node("smoa"); //$NON-NLS-1$
-	// Made to differentiate connections with same name, but different data
-	private static int nextConnectionId = 0;
-
-	private static Object nextConnectionIdLock = new Object();
-	private boolean isConectionInitialized = false;
-	private SMOAConnection connection = null;
-	private final SMOAResourceManager resourceManager = null;
-
-	private Map<String, Application> apps;
-
-	boolean notifiedAboutConnLoss = true;
-
-	public SMOAResourceManagerConfiguration() {
-		super();
-	}
-
-	protected SMOAResourceManagerConfiguration(String namespace, IServiceProvider provider) {
-		super(namespace, provider);
-		setDescription(Messages.SMOAResourceManagerConfiguration_SmoaRmDescription);
-		setRemoteServicesId("org.eclipse.ptp.remote.SMOARemoteServices"); //$NON-NLS-1$
-	}
-
-	public Application getAppForName(String name) {
-		if (apps == null) {
-			return null;
-		}
-		return apps.get(name);
-	}
-
-	public AuthType getAuthType() {
-		final String auth = getString(AUTH_KEY, AuthType.Anonymous.toString());
-		return AuthType.valueOf(auth);
-	}
-
-	// SettersAndGetters
-
-	public List<String> getAvailableAppList() {
-		final Vector<String> _ = new Vector<String>();
-		if (apps != null) {
-			_.addAll(apps.keySet());
-		}
-		return _;
-	}
-
-	public String getCaCertPath() {
-		return getString(CACERT_KEY, null);
-	}
-
-	public SMOAConnection getConnection() {
-		return connection;
-	}
-
-	@Override
-	public String getConnectionName() {
-		if (!isConectionInitialized) {
-			initConnection();
-		}
-		return super.getConnectionName();
-	}
-
-	public IRemoteConnection getFileRemoteConnection() {
-		IRemoteConnection fileRemoteConnection = null;
-		final String id = getString(RS_ID_KEY, null);
-		final String name = getString(RS_CONN_KEY, null);
-		if (id != null && name != null) {
-			final IRemoteServices rs = PTPRemoteCorePlugin.getDefault().getRemoteServices(id);
-			if (rs != null) {
-				fileRemoteConnection = rs.getConnectionManager().getConnection(name);
-			}
-
-			if (fileRemoteConnection == null) {
-				notifyConnLoss();
-			}
-		}
-		return fileRemoteConnection;
-	}
-
-	public String getPassword() {
-		if (getUrl() == null) {
-			return null;
-		}
-		String pass = null;
-		try {
-			pass = securePrefs.get(getUrl(), null);
-		} catch (final StorageException e) {
-			Logger.getLogger(getClass().getCanonicalName()).log(Level.SEVERE,
-					Messages.SMOAResourceManagerConfiguration_CouldNotRetreivePassword, e);
-		}
-		return pass;
-	}
-
-	public Integer getPort() {
-		final int port = getInt(PORT_KEY, -1);
-		return port == -1 ? null : port;
-	}
-
-	@Override
-	public String getResourceManagerId() {
-		return getId();
-	}
-
-	public String getServiceDN() {
-		return getString(DN_KEY, null);
-	}
-
-	public String getUrl() {
-		return getString(URL_KEY, null);
-	}
-
-	public String getUser() {
-		return getString(USER_KEY, null);
-	}
-
-	/**
-	 * Creates a connection in the SMOAConnectionManager
-	 */
-	private void initConnection() {
-
-		final SMOARemoteServices remoteServices = (SMOARemoteServices) PTPRemoteCorePlugin.getDefault().getRemoteServices(
-				getRemoteServicesId());
-
-		final IRemoteConnection existingConnection = remoteServices.getConnectionManager().getConnection(super.getConnectionName());
-		if (existingConnection != null) {
-			connection = (SMOAConnection) existingConnection;
-			Logger.getLogger(getClass().getName()).info(Messages.SMOAResourceManagerConfiguration_ReusingConnection);
-			return;
-		}
-
-		try {
-			final SMOAConnection c = remoteServices.getConnectionManager().newConnection(super.getConnectionName());
-			c.setAddress(getUrl());
-			c.setFileConnection(getFileRemoteConnection());
-			c.setRMName(this.getName());
-
-			if (getAuthType() == AuthType.UsernamePassword) {
-				c.setUsername(getUser());
-				c.setPassword(getPassword());
-			}
-
-			c.setPort(getPort());
-			c.setAuthType(getAuthType());
-
-			if (getCaCertPath() != null && !getCaCertPath().isEmpty()) {
-				c.setCaCert(getCaCertPath());
-				if (getServiceDN() != null && !getServiceDN().isEmpty()) {
-					c.setDN(getServiceDN());
-				}
-			}
-			connection = c;
-		} catch (final RemoteConnectionException e) {
-			// should never happen
-			throw new RuntimeException(e);
-		}
-
-		isConectionInitialized = true;
-	}
-
-	@Override
-	public boolean isConfigured() {
-		return true;
-	}
-
-	@Override
-	public boolean needsDebuggerLaunchHelp() {
-		return true;
-	}
-
-	private void notifyConnLoss() {
-		if (notifiedAboutConnLoss) {
-			notifiedAboutConnLoss = false;
-			NotifyShell.open(Messages.SMOAResourceManagerConfiguration_AdditionalConnectionNotAvailable_title,
-					Messages.SMOAResourceManagerConfiguration_AdditionalConnectionNotAvailable_text);
-		}
-	}
-
-	public void setAuthType(AuthType type) {
-		putString(AUTH_KEY, type.toString());
-	}
-
-	public void setAvailableAppList(List<Application> appList) {
-		apps = new HashMap<String, Application>();
-		for (final Application a : appList) {
-			final String version = a.getVersion() == null ? "" : (" " + a //$NON-NLS-1$ //$NON-NLS-2$
-					.getVersion());
-			apps.put(a.getName() + version, a);
-		}
-	}
-
-	public void setCacertPath(String cacert) {
-		if (cacert == null) {
-			return;
-		}
-		if (cacert.equals(getCaCertPath())) {
-			return;
-		}
-		putString(CACERT_KEY, cacert);
-
-		updateConnectionName();
-	}
-
-	public void setDefaultNameAndDesc() {
-
-		final StringBuilder name = new StringBuilder("SMOA Comp"); //$NON-NLS-1$
-		if (getUrl() != null) {
-			name.append(" - "); //$NON-NLS-1$
-
-			switch (getAuthType()) {
-			case Anonymous:
-				name.append(Messages.SMOAResourceManagerConfiguration_PrefixAnonymous);
-				break;
-			case GSI:
-				name.append(Messages.SMOAResourceManagerConfiguration_PrefixGsi);
-				break;
-			case UsernamePassword:
-				if (getUser() != null) {
-					name.append(getUser());
-				}
-				name.append("@"); //$NON-NLS-1$
-				break;
-			}
-
-			if (getUrl() != null) {
-				name.append(getUrl());
-			}
-			name.append(":"); //$NON-NLS-1$
-			if (getPort() != null) {
-				name.append(getPort());
-			}
-		}
-
-		setName(name.toString());
-
-		setDescription("SMOA Computing Resource Manager"); //$NON-NLS-1$
-	}
-
-	public void setFileRemoteConnection(IRemoteConnection rconn) {
-		if (rconn != null) {
-			putString(RS_ID_KEY, rconn.getRemoteServices().getId());
-			putString(RS_CONN_KEY, rconn.getName());
-		} else {
-			putString(RS_ID_KEY, null);
-			putString(RS_CONN_KEY, null);
-		}
-	}
-
-	@Override
-	public void setName(String name) {
-		if (connection != null) {
-			connection.setRMName(name);
-		}
-		super.setName(name);
-	}
-
-	public void setPassword(String passwd) {
-		if (passwd == null) {
-			return;
-		}
-		if (passwd.equals(getPassword())) {
-			return;
-		}
-		if (getUrl() == null) {
-			return;
-		}
-
-		try {
-			securePrefs.put(getUrl(), passwd, true);
-		} catch (final StorageException e) {
-			Logger.getLogger(getClass().getCanonicalName()).log(Level.SEVERE,
-					Messages.SMOAResourceManagerConfiguration_CouldNotStorePassword, e);
-		}
-
-		updateConnectionName();
-	}
-
-	public void setPort(Integer port) {
-		if (port == getPort()) {
-			return;
-		}
-		putInt(PORT_KEY, port);
-		updateConnectionName();
-	}
-
-	public void setServiceDn(String dn) {
-		if (dn == null) {
-			return;
-		}
-		if (dn.equals(getServiceDN())) {
-			return;
-		}
-		putString(DN_KEY, dn);
-
-		updateConnectionName();
-	}
-
-	public void setUrl(String url) {
-		if (url.equals(getUrl())) {
-			return;
-		}
-
-		final String pass = getPassword();
-		if (getUrl() != null) {
-			securePrefs.remove(getUrl());
-		}
-
-		putString(URL_KEY, url);
-
-		if (pass == null) {
-			setPassword(pass);
-		}
-
-		updateConnectionName();
-	}
-
-	public void setUser(String user) {
-		if (user == null) {
-			return;
-		}
-		if (user.equals(getUser())) {
-			return;
-		}
-		putString(USER_KEY, user);
-
-		updateConnectionName();
-	}
-
-	public void trigerSecureStorage() throws StorageException {
-		// Just do something in order to force asking for password
-		securePrefs.put("How should I init the storage without using put method?", //$NON-NLS-1$
-				"No idea.", true); //$NON-NLS-1$
-	}
-
-	private void updateConnectionName() {
-
-		synchronized (nextConnectionIdLock) {
-			setConnectionName(getUrl() + nextConnectionId);
-			nextConnectionId++;
-		}
-
-		if (resourceManager != null) {
-			resourceManager.setConfiguration(this);
-		}
-
-		if (connection == null) {
-			return;
-		}
-
-		final SMOARemoteServices smoaRemoteServices = (SMOARemoteServices) PTPRemoteCorePlugin.getDefault().getRemoteServices(
-				getRemoteServicesId());
-
-		smoaRemoteServices.getConnectionManager().removeConnection(connection);
-		connection = null;
-		isConectionInitialized = false;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerControl.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerControl.java
deleted file mode 100644
index a00bdd5..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerControl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rmsystem;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.rm.smoa.core.SMOAConfiguration;
-import org.eclipse.ptp.rm.smoa.core.rtsystem.SMOARuntimeSystem;
-import org.eclipse.ptp.rtsystem.AbstractRuntimeResourceManagerControl;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-
-public class SMOAResourceManagerControl extends AbstractRuntimeResourceManagerControl {
-	/** Current configuration of this RM */
-	/* package access */SMOAConfiguration configuration;
-
-	public SMOAResourceManagerControl(SMOAResourceManagerConfiguration config) {
-		super(config);
-		configuration = config;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rtsystem.AbstractRuntimeResourceManagerControl#doControlJob
-	 * (java.lang.String, java.lang.String,
-	 * org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	@Override
-	protected void doControlJob(String jobId, String operation, IProgressMonitor monitor) throws CoreException {
-		if (operation.equals(TERMINATE_OPERATION)) {
-			JobThread job = getResourceManager().getJobThread(jobId);
-			if (job != null) {
-				job.terminate();
-			}
-		}
-		super.doControlJob(jobId, operation, monitor);
-	}
-
-	@Override
-	protected SMOAResourceManager getResourceManager() {
-		return (SMOAResourceManager) super.getResourceManager();
-	}
-
-	@Override
-	protected SMOARuntimeSystem getRuntimeSystem() {
-		final IRuntimeSystem rs = super.getRuntimeSystem();
-		if (rs instanceof SMOARuntimeSystem) {
-			return (SMOARuntimeSystem) rs;
-		}
-		throw new RuntimeException();
-	}
-
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerFactory.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerFactory.java
deleted file mode 100644
index 88c5537..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerFactory.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.smoa.core.rmsystem;
-
-import org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory;
-import org.eclipse.ptp.rmsystem.IResourceManager;
-import org.eclipse.ptp.rmsystem.IResourceManagerComponentConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManagerControl;
-import org.eclipse.ptp.rmsystem.IResourceManagerMonitor;
-import org.eclipse.ptp.services.core.IServiceProvider;
-
-/**
- * @since 5.0
- */
-public class SMOAResourceManagerFactory extends AbstractResourceManagerFactory {
-	private SMOAResourceManagerConfiguration fConfiguration;
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#create(org.eclipse
-	 * .ptp.rmsystem.IResourceManagerConfiguration,
-	 * org.eclipse.ptp.rmsystem.IResourceManagerControl,
-	 * org.eclipse.ptp.rmsystem.IResourceManagerMonitor)
-	 */
-	@Override
-	public IResourceManager create(IResourceManagerConfiguration configuration, IResourceManagerControl control,
-			IResourceManagerMonitor monitor) {
-		return new SMOAResourceManager((SMOAResourceManagerConfiguration) configuration, (SMOAResourceManagerControl) control,
-				(SMOAResourceManagerMonitor) monitor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#createConfiguration
-	 * (org.eclipse.ptp.services.core.IServiceProvider)
-	 */
-	@Override
-	public IResourceManagerConfiguration createConfiguration(IServiceProvider provider) {
-		return createCommonConfiguration(provider);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#createControl
-	 * (org.eclipse.ptp.rmsystem.IResourceManagerComponentConfiguration)
-	 */
-	@Override
-	public IResourceManagerControl createControl(IResourceManagerComponentConfiguration configuration) {
-		return new SMOAResourceManagerControl((SMOAResourceManagerConfiguration) configuration);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#
-	 * createControlConfiguration
-	 * (org.eclipse.ptp.services.core.IServiceProvider)
-	 */
-	@Override
-	public IResourceManagerComponentConfiguration createControlConfiguration(IServiceProvider provider) {
-		return createCommonConfiguration(provider);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#createMonitor
-	 * (org.eclipse.ptp.rmsystem.IResourceManagerComponentConfiguration)
-	 */
-	@Override
-	public IResourceManagerMonitor createMonitor(IResourceManagerComponentConfiguration configuration) {
-		return new SMOAResourceManagerMonitor((SMOAResourceManagerConfiguration) configuration);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.rmsystem.AbstractResourceManagerFactory#
-	 * createMonitorConfiguration
-	 * (org.eclipse.ptp.services.core.IServiceProvider)
-	 */
-	@Override
-	public IResourceManagerComponentConfiguration createMonitorConfiguration(IServiceProvider provider) {
-		return createCommonConfiguration(provider);
-	}
-
-	private SMOAResourceManagerConfiguration createCommonConfiguration(IServiceProvider provider) {
-		if (fConfiguration == null) {
-			fConfiguration = new SMOAResourceManagerConfiguration(SMOAResourceManagerConfiguration.BASE, provider);
-		}
-		return fConfiguration;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerMonitor.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerMonitor.java
deleted file mode 100644
index f8fcf9d..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/SMOAResourceManagerMonitor.java
+++ /dev/null
@@ -1,468 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rmsystem;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.core.attributes.ArrayAttribute;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.BooleanAttribute;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.attributes.StringAttribute;
-import org.eclipse.ptp.core.elements.IPJob;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-import org.eclipse.ptp.rm.smoa.core.SMOAConfiguration;
-import org.eclipse.ptp.rm.smoa.core.attrib.SMOAJobAttributes;
-import org.eclipse.ptp.rm.smoa.core.attrib.StringMapAttribute;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOAConnection;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOARemoteServices;
-import org.eclipse.ptp.rm.smoa.core.rtsystem.SMOARuntimeSystem;
-import org.eclipse.ptp.rm.smoa.core.util.NotifyShell;
-import org.eclipse.ptp.rtsystem.AbstractRuntimeResourceManagerMonitor;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-
-import com.smoa.comp.sdk.SMOAFactory;
-import com.smoa.comp.sdk.exceptions.InvalidRequestMessageException;
-import com.smoa.comp.sdk.exceptions.NotAuthorizedException;
-import com.smoa.comp.sdk.exceptions.UnsupportedFeatureException;
-import com.smoa.comp.sdk.jsdl.JSDL;
-import com.smoa.comp.sdk.types.ActivityEndpointReference;
-import com.smoa.comp.stubs.factory.ApplicationsType.Application;
-
-public class SMOAResourceManagerMonitor extends AbstractRuntimeResourceManagerMonitor {
-
-	/**
-	 * Extracts from the {@link AttributeManager} proper executable name and
-	 * arguments
-	 * 
-	 * Returns the list containing program path and executable (as first
-	 * element) and all arguments (as next arguments)
-	 */
-	private static List<String> getExecAndArgs(AttributeManager attrs, IRemoteConnection conn, Application app) {
-		final List<String> result = new Vector<String>();
-
-		final BooleanAttribute debug = attrs.getAttribute(JobAttributes.getDebugFlagAttributeDefinition());
-
-		// // // // // // // //
-		// // // debug // // //
-
-		if (debug != null && debug.getValue() == true) {
-			String execPath = attrs.getAttribute(JobAttributes.getDebuggerExecutablePathAttributeDefinition()).getValue();
-
-			if (execPath == null || execPath.isEmpty()) {
-				execPath = "."; //$NON-NLS-1$
-			}
-
-			final String execName = attrs.getAttribute(JobAttributes.getDebuggerExecutableNameAttributeDefinition()).getValue();
-
-			final String execPathAndName = execPath + "/" + execName; //$NON-NLS-1$
-
-			result.add(execPathAndName);
-
-			/* Arguments */
-
-			final List<String> appArguments = attrs.getAttribute(JobAttributes.getDebuggerArgumentsAttributeDefinition())
-					.getValue();
-
-			if (conn.supportsTCPPortForwarding()) {
-				final Pattern portRegex = Pattern.compile("^--port=(\\d+)$"); //$NON-NLS-1$
-				final Pattern hostRegex = Pattern.compile("^--host=(.+)$"); //$NON-NLS-1$
-
-				Integer port = null;
-				String host = null;
-
-				for (final String arg : appArguments) {
-					Matcher m = portRegex.matcher(arg);
-					if (m.matches()) {
-						port = Integer.parseInt(m.group(1));
-					}
-					m = hostRegex.matcher(arg);
-					if (m.matches()) {
-						host = m.group(1);
-					}
-				}
-				if (port != null && host != null) {
-					try {
-						conn.forwardRemotePort(port, host, port);
-					} catch (final RemoteConnectionException e) {
-						NotifyShell.open(Messages.SMOAResourceManager_PortForwardingFailed_title,
-								Messages.SMOAResourceManager_PortForwardingFailed_text + e.getLocalizedMessage());
-					}
-				}
-			}
-
-			result.addAll(appArguments);
-
-			final String appString = attrs.getAttribute(SMOAJobAttributes.getAppNameDef()).getValue();
-			if (SMOAJobAttributes.NO_WRAPPER_SCRIPT.equals(appString) || app == null) {
-				result.add("--server=0"); //$NON-NLS-1$
-			}
-		}
-
-		// // // // // // // //
-		// // / / run / / // //
-		else {
-			String execPath = attrs.getAttribute(JobAttributes.getExecutablePathAttributeDefinition()).getValue();
-
-			if (execPath == null || execPath.isEmpty()) {
-				execPath = "."; //$NON-NLS-1$
-			}
-
-			final String execName = attrs.getAttribute(JobAttributes.getExecutableNameAttributeDefinition()).getValue();
-
-			final String execPathAndName = execPath + "/" + execName; //$NON-NLS-1$
-
-			result.add(execPathAndName);
-
-			/* Arguments */
-
-			final List<String> appArguments = attrs.getAttribute(JobAttributes.getProgramArgumentsAttributeDefinition()).getValue();
-			result.addAll(appArguments);
-		}
-
-		return result;
-	}
-
-	/** Current configuration of this RM */
-	/* package access */SMOAConfiguration configuration;
-
-	/** Assigns sequential run number for each configuration */
-	private final Map<String, Integer> executeCount = new HashMap<String, Integer>();
-
-	public SMOAResourceManagerMonitor(SMOAResourceManagerConfiguration config) {
-		super(config);
-		configuration = config;
-	}
-
-	/**
-	 * Creates script if the user selected an application only.
-	 * 
-	 * @param args
-	 *            - user arguments
-	 * @param app
-	 *            - user application
-	 * @param out
-	 *            - file name for stdout
-	 * @param err
-	 *            - file name for stderr
-	 * @param os
-	 *            - output stream for the script
-	 * @param make
-	 *            - if the user wants us to run 'make'
-	 * @param customMakeCommand
-	 *            - non-null if user wants to use custom run command
-	 */
-	private void createScript(List<String> args, String app, String out, String err, DataOutputStream os, boolean make,
-			String customMakeCommand) throws IOException {
-		os.writeBytes("rm -f " + out + " " + err + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-		final StringBuilder redirect = new StringBuilder();
-		redirect.append(" >> "); //$NON-NLS-1$
-		redirect.append(out);
-		redirect.append(" 2>> "); //$NON-NLS-1$
-		redirect.append(err);
-
-		if (make) {
-			os.writeBytes("echo $(date)   Running make >> " + err + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-			os.writeBytes("{ "); //$NON-NLS-1$
-			if (customMakeCommand != null) {
-				os.writeBytes(customMakeCommand);
-			} else {
-				os.writeBytes("make clean && make"); //$NON-NLS-1$
-			}
-			os.writeBytes(" ; } "); //$NON-NLS-1$
-			os.writeBytes(redirect.toString());
-			os.writeBytes("\n"); //$NON-NLS-1$
-			os.writeBytes("MAKEOUT=$?\n"); //$NON-NLS-1$
-			os.writeBytes("if [ ${MAKEOUT} -ne 0 ]\n"); //$NON-NLS-1$
-			os.writeBytes("then\n"); //$NON-NLS-1$
-			os.writeBytes("  echo $(date)   Make failed! Quitting. >> " + err //$NON-NLS-1$
-					+ "\n"); //$NON-NLS-1$
-			os.writeBytes("  exit ${MAKEOUT}\n"); //$NON-NLS-1$
-			os.writeBytes("fi\n"); //$NON-NLS-1$
-		}
-
-		os.writeBytes("STDBUF=$(which stdbuf)\n"); //$NON-NLS-1$
-		os.writeBytes("if [ \"${STDBUF}\" ]\n"); //$NON-NLS-1$
-		os.writeBytes("then\n"); //$NON-NLS-1$
-		os.writeBytes("  STDBUF=\"${STDBUF} -oL -eL \"\n"); //$NON-NLS-1$
-		os.writeBytes("fi\n"); //$NON-NLS-1$
-		os.writeBytes("echo $(date)   Starting task >> " + err + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		os.writeBytes("{ time ${STDBUF}"); //$NON-NLS-1$
-
-		// app
-		os.writeBytes(app);
-
-		// arguments
-		for (final String arg : args) {
-			os.write(' ');
-			os.writeBytes(arg);
-		}
-
-		os.writeBytes(" ; }"); //$NON-NLS-1$
-
-		os.writeBytes(redirect.toString());
-		os.write('\n');
-
-		os.writeBytes("OUT=$?\n"); //$NON-NLS-1$
-		os.writeBytes("echo $(date)   Finished! >> " + err + "\n"); //$NON-NLS-1$ //$NON-NLS-2$
-		os.writeBytes("exit ${OUT}\n"); //$NON-NLS-1$
-
-	}
-
-	/**
-	 * In case the submission failed, we set the job state and forward error
-	 */
-	private IPJob jobControlFromJobException(Exception e, String jobId, AttributeManager attrs) {
-		final String subId = attrs.getAttribute(JobAttributes.getSubIdAttributeDefinition()).getValue();
-
-		attrs.addAttribute(PoolingIntervalsAndStatic.exceptionAttrDef.create(e.getLocalizedMessage()));
-		attrs.addAttribute(JobAttributes.getStateAttributeDefinition().create(JobAttributes.State.COMPLETED));
-		attrs.addAttribute(JobAttributes.getStatusAttributeDefinition().create(Messages.SMOAResourceManager_JobSubmissionFailed));
-
-		getRuntimeSystem().addJobSubmissionError(subId, e);
-
-		final IPJob newJob = super.doCreateJob(jobId, attrs);
-		return newJob;
-	}
-
-	/**
-	 * Adds the SMOA UUID of the activity to job properties
-	 */
-	private void setSmoaUid(String smoaUid, IPJob newJob) {
-		final AttributeManager am = new AttributeManager();
-
-		final Collection<IPJob> jc = new Vector<IPJob>();
-		jc.add(newJob);
-
-		am.addAttribute(SMOAJobAttributes.getSmoaUuidDef().create(smoaUid));
-
-		doUpdateJobs(jc, am);
-	}
-
-	/**
-	 * Triggered by fireCreateJobEvent by {@link SMOARuntimeSystem}, creates the
-	 * job and submits it to the SMOA Computing service.
-	 */
-	@Override
-	protected IPJob doCreateJob(String jobId, AttributeManager attrs) {
-
-		// all temporary files are timestamped with the time generated below:
-		final long time = System.currentTimeMillis();
-
-		final SMOAConnection connection = configuration.getConnection();
-		final SMOAFactory factory = connection.getFactory();
-
-		final String originalName = attrs.getAttribute(ElementAttributes.getNameAttributeDefinition()).getValueAsString();
-
-		// Name for SMOA Computing
-		final JSDL jsdl = new JSDL(originalName);
-		final List<String> arguments = jsdl.getArguments();
-
-		Integer count = executeCount.get(originalName);
-		if (count == null) {
-			executeCount.put(originalName, 0);
-			count = 0;
-		}
-
-		// Label for Eclipse
-		attrs.addAttribute(ElementAttributes.getNameAttributeDefinition().create(originalName + " (" + count + ")")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		executeCount.put(originalName, ++count);
-
-		// Working directory
-		final String workDir = attrs.getAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition()).getValue();
-		if (workDir != null) {
-			jsdl.setWorkingDirectory(workDir);
-		}
-
-		// Setting program
-		final SMOARemoteServices remoteServices = (SMOARemoteServices) PTPRemoteCorePlugin.getDefault().getRemoteServices(
-				configuration.getRemoteServicesId());
-
-		final String appString = attrs.getAttribute(SMOAJobAttributes.getAppNameDef()).getValue();
-		final Application app = configuration.getAppForName(appString);
-
-		final List<String> execArgsAndPath = getExecAndArgs(attrs, connection, app);
-
-		final String execPathAndName = execArgsAndPath.get(0);
-		final List<String> appArguments = execArgsAndPath.subList(1, execArgsAndPath.size());
-
-		jsdl.setOutput("stdout"); //$NON-NLS-1$
-		jsdl.setError("stderr"); //$NON-NLS-1$
-
-		// filenames for out and err, and filename for shell script to be
-		// executed or for the machine file
-		final String out = connection.getHomeDir() + "/.ptp_smoa_out_" + time; //$NON-NLS-1$
-		final String err = connection.getHomeDir() + "/.ptp_smoa_err_" + time; //$NON-NLS-1$
-		String machinefile = null;
-		String sh = null;
-
-		// Custom Make command
-		String customMakeCommand = null;
-
-		final BooleanAttribute ifCustomMake = attrs.getAttribute(SMOAJobAttributes.getIfCustomMakeDef());
-		if (ifCustomMake != null && ifCustomMake.getValue() != null && ifCustomMake.getValue()) {
-			final StringAttribute makeCommand = attrs.getAttribute(SMOAJobAttributes.getCustomMakeCommandDef());
-			if (makeCommand != null && makeCommand.getValue() != null && !makeCommand.getValue().isEmpty()) {
-				customMakeCommand = makeCommand.getValue();
-			}
-		}
-
-		// If wrapper script has to be used
-		if (SMOAJobAttributes.NO_WRAPPER_SCRIPT.equals(appString) || app == null) {
-
-			sh = connection.getHomeDir() + "/.ptp_smoa_sh_" + time; //$NON-NLS-1$
-
-			final BooleanAttribute makeAttr = attrs.getAttribute(SMOAJobAttributes.getMakeDef());
-			final boolean make = (makeAttr == null ? false : makeAttr.getValue());
-
-			// Creating script
-			try {
-				final DataOutputStream os = new DataOutputStream(remoteServices.getFileManager(connection).getResource(sh)
-						.openOutputStream(0, null));
-				createScript(appArguments, execPathAndName, out, err, os, make, customMakeCommand);
-				os.close();
-			} catch (final IOException e) {
-				NotifyShell.open(Messages.SMOAResourceManager_7, e.getLocalizedMessage());
-				return jobControlFromJobException(e, jobId, attrs);
-			} catch (final CoreException e) {
-				NotifyShell.open(Messages.SMOAResourceManager_8, e.getLocalizedMessage());
-				return jobControlFromJobException(e, jobId, attrs);
-			}
-
-			jsdl.setExecutable("/bin/sh"); //$NON-NLS-1$
-			arguments.add(sh);
-		}
-		// If the built-in application has to be used
-		else {
-			machinefile = connection.getHomeDir() + "/.ptp_smoa_machinefile_" //$NON-NLS-1$
-					+ time;
-
-			jsdl.setApplicationName(app.getName());
-			jsdl.setApplicationVersion(app.getVersion());
-
-			arguments.add(execPathAndName);
-			arguments.addAll(appArguments);
-
-			jsdl.getEnvironment().put(SMOAJobAttributes.ENV_STDOUT, out);
-			jsdl.getEnvironment().put(SMOAJobAttributes.ENV_STDERR, err);
-			jsdl.getEnvironment().put(SMOAJobAttributes.ENV_MACHINEFILE, machinefile);
-
-			if (customMakeCommand != null) {
-				jsdl.getEnvironment().put(SMOAJobAttributes.ENV_MAKE_COMMAND, customMakeCommand);
-			}
-
-		}
-
-		// Others
-
-		final StringAttribute attribute1 = attrs.getAttribute(SMOAJobAttributes.getDescDef());
-		if (attribute1 != null && attribute1.getValue() != null && (!attribute1.getValue().isEmpty())) {
-			jsdl.setJobDescription(attribute1.getValue());
-		}
-
-		final StringAttribute attribute2 = attrs.getAttribute(SMOAJobAttributes.getNativeSpecDef());
-		if (attribute2 != null && attribute2.getValue() != null && (!attribute2.getValue().isEmpty())) {
-			jsdl.setNativeSpecification(attribute2.getValue());
-		}
-
-		final IntegerAttribute attribute3 = attrs.getAttribute(SMOAJobAttributes.getMinCpuDef());
-		if (attribute3 != null && attribute3.getValue() != null) {
-			jsdl.setMinCpu(attribute3.getValue());
-		}
-
-		final IntegerAttribute attribute4 = attrs.getAttribute(SMOAJobAttributes.getMaxCpuDef());
-		if (attribute4 != null && attribute4.getValue() != null) {
-			jsdl.setMaxCpu(attribute4.getValue());
-		}
-
-		final ArrayAttribute<String> attribute5 = attrs.getAttribute(SMOAJobAttributes.getPrefferedDef());
-		if (attribute5 != null && attribute5.getValue() != null) {
-			for (final String machineName : attribute5.getValue()) {
-				jsdl.getCandidateHosts().add(machineName);
-			}
-		}
-
-		final StringMapAttribute attribute6 = attrs.getAttribute(SMOAJobAttributes.getEnvDef());
-		if (attribute6 != null && (!attribute6.getValue().isEmpty())) {
-			jsdl.getEnvironment().putAll(attribute6.getValue());
-		}
-
-		final BooleanAttribute attribute7 = attrs.getAttribute(SMOAJobAttributes.getMakeDef());
-		if (attribute7 != null && attribute7.getValue()) {
-			jsdl.getEnvironment().put(SMOAJobAttributes.ENV_IF_MAKE, "1"); //$NON-NLS-1$
-		} else {
-			jsdl.getEnvironment().remove(SMOAJobAttributes.ENV_IF_MAKE);
-		}
-
-		final StringAttribute attribute8 = attrs.getAttribute(SMOAJobAttributes.getQueueNameDef());
-		if (attribute8 != null && attribute8.getValue() != null && (!attribute8.getValue().isEmpty())) {
-			jsdl.setQueueName(attribute8.getValue());
-		}
-
-		ActivityEndpointReference activityReference;
-
-		// Submitting the job
-		try {
-			activityReference = factory.createActivity(jsdl);
-		} catch (final InvalidRequestMessageException e) {
-			return jobControlFromJobException(e, jobId, attrs);
-		} catch (final NotAuthorizedException e) {
-			return jobControlFromJobException(e, jobId, attrs);
-		} catch (final UnsupportedFeatureException e) {
-			return jobControlFromJobException(e, jobId, attrs);
-		} catch (final Throwable t) {
-			throw new RuntimeException(t);
-		}
-
-		final IPJob jobControl = super.doCreateJob(jobId, attrs);
-
-		setSmoaUid(activityReference.getActivityUUID(), jobControl);
-
-		// Starting job monitoring thread
-		final JobThread jobThread = new JobThread(getResourceManager(), factory, activityReference, jobControl, out, err, sh,
-				machinefile);
-		getResourceManager().addJobThread(jobControl.getID(), jobThread);
-		jobThread.start();
-
-		return jobControl;
-	}
-
-	@Override
-	protected SMOAResourceManager getResourceManager() {
-		return (SMOAResourceManager) super.getResourceManager();
-	}
-
-	@Override
-	protected SMOARuntimeSystem getRuntimeSystem() {
-		final IRuntimeSystem rs = super.getRuntimeSystem();
-		if (rs instanceof SMOARuntimeSystem) {
-			return (SMOARuntimeSystem) rs;
-		}
-		throw new RuntimeException();
-	}
-
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/messages.properties b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/messages.properties
deleted file mode 100644
index 689915e..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rmsystem/messages.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-JobThread_ErrorDeletingTempFiles_text=Could not remove temporary files\n
-JobThread_ErrorDeletingTempFiles_title=Clean-up problem
-JobThread_ErrorErr=Error occured while retreiving stderr
-JobThread_ErrorOpeningRemote=Error by opening remote file\!
-JobThread_ErrorOut=Error occured while retreiving stdout
-JobThread_ErrorReadingRemote=Error by reading remote file\!
-JobThread_ExceptionByMonitoring=Exception occured by monitoring job
-JobThread_JobStateCancelled=Job was cancelled
-JobThread_JobStateFailed=Job failed
-JobThread_JobStateFinisedWithStatus=Job finished with exit status: 
-JobThread_JobStateUnknown=Unknown
-JobThread_UnknownNode_text_1=Reported process on an unknown node:\n
-JobThread_UnknownNode_text_2=\n The node has been added to node list.
-JobThread_UnknownNode_title=Error\!
-PoolingIntervalsAndStatic_JobSubmissionFailed=Job submission failed
-SMOAResourceManager_7=Failed to write the run script on remote host
-SMOAResourceManager_8=Failed to create run script on remote host
-SMOAResourceManager_JobSubmissionFailed=Exception by submitting occured
-SMOAResourceManager_PortForwardingFailed_text=Continuing without port forwarding.\nError:\n
-SMOAResourceManager_PortForwardingFailed_title=Port forwarding problem
-SMOAResourceManagerConfiguration_AdditionalConnectionNotAvailable_text=Specified connection no longer exists, falling back to SMOA built-ins. Please update the configuration.
-SMOAResourceManagerConfiguration_AdditionalConnectionNotAvailable_title=Configuration error
-SMOAResourceManagerConfiguration_CouldNotRetreivePassword=Coud not retreive password\!\!
-SMOAResourceManagerConfiguration_CouldNotStorePassword=Coud not store password\!\!
-SMOAResourceManagerConfiguration_PrefixAnonymous=[anonymous] 
-SMOAResourceManagerConfiguration_PrefixGsi=[GSI] 
-SMOAResourceManagerConfiguration_ReusingConnection=Reusing existing SMOA connection
-SMOAResourceManagerConfiguration_SmoaRmDescription=SMOA Computing Resource Manager
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/Messages.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/Messages.java
deleted file mode 100644
index 608a93d..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/Messages.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rservices;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.smoa.core.rservices.messages"; //$NON-NLS-1$
-	public static String SMOAConnection_CannotModifyOpenConnection;
-	public static String SMOAConnection_UnsupportedAuthType;
-	public static String SMOAConnectionManager_DuplicatedConnection;
-	public static String SMOAFileStore_ChmodFailed;
-	public static String SMOAFileStore_InputStreamForFileNotReceived;
-	public static String SMOAFileStore_MkdirOverAnExistingFile;
-	public static String SMOAFileStore_RequestedListingUnexistingDirOrFile;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAConnection.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAConnection.java
deleted file mode 100644
index c6f1aaa..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAConnection.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rservices;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.util.Map;
-
-import javax.xml.bind.JAXBException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionChangeListener;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-import org.eclipse.ptp.rm.smoa.core.SMOAConfiguration.AuthType;
-
-import com.smoa.comp.sdk.SMOAFactory;
-import com.smoa.comp.sdk.SMOARsync;
-import com.smoa.comp.sdk.SMOAStaging;
-import com.smoa.comp.sdk.jsdl.JSDL;
-import com.smoa.comp.stubs.staging.FileNotFoundFault;
-import com.smoa.comp.stubs.staging.NotAuthorizedFault;
-import com.smoa.core.sdk.attachments.FileStagingHandler;
-import com.smoa.core.sdk.security.AuthenticationModule;
-import com.smoa.core.sdk.security.anonymous.AnonymousAuthentication;
-import com.smoa.core.sdk.security.gsi.GSIAuthentication;
-import com.smoa.core.sdk.security.ssl.SSLAuthentication;
-import com.smoa.core.sdk.security.wsse.WSSEAuthentication;
-import com.smoa.core.sdk.security.wsse.username.UsernameToken;
-
-/**
- * Main class for maintaining the real connection with SMOA Computing.
- * 
- * Keeps the SMOAFactory, SMOAStaging and SMOARsync objects.
- */
-public class SMOAConnection implements IRemoteConnection {
-
-	// Keys for map used to transfer connection attributes
-	public static final String TAG_ADDRESS = "address"; //$NON-NLS-1$
-	public static final String TAG_PORT = "port"; //$NON-NLS-1$
-	public static final String TAG_AUTHTYPE = "auth"; //$NON-NLS-1$
-	public static final String TAG_USERNAME = "user"; //$NON-NLS-1$
-	public static final String TAG_PASSWORD = "pass"; //$NON-NLS-1$
-	public static final String TAG_CACERT = "cacert"; //$NON-NLS-1$
-	public static final String TAG_DN = "dn"; //$NON-NLS-1$
-
-	// parent RemoteServices
-	private final SMOARemoteServices remoteServices;
-
-	// Connection state
-	private boolean connectionIsOpen = false;
-
-	// Crucial objects
-	private SMOAFactory besFactory;
-	private SMOAStaging smoaStaging;
-	private SMOARsync rsync;
-
-	// Connection info
-	private String name = null;
-	private String url = null;
-	private int port = 0;
-	private String resourceManagerName;
-
-	// Authentication info
-	private AuthType auth;
-	private String username;
-	private String password;
-	private String dn;
-	private String cacert;
-
-	// Others
-	private IRemoteFileManager fileManager = null;
-	private String workDir = "."; //$NON-NLS-1$
-	private String homeDir = null;
-	private IRemoteConnection fileRemoteConnection = null;
-
-	public SMOAConnection(SMOARemoteServices remoteServices, String name) {
-		this.remoteServices = remoteServices;
-		this.name = name;
-	}
-
-	public void addConnectionChangeListener(IRemoteConnectionChangeListener listener) {
-		if (fileRemoteConnection != null) {
-			fileRemoteConnection.addConnectionChangeListener(listener);
-		}
-
-	}
-
-	public void close() {
-		if (fileRemoteConnection != null) {
-			fileRemoteConnection.close();
-		}
-	}
-
-	public void forwardLocalPort(int localPort, String fwdAddress, int fwdPort) throws RemoteConnectionException {
-		if (fileRemoteConnection != null) {
-			fileRemoteConnection.forwardLocalPort(localPort, fwdAddress, fwdPort);
-		}
-
-	}
-
-	public int forwardLocalPort(String fwdAddress, int fwdPort, IProgressMonitor monitor) throws RemoteConnectionException {
-		if (fileRemoteConnection != null) {
-			return fileRemoteConnection.forwardLocalPort(fwdAddress, fwdPort, monitor);
-		}
-		return 0;
-	}
-
-	public void forwardRemotePort(int remotePort, String fwdAddress, int fwdPort) throws RemoteConnectionException {
-		if (fileRemoteConnection != null) {
-			fileRemoteConnection.forwardRemotePort(remotePort, fwdAddress, fwdPort);
-		}
-
-	}
-
-	public int forwardRemotePort(String fwdAddress, int fwdPort, IProgressMonitor monitor) throws RemoteConnectionException {
-		if (fileRemoteConnection != null) {
-			return fileRemoteConnection.forwardRemotePort(fwdAddress, fwdPort, monitor);
-		}
-		return 0;
-	}
-
-	public String getAddress() {
-		return url;
-	}
-
-	public Map<String, String> getAttributes() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public Map<String, String> getEnv() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getEnv(String name) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public SMOAFactory getFactory() {
-		return besFactory;
-	}
-
-	public IRemoteConnection getFileConnection() {
-		return fileRemoteConnection;
-	}
-
-	public IRemoteFileManager getFileManager() {
-		return fileManager;
-	}
-
-	public String getHomeDir() {
-		if (homeDir != null) {
-			return homeDir;
-		}
-
-		if (!isOpen()) {
-			return "."; //$NON-NLS-1$
-		}
-
-		JSDL jsdl;
-		try {
-			jsdl = smoaStaging.listDirectory(".", null); //$NON-NLS-1$
-		} catch (final FileNotFoundFault e) {
-			throw new RuntimeException();
-		} catch (final NotAuthorizedFault e) {
-			throw new RuntimeException();
-		}
-		homeDir = jsdl.getWorkingDirectory();
-		return homeDir;
-
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public int getPort() {
-		return port;
-	}
-
-	public String getProperty(String key) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public IRemoteServices getRemoteServices() {
-		return remoteServices;
-	}
-
-	public String getRMName() {
-		return resourceManagerName;
-	}
-
-	public SMOARsync getRsync() {
-		return rsync;
-	}
-
-	public SMOAStaging getSMOAStaging() {
-		return smoaStaging;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public String getWorkingDirectory() {
-		if (workDir.equals(".")) { //$NON-NLS-1$
-			getHomeDir();
-			if (homeDir != null) {
-				workDir = getHomeDir();
-			} else {
-				return "."; //$NON-NLS-1$
-			}
-		}
-		if (fileRemoteConnection != null) {
-			fileRemoteConnection.setWorkingDirectory(workDir);
-		}
-		return workDir;
-	}
-
-	public boolean isOpen() {
-		if (fileRemoteConnection != null && !fileRemoteConnection.isOpen()) {
-			return false;
-		}
-		return connectionIsOpen;
-	}
-
-	public void open(IProgressMonitor monitor) throws RemoteConnectionException {
-		try {
-			final AnonymousAuthentication anonAuth = new AnonymousAuthentication();
-			final FileStagingHandler fileStagingHandler = new SMOAFileStagingHandler();
-
-			switch (auth) {
-			case Anonymous:
-				besFactory = new SMOAFactory(url, port, anonAuth, true);
-				smoaStaging = new SMOAStaging(url, port, anonAuth, true, fileStagingHandler);
-				rsync = new SMOARsync(url, port, anonAuth, true);
-				break;
-			case GSI:
-				final GSIAuthentication gsi = new GSIAuthentication(dn != null && !dn.isEmpty() ? dn : null);
-				besFactory = new SMOAFactory(url, port, gsi, true);
-				smoaStaging = new SMOAStaging(url, port, gsi, true, fileStagingHandler);
-				rsync = new SMOARsync(url, port, gsi, true);
-
-				break;
-			case UsernamePassword: {
-
-				final WSSEAuthentication wsseAuth = new WSSEAuthentication(new UsernameToken(username, password, false, false));
-
-				AuthenticationModule am;
-
-				if (cacert == null) {
-					am = anonAuth;
-				} else {
-					am = new SSLAuthentication(cacert, null, dn != null && !dn.isEmpty() ? dn : null);
-
-				}
-
-				rsync = new SMOARsync(url, port, am, wsseAuth);
-				besFactory = new SMOAFactory(url, port, am, wsseAuth);
-				smoaStaging = new SMOAStaging(url, port, am, wsseAuth, true, fileStagingHandler);
-
-				break;
-			}
-			default:
-				throw new RuntimeException(Messages.SMOAConnection_UnsupportedAuthType);
-			}
-			connectionIsOpen = true;
-
-		} catch (final JAXBException e) {
-			throw new RemoteConnectionException(e);
-		} catch (final IOException e) {
-			throw new RemoteConnectionException(e);
-		} catch (final GeneralSecurityException e) {
-			throw new RemoteConnectionException(e);
-		}
-		if (fileRemoteConnection != null) {
-			fileRemoteConnection.open(monitor);
-		}
-	}
-
-	public void removeConnectionChangeListener(IRemoteConnectionChangeListener listener) {
-		if (fileRemoteConnection != null) {
-			fileRemoteConnection.removeConnectionChangeListener(listener);
-		}
-
-	}
-
-	public void setAddress(String address) {
-		if (address == null) {
-			return;
-		}
-		if (address.equals(url)) {
-			return;
-		}
-		if (isOpen()) {
-			throw new RuntimeException(Messages.SMOAConnection_CannotModifyOpenConnection);
-		}
-		url = address;
-	}
-
-	public void setAuthType(AuthType auth) {
-		if (this.auth == auth) {
-			return;
-		}
-		if (isOpen()) {
-			throw new RuntimeException(Messages.SMOAConnection_CannotModifyOpenConnection);
-		}
-		this.auth = auth;
-	}
-
-	public void setCaCert(String string) {
-		cacert = string;
-	}
-
-	public void setDN(String string) {
-		dn = string;
-	}
-
-	public void setFileConnection(IRemoteConnection fileRemoteConnection) {
-		if (isOpen()) {
-			throw new RuntimeException(Messages.SMOAConnection_CannotModifyOpenConnection);
-		}
-		this.fileRemoteConnection = fileRemoteConnection;
-	}
-
-	public void setFileManager(IRemoteFileManager fileManager) {
-		this.fileManager = fileManager;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public void setPort(int port) {
-		if (this.port == port) {
-			return;
-		}
-		if (isOpen()) {
-			throw new RuntimeException(Messages.SMOAConnection_CannotModifyOpenConnection);
-		}
-		this.port = port;
-	}
-
-	public void setRMName(String rMName) {
-		resourceManagerName = rMName;
-	}
-
-	public void setUsername(String username) {
-		if (isOpen()) {
-			throw new RuntimeException();
-		}
-		this.username = username;
-	}
-
-	public void setWorkingDirectory(String path) {
-		workDir = path;
-		if (fileRemoteConnection != null) {
-			fileRemoteConnection.setWorkingDirectory(path);
-		}
-
-	}
-
-	public boolean supportsTCPPortForwarding() {
-		if (fileRemoteConnection != null) {
-			return fileRemoteConnection.supportsTCPPortForwarding();
-		}
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remote.core.IRemoteConnection#setAttribute(java.lang.
-	 * String, java.lang.String)
-	 */
-	public void setAttribute(String key, String value) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.remote.core.IRemoteConnection#setPassword(java.lang.String
-	 * )
-	 */
-	public void setPassword(String password) {
-		if (isOpen()) {
-			throw new RuntimeException(Messages.SMOAConnection_CannotModifyOpenConnection);
-		}
-		this.password = password;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAConnectionManager.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAConnectionManager.java
deleted file mode 100644
index b9475ee..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAConnectionManager.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rservices;
-
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TreeMap;
-
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteConnectionManager;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-
-/**
- * Manages existing SMOA connections
- */
-public class SMOAConnectionManager implements IRemoteConnectionManager {
-
-	/** Parent Remote Services */
-	private final SMOARemoteServices remoteServices;
-
-	/** Map keeping connection under it's name */
-	private final Map<String, SMOAConnection> connections = new HashMap<String, SMOAConnection>();
-
-	public SMOAConnectionManager(SMOARemoteServices remoteServices) {
-		this.remoteServices = remoteServices;
-	}
-
-	public SMOAConnection getConnection(String name) {
-		return connections.get(name);
-	}
-
-	public SMOAConnection getConnection(URI uri) {
-		return getConnection(uri.toString());
-	}
-
-	/**
-	 * In order to prevent using this Remote Services in other RM's, the
-	 * official connection list is always empty
-	 */
-	public SMOAConnection[] getConnections() {
-		// return connections.values().toArray(new
-		// SMOAConnection[connections.size()]);
-		return new SMOAConnection[0];
-	}
-
-	/**
-	 * Retrieves all successful connections
-	 */
-	public Map<String, SMOAConnection> getOpenConnections() {
-		final Map<String, SMOAConnection> map = new TreeMap<String, SMOAConnection>();
-		for (final Entry<String, SMOAConnection> entry : connections.entrySet()) {
-			if (entry.getValue().isOpen()) {
-				map.put(entry.getKey(), entry.getValue());
-			}
-		}
-		return map;
-	}
-
-	/**
-	 * Creates a connection, does not open it.
-	 */
-	public SMOAConnection newConnection(String name) throws RemoteConnectionException {
-
-		if (connections.containsKey(name)) {
-			throw new RemoteConnectionException(Messages.SMOAConnectionManager_DuplicatedConnection);
-		}
-
-		final SMOAConnection connection = new SMOAConnection(remoteServices, name);
-
-		connections.put(name, connection);
-
-		return connection;
-	}
-
-	public void removeConnection(IRemoteConnection connection) {
-		connection.close();
-		connections.remove(connection.getName());
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileManager.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileManager.java
deleted file mode 100644
index c591cf8..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileManager.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rservices;
-
-import java.net.URI;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-
-import com.smoa.comp.sdk.SMOAStaging;
-
-public class SMOAFileManager implements IRemoteFileManager {
-
-	final private SMOAStaging staging;
-	private final SMOAConnection connection;
-
-	public SMOAFileManager(SMOAConnection c) {
-		this.connection = c;
-		staging = c.getSMOAStaging();
-	}
-
-	public String getDirectorySeparator() {
-		return "/"; //$NON-NLS-1$
-	}
-
-	public SMOAFileStore getResource(String path) {
-		return new SMOAFileStore(path, staging, connection, null);
-	}
-
-	public String toPath(URI uri) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public URI toURI(IPath path) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public URI toURI(String path) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileStagingHandler.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileStagingHandler.java
deleted file mode 100644
index 80f7ebe..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileStagingHandler.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rservices;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-
-import com.smoa.core.sdk.attachments.FileStagingHandler;
-
-/**
- * Staging handler working in cooperation with {@link SMOAFileStore} class.
- */
-public class SMOAFileStagingHandler implements FileStagingHandler {
-
-	public synchronized InputStream stageIn(String arg0) throws IOException {
-		final TransferStream ts = new TransferStream();
-
-		final SMOAFileStore fileStore = SMOAFileStore.fileStoresWaitingForStaging
-				.get(arg0);
-		SMOAFileStore.fileStoresWaitingForOutputStream.put(arg0, ts.os);
-
-		synchronized (fileStore) {
-			fileStore.notify();
-		}
-
-		return ts.is;
-	}
-
-	public synchronized void stageOut(String arg0, InputStream arg1)
-			throws IOException {
-
-		SMOAFileStore.fileStoresWaitingForInputStream.put(arg0, arg1);
-	}
-}
-
-/**
- * Two connected Pipe(I/O)Streams. Needed when library has: Input method() and
- * user wants: method(Output)
- */
-class TransferStream {
-	PipedInputStream is = new PipedInputStream();
-	PipedOutputStream os = new PipedOutputStream();
-	{
-		try {
-			is.connect(os);
-		} catch (final IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileStore.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileStore.java
deleted file mode 100644
index 38a5695..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOAFileStore.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rservices;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.filesystem.provider.FileStore;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.rm.smoa.core.SMOACoreActivator;
-
-import com.smoa.comp.sdk.SMOAStaging;
-import com.smoa.comp.sdk.exceptions.DeleteOnTerminationException;
-import com.smoa.comp.sdk.exceptions.FileNotFoundException;
-import com.smoa.comp.sdk.exceptions.NotAuthorizedException;
-import com.smoa.comp.sdk.exceptions.StagingException;
-import com.smoa.comp.sdk.jsdl.JSDL;
-import com.smoa.comp.sdk.jsdl.JSDLDataStaging;
-import com.smoa.comp.sdk.types.FileInfo;
-import com.smoa.comp.stubs.staging.FileNotFoundFault;
-import com.smoa.comp.stubs.staging.NotAuthorizedFault;
-import com.smoa.comp.stubs.staging.StagingFault;
-
-/**
- * Represents a potential file or directory. {@see
- * http://help.eclipse.org/helios
- * /index.jsp?topic=/org.eclipse.platform.doc.isv/reference
- * /api/org/eclipse/core/filesystem/package-summary.html}
- */
-public class SMOAFileStore extends FileStore {
-
-	private final SMOAStaging staging;
-	private final SMOAConnection connection;
-
-	/** Absolute path to file */
-	private final String path;
-
-	/** If file exists */
-	boolean exists = true;
-
-	private FileInfo info;
-
-	/** Parent file store (i.e. "../") */
-	private final SMOAFileStore parent;
-
-	// Maps used to co-operate with {@link SMOAFileStagingHandler}
-	static public Map<String, SMOAFileStore> fileStoresWaitingForStaging = new ConcurrentHashMap<String, SMOAFileStore>();
-	static public Map<String, InputStream> fileStoresWaitingForInputStream = new ConcurrentHashMap<String, InputStream>();
-	static public Map<String, OutputStream> fileStoresWaitingForOutputStream = new ConcurrentHashMap<String, OutputStream>();
-
-	// File info used in case of an error
-	static final FileInfo errorFileInfo = new FileInfo(0, 0, null, null, 0,
-			null, null, null);
-
-	private static int counter = 0;
-
-	private static Object ctr_lock = new Object();
-
-	private static String chmodAttributesFromFileInfo(IFileInfo fileInfo) {
-		int rights = 0;
-
-		if (fileInfo.getAttribute(EFS.ATTRIBUTE_OTHER_EXECUTE)) {
-			rights |= 01;
-		}
-		if (fileInfo.getAttribute(EFS.ATTRIBUTE_OTHER_WRITE)) {
-			rights |= 02;
-		}
-		if (fileInfo.getAttribute(EFS.ATTRIBUTE_OTHER_READ)) {
-			rights |= 04;
-		}
-
-		if (fileInfo.getAttribute(EFS.ATTRIBUTE_GROUP_EXECUTE)) {
-			rights |= 010;
-		}
-		if (fileInfo.getAttribute(EFS.ATTRIBUTE_GROUP_WRITE)) {
-			rights |= 020;
-		}
-		if (fileInfo.getAttribute(EFS.ATTRIBUTE_GROUP_READ)) {
-			rights |= 040;
-		}
-
-		if (fileInfo.getAttribute(EFS.ATTRIBUTE_OWNER_EXECUTE)) {
-			rights |= 0100;
-		}
-		if (fileInfo.getAttribute(EFS.ATTRIBUTE_OWNER_WRITE)) {
-			rights |= 0200;
-		}
-		if (fileInfo.getAttribute(EFS.ATTRIBUTE_OWNER_READ)) {
-			rights |= 0400;
-		}
-
-		return Integer.toString(rights, 8);
-	}
-
-	/**
-	 * Constructs new SMOAFileStore, does not fetch the info
-	 * 
-	 * @param path
-	 *            - may be relative
-	 * @param parent
-	 *            - parent directory store
-	 */
-	public SMOAFileStore(String path, SMOAStaging staging,
-			SMOAConnection connection, SMOAFileStore parent) {
-		super();
-
-		while (path.endsWith("/") && path.length() > 1) { //$NON-NLS-1$
-			path = path.substring(0, path.length() - 1);
-		}
-
-		while (path.startsWith("./")) { //$NON-NLS-1$
-			path = path.substring(2);
-		}
-
-		if (path.equals(".") || path.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
-			path = connection.getHomeDir();
-		}
-
-		if (!path.startsWith("/")) { //$NON-NLS-1$
-			path = connection.getHomeDir() + "/" + path; //$NON-NLS-1$
-		}
-
-		this.path = path;
-		this.connection = connection;
-		this.staging = staging;
-		this.parent = parent;
-	}
-
-	/**
-	 * Returns last fetched IFileInfo, or null if no info has been fetched yet.
-	 */
-	public IFileInfo cachedInfo() throws CoreException {
-
-		org.eclipse.core.filesystem.provider.FileInfo fileInfo;
-		fileInfo = new org.eclipse.core.filesystem.provider.FileInfo(path);
-
-		fileInfo.setExists(exists);
-
-		if (!exists) {
-			return fileInfo;
-		}
-
-		if (info == null) {
-			return null;
-		}
-		
-		fileInfo.setDirectory((info.getMode() & FileInfo.S_IFDIR) != 0);
-
-		fileInfo.setLastModified(info.getModificationTime().getTime());
-
-		fileInfo.setLength(info.getSize());
-
-		fileInfo.setAttribute(EFS.ATTRIBUTE_EXECUTABLE,
-				(info.getMode() & 0111) != 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_HIDDEN, getName().matches("^.")); //$NON-NLS-1$
-		fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY,
-				(info.getMode() & 0444) == 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_SYMLINK,
-				(info.getMode() & FileInfo.S_IFLNK) != 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_OWNER_EXECUTE,
-				(info.getMode() & 0100) != 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_OWNER_READ,
-				(info.getMode() & 0400) != 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_OWNER_WRITE,
-				(info.getMode() & 0200) != 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_GROUP_EXECUTE,
-				(info.getMode() & 010) != 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_GROUP_READ,
-				(info.getMode() & 040) != 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_GROUP_WRITE,
-				(info.getMode() & 020) != 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_OTHER_EXECUTE,
-				(info.getMode() & 01) != 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_OTHER_READ,
-				(info.getMode() & 04) != 0);
-		fileInfo.setAttribute(EFS.ATTRIBUTE_OTHER_WRITE,
-				(info.getMode() & 02) != 0);
-
-		if ((info.getMode() & FileInfo.S_IFLNK) != 0) {
-			fileInfo.setStringAttribute(EFS.ATTRIBUTE_LINK_TARGET, path);
-		}
-
-		return fileInfo;
-	}
-
-	/**
-	 * Returns IFileInfos for all children in this directory. Uses one call for
-	 * all files instead of a call for every file. If fails, falls back to
-	 * default implementation.
-	 */
-	@Override
-	public IFileInfo[] childInfos(int options, IProgressMonitor monitor)
-			throws CoreException {
-
-		final List<String> fileNames = new Vector<String>();
-		final String[] childNames = childNames(options, monitor);
-
-		if (childNames.length == 0) {
-			return new IFileInfo[0];
-		}
-
-		for (final String childName : childNames) {
-			fileNames.add(path + "/" + childName); //$NON-NLS-1$
-		}
-
-		FileInfo[] infos;
-		try {
-			infos = staging.statFile(fileNames, null);
-		} catch (final FileNotFoundFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-		} catch (final NotAuthorizedFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-		} catch (final StagingFault e) {
-			return super.childInfos(options, monitor);
-		}
-
-		final SMOAFileStore[] stores = new SMOAFileStore[fileNames.size()];
-		final IFileInfo[] smoaInfos = new IFileInfo[fileNames.size()];
-		for (int i = 0; i < infos.length; i++) {
-			stores[i] = fromChildInfo(infos[i], fileNames.get(i));
-			smoaInfos[i] = stores[i].cachedInfo();
-		}
-
-		return smoaInfos;
-	}
-
-	/**
-	 * Returns the directory listing (like <tt>ls -1</tt>)
-	 */
-	@Override
-	public String[] childNames(int arg0, IProgressMonitor arg1)
-			throws CoreException {
-
-		fetchInfo(arg0, arg1);
-
-		if (!exists) {
-			throw new CoreException(new Status(IStatus.WARNING,
-					SMOACoreActivator.PLUGIN_ID,
-					Messages.SMOAFileStore_RequestedListingUnexistingDirOrFile));
-		}
-
-		if ((info.getMode() & FileInfo.S_IFDIR) == 0) {
-			return new String[0];
-		}
-
-		JSDL jsdl;
-
-		try {
-			jsdl = staging.listDirectory(path, null);
-		} catch (final FileNotFoundFault e) {
-			throw new RuntimeException(e);
-		} catch (final NotAuthorizedFault e) {
-			throw new RuntimeException(e);
-		}
-
-		final Vector<String> names = new Vector<String>();
-		for (final JSDLDataStaging ds : jsdl.getDataStaging()) {
-			if (ds.getFileName().equals(".") || ds.getFileName().equals("..")) { //$NON-NLS-1$ //$NON-NLS-2$
-				continue;
-			}
-			names.add(ds.getFileName());
-		}
-		return names.toArray(new String[names.size()]);
-	}
-
-	@Override
-	public void delete(int options, IProgressMonitor monitor)
-			throws CoreException {
-		try {
-			staging.delete(path, null);
-		} catch (final FileNotFoundFault e) {
-		} catch (final NotAuthorizedFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-		} catch (final StagingFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-		}
-	}
-
-	/**
-	 * Fetches info for a single file
-	 */
-	@Override
-	public IFileInfo fetchInfo(int arg0, IProgressMonitor arg1)
-			throws CoreException {
-		try {
-			final List<String> l = new Vector<String>();
-			l.add(path);
-			info = staging.statFile(l, null)[0];
-			exists = true;
-		} catch (final FileNotFoundFault e) {
-			exists = false;
-		} catch (final NotAuthorizedFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-		} catch (final StagingFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-		}
-
-		return cachedInfo();
-
-	}
-
-	/**
-	 * If one has a FileInfo of a child, one may create FileStore with it
-	 */
-	protected SMOAFileStore fromChildInfo(FileInfo info, String path) {
-		final SMOAFileStore store = new SMOAFileStore(path, staging, connection, this);
-		store.info = info;
-		store.exists = true;
-		return store;
-	}
-
-	/**
-	 * Returns a file from this directory
-	 * 
-	 * @param name
-	 *            - name, relative to this directory
-	 */
-	@Override
-	public SMOAFileStore getChild(String name) {
-
-		if (name == null || name.isEmpty()) {
-			return null;
-		}
-
-		if (name.equals(".")) { //$NON-NLS-1$
-			return this;
-		}
-
-		if (name.startsWith("/")) { //$NON-NLS-1$
-			if (name.startsWith(path) && !name.equals(path)) {
-				return new SMOAFileStore(name, staging, getConnection(), this);
-			}
-
-			return new SMOAFileStore(name, staging, getConnection(), null);
-		}
-
-		if (name.equals("..") || name.contains("/")) { //$NON-NLS-1$ //$NON-NLS-2$
-			return new SMOAFileStore(path + "/" + name, staging, //$NON-NLS-1$
-					getConnection(), null);
-		}
-
-		return new SMOAFileStore(path + "/" + name, staging, //$NON-NLS-1$
-				getConnection(), this);
-	}
-
-	public SMOAConnection getConnection() {
-		return connection;
-	}
-
-	/**
-	 * Returns file name
-	 */
-	@Override
-	public String getName() {
-		if (path.endsWith("/") && path.length() > 1) { //$NON-NLS-1$
-			final String p = path.substring(0, path.length() - 1);
-			return p.substring(p.lastIndexOf('/') + 1);
-		}
-		return path.substring(path.lastIndexOf('/') + 1);
-	}
-
-	/**
-	 * Returns (creating if needed) parent store
-	 */
-	@Override
-	public SMOAFileStore getParent() {
-		if (parent != null) {
-			return parent;
-		}
-
-		if (path.indexOf('/') == -1) {
-			return null;
-		}
-
-		if (path.equals("/")) { //$NON-NLS-1$
-			return null;
-		}
-
-		final String parentPath = path.substring(0, path.lastIndexOf('/'));
-		return new SMOAFileStore(parentPath, staging, getConnection(), null);
-	}
-
-	public String getPath() {
-		return path;
-	}
-
-	@Override
-	public SMOAFileStore mkdir(int options, IProgressMonitor monitor)
-			throws CoreException {
-
-		if (this.fetchInfo().isDirectory()) {
-			return this;
-		}
-
-		if (exists) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID,
-					Messages.SMOAFileStore_MkdirOverAnExistingFile));
-		}
-
-		final IFileStore par = getParent();
-		if (!par.fetchInfo().isDirectory()) {
-			par.mkdir(options, monitor);
-		}
-
-		try {
-			staging.mkdir(path, null, null);
-		} catch (final FileNotFoundFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-		} catch (final NotAuthorizedFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-		} catch (final StagingFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-		}
-
-		fetchInfo();
-		return this;
-	}
-
-	/**
-	 * Co-working with {@link SMOAStagingHandler} gets the {@link InputStream}
-	 * from the file
-	 */
-	@Override
-	public InputStream openInputStream(int arg0, IProgressMonitor arg1)
-			throws CoreException {
-		return openInputStream(arg0, arg1, 0);
-	}
-
-	/**
-	 * Co-working with {@link SMOAStagingHandler} gets the {@link InputStream}
-	 * from the file, from specified offset (in bytes) on
-	 */
-	public InputStream openInputStream(int arg0, IProgressMonitor arg1,
-			Integer offset) throws CoreException {
-
-		int lcounter;
-		synchronized (ctr_lock) {
-			lcounter = counter;
-			counter++;
-		}
-
-		final JSDL jsdl = new JSDL("openInputStream_" + path); //$NON-NLS-1$
-		final JSDLDataStaging dataStaging = new JSDLDataStaging(path, null, path
-				+ " " + lcounter); //$NON-NLS-1$
-
-		dataStaging.setOffset(offset);
-
-		jsdl.getDataStaging().add(dataStaging);
-		Throwable t;
-
-		try {
-			staging.stageOutFiles(jsdl);
-
-			final InputStream is = fileStoresWaitingForInputStream.remove(path
-					+ " " + lcounter); //$NON-NLS-1$
-
-			// FIXME:
-			if (is == null) {
-				throw new CoreException(new Status(IStatus.ERROR,
-						SMOACoreActivator.PLUGIN_ID,
-						Messages.SMOAFileStore_InputStreamForFileNotReceived));
-			}
-
-			return is;
-
-		} catch (final DeleteOnTerminationException e) {
-			t = e;
-		} catch (final FileNotFoundException e) {
-			t = e;
-		} catch (final NotAuthorizedException e) {
-			t = e;
-		} catch (final StagingException e) {
-			t = e;
-		} catch (final IOException e) {
-			t = e;
-		}
-		throw new CoreException(new Status(IStatus.ERROR,
-				SMOACoreActivator.PLUGIN_ID, t.getLocalizedMessage(), t));
-	}
-
-	/**
-	 * Opens {@link OutputStream} for the file. Overwrites if file exists.
-	 * 
-	 * If the file doesn't exist, the file is created.
-	 * 
-	 * If the parent directory doesn't exist, it's also created.
-	 */
-	@Override
-	public OutputStream openOutputStream(int options, IProgressMonitor monitor)
-			throws CoreException {
-
-		// Ensure that the parent dir exists
-		getParent().mkdir(options, monitor);
-
-		int lcounter;
-		synchronized (ctr_lock) {
-			lcounter = counter;
-			counter++;
-		}
-
-		final JSDL jsdl = new JSDL("openOutputStream_" + path); //$NON-NLS-1$
-		jsdl.getDataStaging().add(
-				new JSDLDataStaging(path, path + " " + lcounter, //$NON-NLS-1$
-						null));
-		final Throwable[] t = new Throwable[1];
-		t[0] = null;
-
-		fileStoresWaitingForStaging.put(path + " " + lcounter, this); //$NON-NLS-1$
-
-		synchronized (this) {
-			new Thread() {
-				@Override
-				public void run() {
-					setName("stageIn_" + path); //$NON-NLS-1$
-					try {
-						staging.stageInFiles(jsdl);
-					} catch (final FileNotFoundException e) {
-						t[0] = e;
-					} catch (final NotAuthorizedException e) {
-						t[0] = e;
-					} catch (final StagingException e) {
-						t[0] = e;
-					} catch (final IOException e) {
-						t[0] = e;
-					}
-				}
-			}.start();
-
-			try {
-				this.wait();
-			} catch (final InterruptedException e) {
-			}
-		}
-
-		fileStoresWaitingForStaging.remove(path + " " + lcounter); //$NON-NLS-1$
-
-		final OutputStream os = fileStoresWaitingForOutputStream.remove(path
-				+ " " + lcounter); //$NON-NLS-1$
-
-		if (t[0] == null) {
-			return os;
-		}
-
-		throw new CoreException(new Status(IStatus.ERROR,
-				SMOACoreActivator.PLUGIN_ID, t[0].getLocalizedMessage(), t[0]));
-	}
-
-	/**
-	 * Changes file properties - in SMOA case, only chmod is supported
-	 */
-	@Override
-	public void putInfo(IFileInfo arg0, int arg1, IProgressMonitor arg2)
-			throws CoreException {
-		try {
-			staging.chmod(path, chmodAttributesFromFileInfo(arg0), null);
-		} catch (final FileNotFoundFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID,
-					Messages.SMOAFileStore_ChmodFailed
-							+ e.getLocalizedMessage(), e));
-		} catch (final NotAuthorizedFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID,
-					Messages.SMOAFileStore_ChmodFailed
-							+ e.getLocalizedMessage(), e));
-		} catch (final StagingFault e) {
-			throw new CoreException(new Status(IStatus.ERROR,
-					SMOACoreActivator.PLUGIN_ID,
-					Messages.SMOAFileStore_ChmodFailed
-							+ e.getLocalizedMessage(), e));
-		}
-	}
-
-	@Override
-	public URI toURI() {
-		try {
-			return new URI(path);
-		} catch (final URISyntaxException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOARemoteServices.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOARemoteServices.java
deleted file mode 100644
index 232971f..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/SMOARemoteServices.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rservices;
-
-import java.util.List;
-
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.IRemoteProcessBuilder;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-
-/**
- * SMOARemoteServices provide services for managing connection and files, as
- * well as hold SMOA objects need for task submission.
- * 
- * But for file managing and creating remote processes one may supply any other
- * services, in this case SMOARemoteService will just serve as proxy.
- */
-public class SMOARemoteServices implements IRemoteServices {
-
-	private final String remoteServices_ID;
-	private final String remoteServices_NAME;
-	private final String remoteServices_SCHEME;
-
-	private SMOAConnectionManager connectionManager = null;
-
-	public SMOARemoteServices(String id, String name) {
-		remoteServices_ID = id;
-		remoteServices_NAME = name;
-		remoteServices_SCHEME = "scheme"; //$NON-NLS-1$
-	}
-
-	public SMOAConnectionManager getConnectionManager() {
-		if (connectionManager == null) {
-			connectionManager = new SMOAConnectionManager(this);
-		}
-		return connectionManager;
-	}
-
-	public IRemoteFileManager getFileManager(IRemoteConnection conn) {
-		if (!(conn instanceof SMOAConnection)) {
-			throw new IllegalArgumentException("SMOA got a " //$NON-NLS-1$
-					+ conn.getClass().getCanonicalName() + " connection"); //$NON-NLS-1$
-		}
-		final SMOAConnection c = (SMOAConnection) conn;
-
-		if (!c.isOpen()) {
-			return null;
-		}
-
-		final IRemoteConnection fileServices = c.getFileConnection();
-		if (fileServices != null) {
-			return fileServices.getRemoteServices()
-					.getFileManager(fileServices);
-		}
-
-		IRemoteFileManager fileManager = c.getFileManager();
-
-		if (fileManager == null) {
-			fileManager = new SMOAFileManager(c);
-			c.setFileManager(fileManager);
-		}
-
-		return fileManager;
-	}
-
-	public String getId() {
-		return remoteServices_ID;
-	}
-
-	public String getName() {
-		return remoteServices_NAME;
-	}
-
-	public IRemoteProcessBuilder getProcessBuilder(IRemoteConnection conn,
-			List<String> command) {
-
-		if (!(conn instanceof SMOAConnection)) {
-			throw new IllegalArgumentException("SMOA got a " //$NON-NLS-1$
-					+ conn.getClass().getCanonicalName() + " connection"); //$NON-NLS-1$
-		}
-		final SMOAConnection c = (SMOAConnection) conn;
-		final IRemoteConnection fileServices = c.getFileConnection();
-		if (fileServices != null) {
-			return fileServices.getRemoteServices().getProcessBuilder(
-					fileServices, command);
-		}
-
-		return null;
-	}
-
-	public IRemoteProcessBuilder getProcessBuilder(IRemoteConnection conn,
-			String... command) {
-
-		if (!(conn instanceof SMOAConnection)) {
-			throw new IllegalArgumentException("SMOA got a " //$NON-NLS-1$
-					+ conn.getClass().getCanonicalName() + " connection"); //$NON-NLS-1$
-		}
-		final SMOAConnection c = (SMOAConnection) conn;
-		final IRemoteConnection fileServices = c.getFileConnection();
-		if (fileServices != null) {
-			return fileServices.getRemoteServices().getProcessBuilder(
-					fileServices, command);
-		}
-
-		return null;
-	}
-
-	public String getScheme() {
-		return remoteServices_SCHEME;
-	}
-
-	public void initialize() {
-	}
-
-	public boolean isInitialized() {
-		return true;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/messages.properties b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/messages.properties
deleted file mode 100644
index bbe4cf9..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rservices/messages.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-SMOAConnection_CannotModifyOpenConnection=Cannot change an already opened connection
-SMOAConnection_UnsupportedAuthType=Unsupported authentication type forced\!\!\!
-SMOAConnectionManager_DuplicatedConnection=Trying to add an already existing connection
-SMOAFileStore_ChmodFailed=Chmod failed: 
-SMOAFileStore_InputStreamForFileNotReceived=Receiving InputStream for a file failed
-SMOAFileStore_MkdirOverAnExistingFile=Cannot create dir, because the path describes a file
-SMOAFileStore_RequestedListingUnexistingDirOrFile=Store does no exist
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rtsystem/SMOARuntimeSystem.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rtsystem/SMOARuntimeSystem.java
deleted file mode 100644
index bcb9923..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rtsystem/SMOARuntimeSystem.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.rtsystem;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.ptp.core.IPTPLaunchConfigurationConstants;
-import org.eclipse.ptp.core.attributes.AttributeDefinitionManager;
-import org.eclipse.ptp.core.attributes.AttributeManager;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.elements.IPElement;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributeManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-import org.eclipse.ptp.core.elements.attributes.ErrorAttributes;
-import org.eclipse.ptp.core.elements.attributes.FilterAttributes;
-import org.eclipse.ptp.core.elements.attributes.JobAttributes;
-import org.eclipse.ptp.core.elements.attributes.MachineAttributes;
-import org.eclipse.ptp.core.elements.attributes.MessageAttributes;
-import org.eclipse.ptp.core.elements.attributes.NodeAttributes;
-import org.eclipse.ptp.core.elements.attributes.ProcessAttributes;
-import org.eclipse.ptp.core.elements.attributes.QueueAttributes;
-import org.eclipse.ptp.core.elements.attributes.ResourceManagerAttributes;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.remote.core.exception.RemoteConnectionException;
-import org.eclipse.ptp.rm.smoa.core.SMOAConfiguration;
-import org.eclipse.ptp.rm.smoa.core.SMOACoreActivator;
-import org.eclipse.ptp.rm.smoa.core.attrib.SMOAMachineAttributes;
-import org.eclipse.ptp.rm.smoa.core.attrib.SMOANodeAttributes;
-import org.eclipse.ptp.rm.smoa.core.attrib.SMOAQueueAttributes;
-import org.eclipse.ptp.rm.smoa.core.attrib.SMOARMAttributes;
-import org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManager;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOAConnection;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOARemoteServices;
-import org.eclipse.ptp.rtsystem.AbstractRuntimeSystem;
-import org.eclipse.ptp.rtsystem.events.IRuntimeEventFactory;
-import org.eclipse.ptp.rtsystem.events.IRuntimeJobChangeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewJobEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewMachineEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewNodeEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeNewQueueEvent;
-import org.eclipse.ptp.rtsystem.events.IRuntimeRMChangeEvent;
-import org.eclipse.ptp.rtsystem.events.RuntimeEventFactory;
-import org.eclipse.ptp.utils.core.ArgumentParser;
-import org.eclipse.ptp.utils.core.RangeSet;
-
-import com.smoa.comp.sdk.SMOAFactory;
-import com.smoa.comp.stubs.bes.factory.BasicResourceAttributesDocumentType;
-import com.smoa.comp.stubs.bes.factory.FactoryResourceAttributesDocumentType;
-import com.smoa.comp.stubs.factory.ApplicationsType.Application;
-
-/**
- * Co-works with {@link SMOAResourceManager} in order to manage ResourceManager
- * and jobs. Is created by {@link SMOAResourceManager}.
- * 
- * Methods from this class are called by Eclipse in order to start and terminate
- * a job
- */
-public class SMOARuntimeSystem extends AbstractRuntimeSystem {
-
-	private final SMOAConfiguration configuration;
-	private int nextJobNumber = 0;
-
-	/** Creates events for the ResourceManager */
-	private final IRuntimeEventFactory eventFactory = new RuntimeEventFactory();
-
-	/** Caches errors from {@link SMOAResourceManager} by submitting jobs */
-	private final Map<String, Exception> jobSbmissionErrors = new HashMap<String, Exception>();
-
-	/** Resource Manager ID (needed for RM change events) */
-	private final String rmId;
-
-	/** Attribute definitions for the RTS. */
-	protected AttributeDefinitionManager attrMgr = new AttributeDefinitionManager();
-
-	public SMOARuntimeSystem(SMOAConfiguration configuration, String rmId) {
-		super();
-		this.configuration = configuration;
-		this.rmId = rmId;
-	}
-
-	public void addJobSubmissionError(String subId, Exception e) {
-		jobSbmissionErrors.put(subId, e);
-	}
-
-	public void addUnknownNode(IPMachine machine, String name) {
-		final AttributeManager am = new SMOANodeAttributes();
-
-		am.addAttribute(ElementAttributes.getNameAttributeDefinition().create(name));
-		am.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create(name));
-
-		final ElementAttributeManager eam = new ElementAttributeManager();
-		eam.setAttributeManager(new RangeSet(machine.getNodes().length), am);
-
-		final IRuntimeNewNodeEvent irnne = eventFactory.newRuntimeNewNodeEvent(machine.getID(), eam);
-
-		fireRuntimeNewNodeEvent(irnne);
-	}
-
-	public void filterEvents(IPElement element, boolean filterChildren, AttributeManager filterAttributes) throws CoreException {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rtsystem.IControlSystem#getAttributeDefinitionManager()
-	 */
-	public AttributeDefinitionManager getAttributeDefinitionManager() {
-		return attrMgr;
-	}
-
-	public void shutdown() throws CoreException {
-
-	}
-
-	public void startEvents() throws CoreException {
-	}
-
-	/**
-	 * Opens the connection and retrieves basic information about RM, machine
-	 * and nodes. Creates the default queue
-	 */
-	public void startup(IProgressMonitor monitor) throws CoreException {
-
-		initialize();
-
-		final SMOARemoteServices remoteServices = (SMOARemoteServices) PTPRemoteCorePlugin.getDefault().getRemoteServices(
-				configuration.getRemoteServicesId());
-
-		final SMOAConnection connection = remoteServices.getConnectionManager().getConnection(configuration.getConnectionName());
-
-		if (!connection.isOpen()) {
-			try {
-				connection.open(monitor);
-			} catch (final RemoteConnectionException e1) {
-				throw new CoreException(new Status(IStatus.ERROR, SMOACoreActivator.PLUGIN_ID, e1.getLocalizedMessage(), e1));
-			}
-		}
-
-		final SMOAFactory besFactory = connection.getFactory();
-
-		FactoryResourceAttributesDocumentType cluster;
-
-		try {
-			cluster = besFactory.getFactoryAttributesDocument();
-		} catch (final Throwable t) {
-			throw new CoreException(new Status(IStatus.ERROR, SMOACoreActivator.PLUGIN_ID, t.getLocalizedMessage(), t));
-		}
-
-		final List<Application> apps = SMOAFactory.getApplications(cluster).getApplication();
-
-		configuration.setAvailableAppList(apps);
-
-		// Machine && nodes information
-		{
-			final ElementAttributeManager machines = new ElementAttributeManager();
-			final AttributeManager machine = new SMOAMachineAttributes();
-
-			machine.addAttribute(ElementAttributes.getNameAttributeDefinition().create(cluster.getCommonName()));
-
-			try {
-				machine.addAttribute(MachineAttributes.getNumNodesAttributeDefinition().create(
-						cluster.getContainedResource().size()));
-			} catch (final IllegalValueException e1) {
-				// One of the "should never happen"
-				throw new CoreException(new Status(IStatus.ERROR, SMOACoreActivator.PLUGIN_ID, e1.getLocalizedMessage(), e1));
-			}
-
-			machines.setAttributeManager(new RangeSet(0), machine);
-
-			final IRuntimeNewMachineEvent irnme = eventFactory.newRuntimeNewMachineEvent(null, machines);
-			fireRuntimeNewMachineEvent(irnme);
-
-			int i = 0;
-
-			for (final Object _ : cluster.getContainedResource()) {
-				final BasicResourceAttributesDocumentType host = (BasicResourceAttributesDocumentType) _;
-
-				try {
-					final AttributeManager am = new SMOANodeAttributes();
-
-					am.addAttribute(ElementAttributes.getNameAttributeDefinition().create(host.getResourceName()));
-					am.addAttribute(ProcessAttributes.getNodeIdAttributeDefinition().create(host.getResourceName()));
-					am.addAttribute(SMOANodeAttributes.getCpuArchDef().create(
-							host.getCPUArchitecture().getCPUArchitectureName().toString()));
-					am.addAttribute(SMOANodeAttributes.getCpuCountDef().create(host.getCPUCount().intValue()));
-					am.addAttribute(SMOANodeAttributes.getMemorySizeDef().create((host.getPhysicalMemory() / (1024 * 1024)) + "MB")); //$NON-NLS-1$
-
-					am.addAttribute(NodeAttributes.getStateAttributeDefinition().create(NodeAttributes.State.UP));
-
-					final ElementAttributeManager eam = new ElementAttributeManager();
-					eam.setAttributeManager(new RangeSet(i++), am);
-
-					final IRuntimeNewNodeEvent irnne = eventFactory.newRuntimeNewNodeEvent("0", eam); //$NON-NLS-1$
-
-					fireRuntimeNewNodeEvent(irnne);
-
-				} catch (final IllegalValueException e) {
-					throw new CoreException(new Status(IStatus.ERROR, SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-				}
-			}
-
-		}
-
-		// Queue information
-
-		{
-			final RangeSet rs = new RangeSet(0);
-			final AttributeManager am = new SMOAQueueAttributes();
-			try {
-				am.getAttribute("name").setValueAsString("Default queue"); //$NON-NLS-1$ //$NON-NLS-2$
-				am.getAttribute("id").setValueAsString("0"); //$NON-NLS-1$ //$NON-NLS-2$
-			} catch (final IllegalValueException e) {
-				throw new RuntimeException(e);
-			}
-
-			final ElementAttributeManager eam = new ElementAttributeManager();
-			eam.setAttributeManager(rs, am);
-
-			final IRuntimeNewQueueEvent irnqe = eventFactory.newRuntimeNewQueueEvent(null, eam);
-			fireRuntimeNewQueueEvent(irnqe);
-		}
-
-		// RM informations
-
-		{
-
-			final ElementAttributeManager eam = new ElementAttributeManager();
-			final RangeSet rs = new RangeSet(rmId);
-			final AttributeManager am = new SMOARMAttributes();
-
-			am.addAttribute(SMOARMAttributes.getQueuingSystemDef().create(cluster.getLocalResourceManagerType()));
-			am.addAttribute(SMOARMAttributes.getAcceptsActivitiesDef().create(cluster.isIsAcceptingNewActivities()));
-			am.addAttribute(SMOARMAttributes.getCommonNameDef().create(cluster.getCommonName()));
-
-			eam.setAttributeManager(rs, am);
-			final IRuntimeRMChangeEvent irrmce = eventFactory.newRuntimeRMChangeEvent(eam);
-			fireRuntimeRMChangeEvent(irrmce);
-		}
-
-	}
-
-	public void stopEvents() throws CoreException {
-	}
-
-	/**
-	 * Called by Eclipse when the job is to be submitted.
-	 * 
-	 * @param subId
-	 *            - eclipse submission ID. {@link SMOAResourceManager} needs
-	 *            this to inform Eclipse that the job has been submitted.
-	 */
-	public void submitJob(String subId, ILaunchConfiguration configuration, String mode) throws CoreException {
-
-		AttributeManager attrMgr = new AttributeManager(getAttributes(configuration, mode).toArray(new IAttribute<?, ?, ?>[0]));
-
-		attrMgr.addAttribute(JobAttributes.getSubIdAttributeDefinition().create(subId));
-
-		final RangeSet rs = new RangeSet(nextJobNumber);
-		nextJobNumber++;
-		final ElementAttributeManager eam = new ElementAttributeManager();
-		eam.setAttributeManager(rs, attrMgr);
-
-		final IRuntimeNewJobEvent irnje = eventFactory.newRuntimeNewJobEvent("0", eam); //$NON-NLS-1$
-		fireRuntimeNewJobEvent(irnje);
-
-		final Exception e = jobSbmissionErrors.remove(subId);
-		if (e != null) {
-			throw new CoreException(new Status(IStatus.ERROR, SMOACoreActivator.PLUGIN_ID, e.getLocalizedMessage(), e));
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rtsystem.IControlSystem#terminateJob(java.lang.String)
-	 */
-	public void terminateJob(String jobId) throws CoreException {
-	}
-
-	/**
-	 * Change attributes of a job
-	 * 
-	 * @param jobID
-	 * @param changedAttrMgr
-	 */
-	public void changeJob(String jobID, AttributeManager changedAttrMgr) {
-		AttributeManager attrMgr = new AttributeManager();
-		attrMgr.addAttributes(changedAttrMgr.getAttributes());
-		ElementAttributeManager elementAttrs = new ElementAttributeManager();
-		elementAttrs.setAttributeManager(new RangeSet(jobID), attrMgr);
-		IRuntimeJobChangeEvent event = eventFactory.newRuntimeJobChangeEvent(elementAttrs);
-		fireRuntimeJobChangeEvent(event);
-	}
-
-	/**
-	 * Convert launch configuration attributes to PTP attributes
-	 */
-	private List<IAttribute<?, ?, ?>> getAttributes(ILaunchConfiguration configuration, String mode) throws CoreException {
-		List<IAttribute<?, ?, ?>> attrs = new ArrayList<IAttribute<?, ?, ?>>();
-
-		/*
-		 * Collect attributes from Application tab
-		 */
-		String exePath = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_EXECUTABLE_PATH, (String) null);
-		if (exePath != null) {
-			IPath programPath = new Path(exePath);
-			attrs.add(JobAttributes.getExecutableNameAttributeDefinition().create(programPath.lastSegment()));
-
-			String path = programPath.removeLastSegments(1).toString();
-			if (path != null) {
-				attrs.add(JobAttributes.getExecutablePathAttributeDefinition().create(path));
-			}
-		}
-
-		/*
-		 * Collect attributes from Arguments tab
-		 */
-		String wd = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_WORKING_DIR, (String) null);
-		if (wd != null) {
-			attrs.add(JobAttributes.getWorkingDirectoryAttributeDefinition().create(wd));
-		}
-
-		String[] args = getProgramArguments(configuration, IPTPLaunchConfigurationConstants.ATTR_ARGUMENTS);
-		if (args != null) {
-			attrs.add(JobAttributes.getProgramArgumentsAttributeDefinition().create(args));
-		}
-
-		/*
-		 * Collect attributes from Environment tab
-		 */
-		String[] envArr = getEnvironment(configuration);
-		if (envArr != null) {
-			attrs.add(JobAttributes.getEnvironmentAttributeDefinition().create(envArr));
-		}
-
-		/*
-		 * Collect attributes from Debugger tab if this is a debug launch
-		 */
-		if (mode.equals(ILaunchManager.DEBUG_MODE)) {
-			boolean stopInMainFlag = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_STOP_IN_MAIN, false);
-			attrs.add(JobAttributes.getDebuggerStopInMainFlagAttributeDefinition().create(Boolean.valueOf(stopInMainFlag)));
-
-			attrs.add(JobAttributes.getDebugFlagAttributeDefinition().create(Boolean.TRUE));
-
-			args = getProgramArguments(configuration, IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_ARGS);
-			if (args != null) {
-				attrs.add(JobAttributes.getDebuggerArgumentsAttributeDefinition().create(args));
-			}
-
-			String dbgExePath = configuration.getAttribute(IPTPLaunchConfigurationConstants.ATTR_DEBUGGER_EXECUTABLE_PATH,
-					(String) null);
-			if (dbgExePath != null) {
-				IPath path = new Path(dbgExePath);
-				attrs.add(JobAttributes.getDebuggerExecutableNameAttributeDefinition().create(path.lastSegment()));
-				attrs.add(JobAttributes.getDebuggerExecutablePathAttributeDefinition()
-						.create(path.removeLastSegments(1).toString()));
-			}
-		}
-
-		/*
-		 * PTP launched this job
-		 */
-		attrs.add(JobAttributes.getLaunchedByPTPFlagAttributeDefinition().create(Boolean.valueOf(true)));
-
-		return attrs;
-	}
-
-	/**
-	 * Get environment to append
-	 * 
-	 * @param configuration
-	 * @return
-	 * @throws CoreException
-	 */
-	private String[] getEnvironment(ILaunchConfiguration configuration) throws CoreException {
-		Map<?, ?> defaultEnv = null;
-		Map<?, ?> configEnv = configuration.getAttribute(ILaunchManager.ATTR_ENVIRONMENT_VARIABLES, defaultEnv);
-		if (configEnv == null) {
-			return null;
-		}
-
-		List<String> strings = new ArrayList<String>(configEnv.size());
-		Iterator<?> iter = configEnv.entrySet().iterator();
-		while (iter.hasNext()) {
-			Entry<?, ?> entry = (Entry<?, ?>) iter.next();
-			String key = (String) entry.getKey();
-			String value = (String) entry.getValue();
-			strings.add(key + "=" + value); //$NON-NLS-1$
-
-		}
-		return strings.toArray(new String[strings.size()]);
-	}
-
-	/**
-	 * Convert application arguments to an array of strings.
-	 * 
-	 * @param configuration
-	 *            launch configuration
-	 * @return array of strings containing the program arguments
-	 * @throws CoreException
-	 */
-	private String[] getProgramArguments(ILaunchConfiguration configuration, String attrName) throws CoreException {
-		String temp = configuration.getAttribute(attrName, (String) null);
-		if (temp != null && temp.length() > 0) {
-			ArgumentParser ap = new ArgumentParser(temp);
-			List<String> args = ap.getTokenList();
-			if (args != null) {
-				return args.toArray(new String[args.size()]);
-			}
-		}
-		return new String[0];
-	}
-
-	/**
-	 * Initialize the attribute manager. This is called each time the runtime is
-	 * started.
-	 */
-	private void initialize() {
-		attrMgr.clear();
-		attrMgr.setAttributeDefinitions(ElementAttributes.getDefaultAttributeDefinitions());
-		attrMgr.setAttributeDefinitions(ErrorAttributes.getDefaultAttributeDefinitions());
-		attrMgr.setAttributeDefinitions(FilterAttributes.getDefaultAttributeDefinitions());
-		attrMgr.setAttributeDefinitions(JobAttributes.getDefaultAttributeDefinitions());
-		attrMgr.setAttributeDefinitions(MachineAttributes.getDefaultAttributeDefinitions());
-		attrMgr.setAttributeDefinitions(MessageAttributes.getDefaultAttributeDefinitions());
-		attrMgr.setAttributeDefinitions(NodeAttributes.getDefaultAttributeDefinitions());
-		attrMgr.setAttributeDefinitions(ProcessAttributes.getDefaultAttributeDefinitions());
-		attrMgr.setAttributeDefinitions(QueueAttributes.getDefaultAttributeDefinitions());
-		attrMgr.setAttributeDefinitions(ResourceManagerAttributes.getDefaultAttributeDefinitions());
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rtsystem/SMOARuntimeSystemFactory.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rtsystem/SMOARuntimeSystemFactory.java
deleted file mode 100644
index 7f1b23d..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/rtsystem/SMOARuntimeSystemFactory.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.smoa.core.rtsystem;
-
-import org.eclipse.ptp.core.elements.IPResourceManager;
-import org.eclipse.ptp.rm.smoa.core.SMOAConfiguration;
-import org.eclipse.ptp.rmsystem.IResourceManager;
-import org.eclipse.ptp.rtsystem.IRuntimeSystem;
-import org.eclipse.ptp.rtsystem.IRuntimeSystemFactory;
-
-public class SMOARuntimeSystemFactory implements IRuntimeSystemFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.rtsystem.IRuntimeSystemFactory#create(org.eclipse.ptp
-	 * .rmsystem.IResourceManager)
-	 */
-	public IRuntimeSystem create(IResourceManager rm) {
-		SMOAConfiguration config = (SMOAConfiguration) rm.getConfiguration();
-		IPResourceManager prm = (IPResourceManager) rm.getAdapter(IPResourceManager.class);
-		return new SMOARuntimeSystem(config, prm.getID());
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/util/NotifyShell.java b/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/util/NotifyShell.java
deleted file mode 100644
index 5afc352..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.core/src/org/eclipse/ptp/rm/smoa/core/util/NotifyShell.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.core.util;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * Class implementing a dialog independent to GUI actions, and not modal one.
- * (Java's MessageBox has no ability to be non-modal)
- */
-
-public class NotifyShell {
-
-	/**
-	 * Open a non-modal hint-like dialog
-	 */
-	public static void open(final String title, final String message) {
-
-		assert (title != null || message != null);
-
-		Display.getDefault().asyncExec(new Runnable() {
-			public void run() {
-
-				final Shell s = new Shell(SWT.SHELL_TRIM | SWT.ON_TOP);
-				final GridLayout layout = new GridLayout();
-				s.setLayout(layout);
-				s.setLocation(10, 10);
-
-				// Title
-				if (title != null) {
-					final Label t = new Label(s, SWT.WRAP);
-					t.setText(title);
-					final FontData fd = t.getFont().getFontData()[0];
-					fd.setStyle(fd.getStyle() | SWT.BOLD);
-					t.setFont(new Font(t.getDisplay(), fd));
-					t.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-				}
-
-				// Message
-				if (message != null) {
-					final Label msg = new Label(s, SWT.WRAP);
-					msg.setLayoutData(new GridData(GridData.FILL_BOTH));
-					msg.setText(message);
-				}
-
-				// add button for closing
-				final Button ok = new Button(s, SWT.PUSH);
-				ok.setText("Ok"); //$NON-NLS-1$
-				ok.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-				ok.addSelectionListener(new SelectionListener() {
-
-					public void widgetDefaultSelected(SelectionEvent e) {
-					}
-
-					public void widgetSelected(SelectionEvent e) {
-						s.close();
-					}
-				});
-
-				// layout properly
-				s.pack();
-
-				// correct if too wide
-				final int newX = Math.min(s.getSize().x, s.getDisplay()
-						.getClientArea().width - 20);
-				if (newX != s.getSize().x) {
-					s.setSize(newX, s.computeSize(newX, SWT.DEFAULT).y);
-				}
-
-				// show
-				s.setVisible(true);
-			}
-		});
-	}
-
-	private NotifyShell() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/.classpath b/rms/org.eclipse.ptp.rm.smoa.ui/.classpath
deleted file mode 100644
index 79a74b2..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/.classpath
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/ptp/rm/remote/core/*"/>
-			<accessrule kind="accessible" pattern="org/eclipse/rm/remote/ui/*"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="/org.eclipse.ptp.rm.smoa.core/lib/com.smoa.comp_2.2.0.201101101421.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/.project b/rms/org.eclipse.ptp.rm.smoa.ui/.project
deleted file mode 100644
index 72100c8..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.rm.smoa.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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/META-INF/MANIFEST.MF b/rms/org.eclipse.ptp.rm.smoa.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index eff0881..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.ptp.rm.smoa.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.rm.smoa.ui.SMOAUIPlugin
-Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.ptp.services.core,
- org.eclipse.ptp.services.ui,
- org.eclipse.ptp.core,
- org.eclipse.ptp.remote.core,
- org.eclipse.ptp.remote.ui,
- org.eclipse.ptp.utils.ui,
- org.eclipse.ptp.rm.smoa.core,
- org.eclipse.ptp.ui,
- org.eclipse.ptp.launch,
- org.eclipse.ptp.rm.ui,
- org.eclipse.ptp.rm.core,
- com.smoa.comp
-Export-Package: org.eclipse.ptp.rm.smoa.ui,
- org.eclipse.ptp.rm.smoa.ui.preferences
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.core.expressions,
- org.eclipse.core.filesystem,
- org.eclipse.debug.ui,
- org.eclipse.equinox.security.storage
-Bundle-ActivationPolicy: lazy
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/NOTICE.txt b/rms/org.eclipse.ptp.rm.smoa.ui/NOTICE.txt
deleted file mode 100644
index d4e7c4b..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/NOTICE.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Apache Geronimo JAX-WS 2.1 API
-Copyright 2003-2008 The Apache Software Foundation
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/about.html b/rms/org.eclipse.ptp.rm.smoa.ui/about.html
deleted file mode 100644
index 061df82..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/about.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 5, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-<h3>Acknowledgements</h3>
-
-<p>This work is sponsored by the UCOMS project (System rozproszonego
-przetwarzania i montorowania komputerowego stosowany w odkrywaniu nowych źródeÅ‚
-energii oraz zarzÄ…dzania surowcami energetycznymi) under award number MNiSW Nr
-469/1/N - USA/2009 (z dnia 24 listopada 2009r.) in close collaboration with U.S.
-research institutions involved in the U.S. Department of Energy (DOE) funded
-grant under award number DE-FG02-04ER46136 and the Board of Regents, State of
-Louisiana, under contact no. DOE/LEQSF(2004-07).</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/build.properties b/rms/org.eclipse.ptp.rm.smoa.ui/build.properties
deleted file mode 100644
index a8d3b23..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               bin/,\
-               plugin.properties
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/plugin.properties b/rms/org.eclipse.ptp.rm.smoa.ui/plugin.properties
deleted file mode 100644
index 303bd23..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-pluginName=PTP SMOA Computing UI
-pluginProvider=Poznan Supercomputing and Networking Center
-Bundle-Vendor = Poznan Supercomputing and Networking Center
-remoteUIServices.name = SMOA Computing
-menu.label = Synchronise (SMOA PTP)
-command.name = Custom synchronisation...
-command.label = Custom synchronisation...
-command.name.0 = Copy from remote to local
-command.label.0 = Copy from remote to local
-command.name.1 = Copy from local to remote
-command.label.1 = Copy from local to remote
-page.name = SMOA Computing
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/plugin.xml b/rms/org.eclipse.ptp.rm.smoa.ui/plugin.xml
deleted file mode 100644
index 892fb28..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/plugin.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.2"?>

-<plugin>

-

-  <!-- Registering the Launch dialog -->

-  <extension

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

-  >

-    <launchConfiguration

-      class="org.eclipse.ptp.rm.smoa.ui.launch.SMOARMLaunchConfigurationFactory"

-      id="org.eclipse.ptp.smoa.ui.launchConfiguration"

-    />

-  </extension>

-

-   <extension

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

-      <configurationWizard

-            class="org.eclipse.ptp.rm.smoa.ui.wizards.SMOARMConfigurationWizardPageFactory"

-            id="org.eclipse.ptp.rm.smoa.SMOAServiceProvider">

-      </configurationWizard>

-   </extension>

-   

-  <!-- Registering SMOA services -->

-  <extension

-    point="org.eclipse.ptp.remote.ui.remoteUIServices"

-  >

-    <remoteUIServices

-      class="org.eclipse.ptp.rm.smoa.ui.rservices.SMOAUIServicesFactory"

-      id="org.eclipse.ptp.rm.smoa.core.rservices.SMOARemoteServices"

-      name="%remoteUIServices.name"

-    />

-  </extension>

-   

-  <!-- Adding a command -->

-  <extension

-    point="org.eclipse.ui.commands"

-  >

-    <command

-      defaultHandler="org.eclipse.ptp.rm.smoa.ui.actions.SMOACustomSyncAction"

-      id="org.eclipse.ptp.rm.smoa.ui.actions.SMOACustomSyncAction.id"

-      name="%command.name"

-    />

-     <command

-      defaultHandler="org.eclipse.ptp.rm.smoa.ui.actions.SMOAToLocalSyncAction"

-      id="org.eclipse.ptp.rm.smoa.ui.actions.SMOAToLocalSyncAction.id"

-      name="%command.name.0"

-    />

-     <command

-      defaultHandler="org.eclipse.ptp.rm.smoa.ui.actions.SMOAToRemoteSyncAction"

-      id="org.eclipse.ptp.rm.smoa.ui.actions.SMOAToRemoteSyncAction.id"

-      name="%command.name.1"

-    />

-  </extension>

-

-  <!-- Placing the commands in project menu -->

-  <extension

-    point="org.eclipse.ui.menus"

-  >

-    <menuContribution

-      locationURI="popup:org.eclipse.ui.navigator.ProjectExplorer#PopupMenu?after=additions"

-    >

-      <menu id="org.eclipse.ui.views.problems.groupBy.menu"

-                label="%menu.label"

-      >

-        <command

-          commandId="org.eclipse.ptp.rm.smoa.ui.actions.SMOACustomSyncAction.id"

-          label="%command.label"

-          style="push"

-        />

-        <command

-          commandId="org.eclipse.ptp.rm.smoa.ui.actions.SMOAToLocalSyncAction.id"

-          label="%command.label.0"

-          style="push"

-        />

-        <command

-          commandId="org.eclipse.ptp.rm.smoa.ui.actions.SMOAToRemoteSyncAction.id"

-          label="%command.label.1"

-          style="push"

-        />

-        <visibleWhen checkEnabled="false">

-          <with variable="selection">

-            <count value="1"/>

-            <iterate ifEmpty="false">

-              <instanceof value="org.eclipse.core.resources.IProject"/>

-            </iterate>

-          </with>

-        </visibleWhen>

-      </menu>

-    </menuContribution>

-  </extension>

- 

-  <!-- Preferences page -->

-  <extension

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

-  >

-    <page

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

-      class="org.eclipse.ptp.rm.smoa.ui.preferences.SMOAPreferencePage"

-      id="org.eclipse.ptp.smoa.ui.preferences.SMOAPreferencePage"

-      name="%page.name"

-    />

-  </extension>

- 

-</plugin>

diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/SMOAUIPlugin.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/SMOAUIPlugin.java
deleted file mode 100644
index f708849..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/SMOAUIPlugin.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui;
-
-import org.eclipse.ptp.rm.smoa.core.rmsystem.PoolingIntervalsAndStatic;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * the plug-in
- */
-public class SMOAUIPlugin extends AbstractUIPlugin {
-
-	/** plug-in ID */
-	public static final String PLUGIN_ID = "org.eclipse.ptp.rm.smoa.ui"; //$NON-NLS-1$
-
-	/** shared instance */
-	private static SMOAUIPlugin plugin;
-
-	public static final String KEY_INTERVAL_TASK = "pooling_interval_task"; //$NON-NLS-1$
-	public static final String KEY_INTERVAL_OUT = "pooling_interval_out"; //$NON-NLS-1$
-
-	/** Returns the shared instance */
-	public static SMOAUIPlugin getDefault() {
-		return plugin;
-	}
-
-	public SMOAUIPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Starts the plug-in and applies user preferences
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-
-		PoolingIntervalsAndStatic.setPoolingIntervalTask(getPreferenceStore().getInt(
-				KEY_INTERVAL_TASK));
-		PoolingIntervalsAndStatic.setPoolingIntervalOut(getPreferenceStore().getInt(
-				KEY_INTERVAL_OUT));
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/Messages.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/Messages.java
deleted file mode 100644
index 204472b..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/Messages.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.actions;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.smoa.ui.actions.messages"; //$NON-NLS-1$
-	public static String SelectConnetionAndDestDir_Browse;
-	public static String SelectConnetionAndDestDir_Cancel;
-	public static String SelectConnetionAndDestDir_CreateIfNotExists;
-	public static String SelectConnetionAndDestDir_DefaultRules;
-	public static String SelectConnetionAndDestDir_DefaultWindowTitle;
-	public static String SelectConnetionAndDestDir_DirBrowserTitle;
-	public static String SelectConnetionAndDestDir_ErrorByFetchInfoTitle;
-	public static String SelectConnetionAndDestDir_ErrorNoActiveConnection;
-	public static String SelectConnetionAndDestDir_ErrorNoActiveConnectionTitle;
-	public static String SelectConnetionAndDestDir_ExcludeRules;
-	public static String SelectConnetionAndDestDir_Ok;
-	public static String SelectConnetionAndDestDir_RemoteRootPath;
-	public static String SelectConnetionAndDestDir_ResourceManager;
-	public static String SMOACustomSyncAction_CurrentFile;
-	public static String SMOACustomSyncAction_ErrorAccessingRemoteFS;
-	public static String SMOACustomSyncAction_ErrorDialogTitle;
-	public static String SMOACustomSyncAction_ErrorOverwritePolicyTitle;
-	public static String SMOACustomSyncAction_ExceptionByReadingSettings;
-	public static String SMOACustomSyncAction_ExceptionBySynchro;
-	public static String SMOACustomSyncAction_ExceptionByWritingSettings;
-	public static String SMOACustomSyncAction_FileOverwritePolicy;
-	public static String SMOACustomSyncAction_FilesCopied;
-	public static String SMOACustomSyncAction_FilesTotal;
-	public static String SMOACustomSyncAction_FromLocal;
-	public static String SMOACustomSyncAction_FromRemote;
-	public static String SMOACustomSyncAction_IncorretOverwritePolicy;
-	public static String SMOACustomSyncAction_Local;
-	public static String SMOACustomSyncAction_PleaswWait;
-	public static String SMOACustomSyncAction_ProgressWindowTitle;
-	public static String SMOACustomSyncAction_RegeneratingTree;
-	public static String SMOACustomSyncAction_RegeneratingTree_FoundFiles;
-	public static String SMOACustomSyncAction_Remote;
-	public static String SMOACustomSyncAction_WindowTitle;
-	public static String SMOAToLocalSyncAction_WindowTitle;
-	public static String SMOAToRemoteSyncAction_WindowTitle;
-	public static String SMOASyncAction_ExceptionBySynchro;
-	public static String SMOASyncAction_ErrorByRsync_desc;
-	public static String SMOASyncAction_ErrorByRsync_title;
-	public static String SMOASyncAction_RsyncInProgress;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOACustomSyncAction.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOACustomSyncAction.java
deleted file mode 100644
index dd60611..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOACustomSyncAction.java
+++ /dev/null
@@ -1,658 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.actions;
-
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Vector;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileInfo;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOAFileStore;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOARemoteServices;
-import org.eclipse.ptp.rm.smoa.core.util.NotifyShell;
-import org.eclipse.ptp.rm.smoa.ui.SMOAUIPlugin;
-import org.eclipse.ptp.ui.PTPUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-public class SMOACustomSyncAction extends AbstractHandler {
-
-	private class FileFormatException extends IOException {
-		private static final long serialVersionUID = -1360379446136195743L;
-
-		public FileFormatException(String s) {
-			super(s);
-		}
-	}
-
-	/** Policy if and when the files should be overwritten */
-	enum OverwritePolicy {
-		Always, IfNewer, Never
-	}
-
-	private static final QualifiedName SMOA_SYNC_OVERWRITE = new QualifiedName(
-			SMOAUIPlugin.PLUGIN_ID, "smoa.sync.rm.files.overwrite"); //$NON-NLS-1$
-
-	private static final String SMOA_SYNC_FILELIST_NAME = ".smoa_sync_file_list"; //$NON-NLS-1$
-
-	SMOARemoteServices rservices = (SMOARemoteServices) PTPRemoteCorePlugin
-			.getDefault().getRemoteServices("org.eclipse.ptp.remote.SMOARemoteServices"); //$NON-NLS-1$
-	// GUI components
-	private Tree remoteTree;
-	private Tree localTree;
-
-	private Combo policy;
-	// Data
-	/** Remote file store (rendered in remoteTree) */
-	private IFileStore sfs;
-	/** Local file store (rendered in localTree) */
-	private IFileStore lfs;
-
-	private OverwritePolicy overwrite;
-
-	private IProject project;
-
-	int counter;
-
-	private TreeItem addToTree(Tree toRegenerate, TreeItem treeItem,
-			IFileStore newStore) {
-		TreeItem parent = null;
-		if (treeItem.getParentItem() != null) {
-			parent = addToTree(toRegenerate, treeItem.getParentItem(), null);
-		}
-
-		TreeItem newItem;
-		if (parent == null) {
-			newItem = findChild(toRegenerate, treeItem.getText());
-			if (newItem == null) {
-				newItem = new TreeItem(toRegenerate, SWT.NONE);
-				newItem.setText(treeItem.getText());
-			}
-		} else {
-			newItem = findChild(parent, treeItem.getText());
-			if (newItem == null) {
-				newItem = new TreeItem(parent, SWT.NONE);
-				newItem.setText(treeItem.getText());
-			}
-		}
-
-		if (newStore != null) {
-			newItem.setData(newStore);
-		}
-
-		return newItem;
-	}
-
-	/**
-	 * Copies a single tree item to store, and updates toRegenerate tree
-	 */
-	private void copyTreeItem(TreeItem treeItem, IFileStore store,
-			Tree toRegenerate) throws CoreException {
-		final IFileStore newStore = store
-				.getFileStore(new Path(getRelPath(treeItem)));
-		final IFileInfo info = ((IFileStore) treeItem.getData()).fetchInfo();
-		if (info.isDirectory()) {
-			newStore.mkdir(0, null);
-			newStore.putInfo(info, 0, null);
-		} else {
-			switch (overwrite) {
-			case Always:
-				break;
-			case Never:
-				if (newStore.fetchInfo().exists()) {
-					return;
-				}
-				break;
-			case IfNewer:
-				final IFileInfo newInfo = newStore.fetchInfo();
-				if (newInfo.exists()
-						&& newInfo.getLastModified() > info.getLastModified()) {
-					return;
-				}
-				break;
-			default:
-				throw new CoreException(new Status(IStatus.ERROR,
-						PTPUIPlugin.PLUGIN_ID, Messages.SMOACustomSyncAction_IncorretOverwritePolicy));
-			}
-			((IFileStore) treeItem.getData()).copy(newStore, EFS.OVERWRITE,
-					null);
-		}
-
-		addToTree(toRegenerate, treeItem, newStore);
-	}
-
-	@Override
-	public void dispose() {
-		// saveTrees(project);
-		super.dispose();
-	}
-
-	/**
-	 * Called when user triggers this action from a menu (Described in
-	 * plugin.properties)
-	 */
-	public Object execute(ExecutionEvent execEvent) throws ExecutionException {
-		try {
-
-			project = SelectConnetionAndDestDir.getSelectedProject(execEvent);
-
-			final SelectConnetionAndDestDir dialog = new SelectConnetionAndDestDir(
-					project);
-
-			if (!dialog.open()) {
-				return null;
-			}
-
-			sfs = dialog.getRemoteFileStore();
-			if (sfs == null) {
-				throw new ExecutionException(Messages.SMOACustomSyncAction_ErrorAccessingRemoteFS);
-			}
-
-			final Shell topShell = Display.getCurrent().getActiveShell();
-			final Shell shell = new Shell(topShell, new Shell().getStyle()
-					| SWT.APPLICATION_MODAL);
-			shell.setText(Messages.SMOACustomSyncAction_WindowTitle);
-			final GridLayout gridLayout = new GridLayout(2, true);
-			shell.setLayout(gridLayout);
-
-			new Label(shell, SWT.NONE).setText(Messages.SMOACustomSyncAction_Local);
-			new Label(shell, SWT.NONE).setText(Messages.SMOACustomSyncAction_Remote);
-
-			localTree = new Tree(shell, SWT.CHECK | SWT.VIRTUAL | SWT.MULTI);
-			localTree.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			final Listener treeListener = new Listener() {
-				public void handleEvent(Event event) {
-					assert event.item instanceof TreeItem;
-					final TreeItem me = (TreeItem) event.item;
-					if (me.getChecked()) {
-
-						TreeItem parentItem = me.getParentItem();
-						while (parentItem != null) {
-							parentItem.setChecked(true);
-							parentItem = parentItem.getParentItem();
-						}
-						for (final TreeItem item : me.getItems()) {
-							item.setChecked(true);
-							final Event e = new Event();
-							e.item = item;
-							this.handleEvent(e);
-						}
-					} else {
-						for (final TreeItem item : me.getItems()) {
-							item.setChecked(false);
-							final Event e = new Event();
-							e.item = item;
-							this.handleEvent(e);
-						}
-					}
-				}
-			};
-
-			remoteTree = new Tree(shell, SWT.CHECK | SWT.VIRTUAL | SWT.MULTI);
-			remoteTree.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			final Button copyLocalToRemote = new Button(shell, SWT.PUSH
-					| SWT.BORDER);
-			copyLocalToRemote.setLayoutData(new GridData(
-					GridData.HORIZONTAL_ALIGN_END));
-			copyLocalToRemote.setText(Messages.SMOACustomSyncAction_FromLocal);
-
-			copyLocalToRemote.addSelectionListener(new SelectionListener() {
-
-				public void widgetDefaultSelected(SelectionEvent arg0) {
-				}
-
-				public void widgetSelected(SelectionEvent arg0) {
-					toRemote();
-					// saveTrees(project);
-				}
-			});
-
-			final Button copyRemoteToLoacal = new Button(shell, SWT.PUSH
-					| SWT.BORDER);
-			copyRemoteToLoacal.setLayoutData(new GridData(
-					GridData.HORIZONTAL_ALIGN_BEGINNING));
-			copyRemoteToLoacal.setText(Messages.SMOACustomSyncAction_FromRemote);
-
-			copyRemoteToLoacal.addSelectionListener(new SelectionListener() {
-
-				public void widgetDefaultSelected(SelectionEvent arg0) {
-				}
-
-				public void widgetSelected(SelectionEvent arg0) {
-					fromRemote();
-					// saveTrees(project);
-				}
-			});
-
-			final Composite options = new Composite(shell, SWT.NONE);
-			GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-			gridData.horizontalSpan = 2;
-			options.setLayoutData(gridData);
-			options.setLayout(new GridLayout(2, false));
-			new Label(options, SWT.NONE).setText(Messages.SMOACustomSyncAction_FileOverwritePolicy);
-
-			policy = new Combo(options, SWT.BORDER | SWT.READ_ONLY);
-			for (final OverwritePolicy p : OverwritePolicy.values()) {
-				policy.add(p.name());
-			}
-
-			final String policyVal = project
-					.getPersistentProperty(SMOA_SYNC_OVERWRITE);
-			if (policyVal != null) {
-				policy.select(policy.indexOf(policyVal));
-			} else {
-				policy.select(policy.indexOf(OverwritePolicy.Always.name()));
-			}
-
-			assert OverwritePolicy.valueOf(policy.getText()) != null;
-			overwrite = OverwritePolicy.valueOf(policy.getText());
-
-			policy.addSelectionListener(new SelectionListener() {
-				public void widgetDefaultSelected(SelectionEvent arg0) {
-				}
-
-				public void widgetSelected(SelectionEvent arg0) {
-					try {
-						assert OverwritePolicy.valueOf(policy.getText()) != null;
-						overwrite = OverwritePolicy.valueOf(policy.getText());
-						project.setPersistentProperty(SMOA_SYNC_OVERWRITE,
-								policy.getText());
-					} catch (final CoreException e) {
-						final MessageBox mb = new MessageBox(localTree.getShell(),
-								SWT.ICON_ERROR | SWT.OK);
-						mb.setText(Messages.SMOACustomSyncAction_ErrorOverwritePolicyTitle);
-						mb.setMessage(e.getLocalizedMessage());
-						mb.open();
-					}
-				}
-			});
-
-			final Shell progress = new Shell(topShell);
-			final GridLayout layout = new GridLayout();
-			progress.setLayout(layout);
-			final Label msg = new Label(progress, SWT.NONE);
-			msg.setText(Messages.SMOACustomSyncAction_PleaswWait);
-			gridData = new GridData(GridData.FILL_BOTH);
-			gridData.minimumWidth = 300;
-			msg.setLayoutData(gridData);
-			progress.pack();
-			progress.open();
-
-			lfs = rootFromProject(localTree, project, msg);
-			rootFromFileStore(remoteTree, sfs, msg);
-
-			if (!progress.isDisposed()) {
-				progress.close();
-			}
-
-			restoreTrees(project);
-
-			localTree.addListener(SWT.Selection, treeListener);
-			remoteTree.addListener(SWT.Selection, treeListener);
-
-			shell.open();
-
-			shell.addListener(SWT.Close, new Listener() {
-				public void handleEvent(Event event) {
-					saveTrees(project);
-				}
-			});
-
-			return null;
-		} catch (final CoreException e) {
-			NotifyShell.open(Messages.SMOACustomSyncAction_ExceptionBySynchro, e.getLocalizedMessage());
-			throw new ExecutionException(e.getLocalizedMessage(), e);
-		}
-	}
-
-	private TreeItem findChild(Tree parent, String text) {
-		for (final TreeItem it : parent.getItems()) {
-			if (it.getText().equals(text)) {
-				return it;
-			}
-		}
-		return null;
-	}
-
-	private TreeItem findChild(TreeItem parent, String text) {
-		for (final TreeItem it : parent.getItems()) {
-			if (it.getText().equals(text)) {
-				return it;
-			}
-		}
-		return null;
-	}
-
-	/** Calls synchronise in local ← remote direction */
-	protected void fromRemote() {
-		synchronise(getCheckedItems(remoteTree), lfs, localTree);
-	}
-
-	/**
-	 * Returns array with relative paths to the checked items
-	 */
-	private TreeItem[] getCheckedItems(Tree tree) {
-		final Vector<TreeItem> v = new Vector<TreeItem>();
-		for (final TreeItem it : tree.getItems()) {
-			v.addAll(getCheckedItems(it));
-		}
-		return v.toArray(new TreeItem[v.size()]);
-	}
-
-	/**
-	 * Returns all checked items under this item
-	 */
-	private Vector<TreeItem> getCheckedItems(TreeItem treeItem) {
-		final Vector<TreeItem> v = new Vector<TreeItem>();
-		for (final TreeItem it : treeItem.getItems()) {
-			if (it.getChecked()) {
-				v.add(it);
-			}
-			v.addAll(getCheckedItems(it));
-		}
-		return v;
-	}
-
-	/** Recursively builds up relative path representing the tree item */
-	String getRelPath(TreeItem item) {
-		if (item.getParentItem() != null) {
-			return getRelPath(item.getParentItem()) + "/" + item.getText(); //$NON-NLS-1$
-		}
-		return "."; //$NON-NLS-1$
-	}
-
-	/**
-	 * Recursively and eagerly fills the tree with store and it's children
-	 */
-	private void populate(TreeItem tree, IFileStore store, Label msg)
-			throws CoreException {
-		counter++;
-		final TreeItem treeItem = new TreeItem(tree, SWT.NONE);
-		treeItem.setText(store.getName());
-		treeItem.setData(store);
-
-		if (msg != null && !msg.isDisposed()) {
-			msg.setText(Messages.SMOACustomSyncAction_RegeneratingTree_FoundFiles + counter);
-			msg.redraw();
-			msg.getShell().redraw();
-			msg.getDisplay().update();
-		}
-
-		if (store instanceof SMOAFileStore || store.fetchInfo().isDirectory()) {
-			for (final IFileStore fs : store.childStores(0, null)) {
-				populate(treeItem, fs, msg);
-			}
-		}
-	}
-
-	/**
-	 * Reads the state of trees from project and applies to the trees
-	 */
-	private void restoreTrees(IProject project) {
-		try {
-			final BufferedReader in = new BufferedReader(new FileReader(project
-					.getLocation().toString() + "/" + SMOA_SYNC_FILELIST_NAME)); //$NON-NLS-1$
-
-			if (!"[Local]".equals(in.readLine())) { //$NON-NLS-1$
-				throw new FileFormatException(
-						"First line does not contain " + "[Local]"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			int c;
-			while ((c = in.read()) == '\t') {
-				final String line = in.readLine();
-				if (line == null) {
-					return;
-				}
-				selectFromPath(localTree, line);
-			}
-
-			if (c == -1) {
-				return;
-			}
-
-			if (c != '[') {
-				throw new FileFormatException("Illegal line start (" + c + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-
-			final String rem = in.readLine();
-			if (!"Remote]".equals(rem)) { //$NON-NLS-1$
-				throw new FileFormatException("Invalid line [" + rem); //$NON-NLS-1$
-			}
-
-			while ((c = in.read()) == '\t') {
-				final String line = in.readLine();
-				if (line == null) {
-					return;
-				}
-				selectFromPath(remoteTree, line);
-			}
-
-			if (c == -1) {
-				return;
-			}
-
-			throw new FileFormatException("Illegal line start (" + c + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		} catch (final FileNotFoundException e) {
-			// first run
-		} catch (final IOException e) {
-			final MessageBox mb = new MessageBox(localTree.getShell(), SWT.ICON_ERROR
-					| SWT.OK);
-			mb.setText(Messages.SMOACustomSyncAction_ExceptionByReadingSettings);
-			mb.setMessage(e.getLocalizedMessage());
-			mb.open();
-		}
-	}
-
-	/**
-	 * Starts filling the tree basing on the given store. Updates the message
-	 * label with progress.
-	 */
-	private void rootFromFileStore(Tree tree, IFileStore store, Label msg)
-			throws CoreException {
-
-		counter = 0;
-		final TreeItem treeItem = new TreeItem(tree, SWT.NONE);
-		treeItem.setText(store.getName());
-		treeItem.setData(store);
-		for (final IFileStore fs : store.childStores(0, null)) {
-			populate(treeItem, fs, msg);
-		}
-
-	}
-
-	/**
-	 * Starts filling the tree basing on the project location. Updates the
-	 * message label with progress.
-	 */
-	private IFileStore rootFromProject(Tree tree, IProject project, Label msg)
-			throws CoreException {
-		final IFileStore store = EFS.getLocalFileSystem().getStore(
-				project.getLocation());
-
-		rootFromFileStore(tree, store, msg);
-		return store;
-	}
-
-	/**
-	 * Records the state of trees in Project
-	 */
-	protected void saveTrees(IProject project) {
-
-		try {
-			final DataOutputStream out = new DataOutputStream(new FileOutputStream(
-					project.getLocation().toString() + "/" //$NON-NLS-1$
-							+ SMOA_SYNC_FILELIST_NAME));
-
-			out.writeBytes("[Local]\n"); //$NON-NLS-1$
-
-			for (final TreeItem item : getCheckedItems(localTree)) {
-				out.write('\t');
-				out.writeBytes(getRelPath(item));
-				out.write('\n');
-			}
-
-			out.writeBytes("[Remote]\n"); //$NON-NLS-1$
-			for (final TreeItem item : getCheckedItems(remoteTree)) {
-				out.write('\t');
-				out.writeBytes(getRelPath(item));
-				out.write('\n');
-			}
-
-		} catch (final IOException e) {
-			final MessageBox mb = new MessageBox(localTree.getShell(), SWT.ICON_ERROR
-					| SWT.OK);
-			mb.setText(Messages.SMOACustomSyncAction_ExceptionByWritingSettings);
-			mb.setMessage(e.getLocalizedMessage());
-			mb.open();
-		}
-	}
-
-	/**
-	 * Looks for a TreeItem corresponding to given path in given tree and
-	 * selects it.
-	 */
-	private void selectFromPath(Tree tree, String file) {
-		TreeItem root = tree.getItems()[0];
-		TreeItem next = root;
-		root.setChecked(true);
-		final String[] path = new Path(file).segments();
-		for (int i = 0; i < path.length; ++i) {
-			for (final TreeItem item : root.getItems()) {
-				if (item.getText().equals(path[i])) {
-					next = item;
-				}
-			}
-			if (next == root) {
-				return;
-			}
-			root = next;
-		}
-		next.setChecked(true);
-	}
-
-	/**
-	 * Copies files (given as array of {@link TreeItem}s) to another tree, given
-	 * as the tree and it's starting store
-	 * 
-	 * @param items
-	 *            - what to copy
-	 * @param store
-	 *            - where to copy
-	 * @param toRegenerate
-	 *            - which tree to update
-	 */
-	protected void synchronise(TreeItem[] items, IFileStore store,
-			Tree toRegenerate) {
-
-		final Shell topShell = Display.getCurrent().getActiveShell();
-		final Shell shell = new Shell(topShell, new Shell().getStyle()
-				| SWT.APPLICATION_MODAL);
-		shell.setText(Messages.SMOACustomSyncAction_ProgressWindowTitle);
-
-		shell.setLayout(new GridLayout(2, false));
-
-		new Label(shell, SWT.NONE).setText(Messages.SMOACustomSyncAction_FilesTotal);
-		new Label(shell, SWT.NONE).setText(Integer.toString(items.length));
-		new Label(shell, SWT.NONE).setText(Messages.SMOACustomSyncAction_FilesCopied);
-		final Label done = new Label(shell, SWT.NONE);
-		done.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		new Label(shell, SWT.NONE).setText(Messages.SMOACustomSyncAction_CurrentFile);
-		final Label current = new Label(shell, SWT.NONE);
-		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.minimumWidth = 500;
-		current.setLayoutData(gd);
-
-		int doneVal = -1;
-
-		shell.pack(true);
-		shell.open();
-
-		try {
-			for (final TreeItem treeItem : items) {
-				if (!shell.isDisposed()) {
-					done.setText(Integer.toString(++doneVal));
-					current.setText(getRelPath(treeItem));
-
-					shell.pack(true);
-					done.redraw();
-					current.redraw();
-					shell.redraw();
-					shell.getDisplay().update();
-				}
-				copyTreeItem(treeItem, store, toRegenerate);
-			}
-
-			if (!shell.isDisposed()) {
-				done.setText(Integer.toString(++doneVal));
-				current.setText(Messages.SMOACustomSyncAction_RegeneratingTree);
-
-				shell.pack(true);
-				done.redraw();
-				current.redraw();
-				shell.redraw();
-				shell.getDisplay().update();
-			}
-
-		} catch (final CoreException e) {
-			final MessageBox mb = new MessageBox(Display.getCurrent()
-					.getActiveShell(), SWT.ICON_ERROR | SWT.OK);
-			mb.setText(Messages.SMOACustomSyncAction_ErrorDialogTitle);
-			mb.setMessage(e.getMessage());
-			mb.open();
-		}
-
-		if (!shell.isDisposed()) {
-			shell.close();
-		}
-
-	}
-
-	/** Calls synchronise in local → remote direction */
-	protected void toRemote() {
-		synchronise(getCheckedItems(localTree), sfs, remoteTree);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOAToLocalSyncAction.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOAToLocalSyncAction.java
deleted file mode 100644
index 26bc7d3..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOAToLocalSyncAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.actions;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.rm.smoa.core.util.NotifyShell;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.ProgressBar;
-import org.eclipse.swt.widgets.Shell;
-
-import com.smoa.comp.sdk.SMOARsync;
-import com.smoa.comp.sdk.jsdl.JSDL;
-
-/**
- * Action for synchronizing files with rsync mechanism
- */
-public class SMOAToLocalSyncAction extends AbstractHandler {
-
-	public Object execute(ExecutionEvent execEvent) throws ExecutionException {
-		try {
-			final IProject project = SelectConnetionAndDestDir
-					.getSelectedProject(execEvent);
-			final SelectConnetionAndDestDir dialog = new SelectConnetionAndDestDir(
-					project);
-			dialog.setWindowTitle(Messages.SMOAToLocalSyncAction_WindowTitle);
-			dialog.setShowRules(true);
-			dialog.open();
-
-			if (!dialog.hasSucceeded()) {
-				return null;
-			}
-
-			final SMOARsync rsync = dialog.getConnection().getRsync();
-
-			final JSDL jsdl = new JSDL("rsync from " + dialog.getRemoteDir()); //$NON-NLS-1$
-			jsdl.setWorkingDirectory(dialog.getRemoteDir());
-
-			final Shell shell = new Shell(Display.getCurrent().getActiveShell());
-			shell.setLayout(new GridLayout(1, false));
-			shell.setText(Messages.SMOASyncAction_RsyncInProgress);
-			final ProgressBar progress = new ProgressBar(shell, SWT.INDETERMINATE
-					| SWT.SMOOTH | SWT.BORDER);
-			final GridData data = new GridData(GridData.FILL_BOTH);
-			data.minimumWidth = 200;
-			progress.setLayoutData(data);
-
-			shell.pack();
-
-			shell.open();
-
-			new Thread() {
-				@Override
-				public void run() {
-					try {
-						final String localDir = project.getLocation().toString();
-
-						rsync.remoteToLocal(jsdl, localDir, dialog.getRules());
-						Display.getDefault().asyncExec(new Runnable() {
-							public void run() {
-								if (!shell.isDisposed()) {
-									shell.close();
-								}
-							}
-						});
-					} catch (final Exception e) {
-						Display.getDefault().asyncExec(new Runnable() {
-							public void run() {
-								if (!shell.isDisposed()) {
-									shell.close();
-								}
-								e.printStackTrace();
-								final Shell s = Display.getDefault().getActiveShell();
-								final MessageBox mb = new MessageBox(s != null ? s
-										: new Shell(), SWT.APPLICATION_MODAL
-										| SWT.ICON_ERROR | SWT.OK);
-								mb.setText(Messages.SMOASyncAction_ErrorByRsync_title);
-								mb.setMessage(Messages.SMOASyncAction_ErrorByRsync_desc
-										+ e.getClass().getName()
-										+ (e.getLocalizedMessage() == null ? "" //$NON-NLS-1$
-												: ("\n" + e //$NON-NLS-1$
-														.getLocalizedMessage())));
-								mb.open();
-							}
-						});
-					}
-				}
-			}.start();
-
-			return null;
-		} catch (final CoreException e) {
-			NotifyShell.open(Messages.SMOASyncAction_ExceptionBySynchro, e.getLocalizedMessage());
-			throw new ExecutionException(e.getLocalizedMessage(), e);
-		}
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOAToRemoteSyncAction.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOAToRemoteSyncAction.java
deleted file mode 100644
index e4a7551..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SMOAToRemoteSyncAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.actions;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ptp.rm.smoa.core.util.NotifyShell;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.ProgressBar;
-import org.eclipse.swt.widgets.Shell;
-
-import com.smoa.comp.sdk.SMOARsync;
-import com.smoa.comp.sdk.jsdl.JSDL;
-
-/**
- * Action for synchronizing files with rsync mechanism
- */
-public class SMOAToRemoteSyncAction extends AbstractHandler {
-
-	public Object execute(ExecutionEvent execEvent) throws ExecutionException {
-		try {
-			final IProject project = SelectConnetionAndDestDir
-					.getSelectedProject(execEvent);
-			final SelectConnetionAndDestDir dialog = new SelectConnetionAndDestDir(
-					project);
-			dialog.setWindowTitle(Messages.SMOAToRemoteSyncAction_WindowTitle);
-			dialog.setShowRules(true);
-			dialog.open();
-
-			if (!dialog.hasSucceeded()) {
-				return null;
-			}
-
-			final SMOARsync rsync = dialog.getConnection().getRsync();
-
-			final JSDL jsdl = new JSDL("rsync to " + dialog.getRemoteDir()); //$NON-NLS-1$
-			jsdl.setWorkingDirectory(dialog.getRemoteDir());
-
-			final Shell shell = new Shell(Display.getCurrent().getActiveShell());
-			shell.setLayout(new GridLayout(1, false));
-			shell.setText(Messages.SMOASyncAction_RsyncInProgress);
-			final ProgressBar progress = new ProgressBar(shell, SWT.INDETERMINATE
-					| SWT.SMOOTH | SWT.BORDER);
-			final GridData data = new GridData(GridData.FILL_BOTH);
-			data.minimumWidth = 200;
-			progress.setLayoutData(data);
-
-			shell.pack();
-
-			shell.open();
-
-			new Thread() {
-				@Override
-				public void run() {
-					try {
-						final String localDir = project.getLocation().toString();
-						rsync.localToRemote(jsdl, localDir, dialog.getRules());
-						Display.getDefault().asyncExec(new Runnable() {
-							public void run() {
-								if (!shell.isDisposed()) {
-									shell.close();
-								}
-							}
-						});
-					} catch (final Exception e) {
-						Display.getDefault().asyncExec(new Runnable() {
-							public void run() {
-								if (!shell.isDisposed()) {
-									shell.close();
-								}
-								e.printStackTrace();
-								final Shell s = Display.getDefault().getActiveShell();
-								final MessageBox mb = new MessageBox(s != null ? s
-										: new Shell(), SWT.APPLICATION_MODAL
-										| SWT.ICON_ERROR | SWT.OK);
-								mb.setText(Messages.SMOASyncAction_ErrorByRsync_title);
-								mb.setMessage(Messages.SMOASyncAction_ErrorByRsync_desc
-										+ e.getClass().getName()
-										+ (e.getLocalizedMessage() == null ? "" //$NON-NLS-1$
-												: ("\n" + e //$NON-NLS-1$
-														.getLocalizedMessage())));
-								mb.open();
-							}
-						});
-					}
-				}
-			}.start();
-
-			return null;
-		} catch (final CoreException e) {
-			NotifyShell.open(Messages.SMOASyncAction_ExceptionBySynchro, e.getLocalizedMessage());
-			throw new ExecutionException(e.getLocalizedMessage(), e);
-		}
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SelectConnetionAndDestDir.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SelectConnetionAndDestDir.java
deleted file mode 100644
index 023ce05..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/SelectConnetionAndDestDir.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.actions;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.expressions.EvaluationContext;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.ptp.remote.core.IRemoteFileManager;
-import org.eclipse.ptp.remote.core.PTPRemoteCorePlugin;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOAConnection;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOARemoteServices;
-import org.eclipse.ptp.rm.smoa.ui.SMOAUIPlugin;
-import org.eclipse.ptp.rm.smoa.ui.rservices.SMOAUIFileManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.TextStyle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * Provides dialog for selecting the connection and remote directory.
- * 
- * Has also option to display rules for {@link SMOAToLocalSyncAction} and
- * {@link SMOAToRemoteSyncAction} classes.
- */
-/* package access */class SelectConnetionAndDestDir {
-
-	// Locations in {@link IProject}'s store for keeping settings of this dialog
-	private static final QualifiedName SMOA_SYNC_PATH = new QualifiedName(
-			SMOAUIPlugin.PLUGIN_ID, "smoa.sync.rm.path"); //$NON-NLS-1$
-	private static final QualifiedName SMOA_SYNC_RM = new QualifiedName(
-			SMOAUIPlugin.PLUGIN_ID, "smoa.sync.rm.name"); //$NON-NLS-1$
-	private static final QualifiedName SMOA_SYNC_CREATE = new QualifiedName(
-			SMOAUIPlugin.PLUGIN_ID, "smoa.sync.rm.create"); //$NON-NLS-1$
-	private static final QualifiedName SMOA_SYNC_RULES = new QualifiedName(
-			SMOAUIPlugin.PLUGIN_ID, "smoa.sync.rsync.rules"); //$NON-NLS-1$
-
-	/**
-	 * Set of default ignore rules, loaded when the project has none in it's
-	 * settings
-	 */
-	private static final String DEFAULT_RULES = Messages.SelectConnetionAndDestDir_DefaultRules;
-
-	/** Tries to retrieve the IProject from event */
-	static public IProject getSelectedProject(ExecutionEvent execEvent)
-			throws ExecutionException {
-		Object object = execEvent.getApplicationContext();
-		if (!(object instanceof EvaluationContext)) {
-			throw new ExecutionException("EvaluationContext"); //$NON-NLS-1$
-		}
-		final EvaluationContext context = (EvaluationContext) execEvent
-				.getApplicationContext();
-
-		object = context.getDefaultVariable();
-
-		if (!(object instanceof List)) {
-			throw new ExecutionException("List"); //$NON-NLS-1$
-		}
-		@SuppressWarnings("unchecked")
-		final List<Object> list = (List<Object>) object;
-
-		object = list.get(0);
-		if (!(object instanceof IProject)) {
-			throw new ExecutionException("IProject"); //$NON-NLS-1$
-		}
-
-		final IProject project = (IProject) object;
-		return project;
-	}
-
-	private final IProject project;
-
-	private final SMOARemoteServices rservices = (SMOARemoteServices) PTPRemoteCorePlugin
-			.getDefault().getRemoteServices("org.eclipse.ptp.remote.SMOARemoteServices"); //$NON-NLS-1$
-	private String remoteDir = null;
-	private SMOAConnection connection = null;
-
-	private boolean mkdirIfNotExists = false;
-	private boolean showRules = false;
-
-	private String rules = null;
-	private boolean succeeded = false;
-
-	private String windowTitle;
-
-	public SelectConnetionAndDestDir(final IProject project) {
-		this.project = project;
-	}
-
-	public SMOAConnection getConnection() {
-		return connection;
-	}
-
-	/** Returns directory selected by user for remote synchronization */
-	public String getRemoteDir() {
-		return remoteDir;
-	}
-
-	/** Gets remote file store */
-	public IFileStore getRemoteFileStore() throws CoreException {
-		if (!succeeded) {
-			return null;
-		}
-
-		final IRemoteFileManager fileManager = rservices.getFileManager(connection);
-		final IFileStore resource = fileManager.getResource(remoteDir);
-
-		if (mkdirIfNotExists) {
-			resource.mkdir(0, null);
-		}
-
-		return resource;
-	}
-
-	/** Returns interpreted ignore rules */
-	public List<Pattern> getRules() {
-		if (rules == null) {
-			return null;
-		}
-
-		final Vector<Pattern> v = new Vector<Pattern>();
-
-		for (final String rule : rules.split("\n")) { //$NON-NLS-1$
-			if (!rule.isEmpty()) {
-				v.add(Pattern.compile(rule));
-			}
-		}
-
-		return v;
-	}
-
-	/** Returns if the user triggered 'Ok' on the dialog */
-	public boolean hasSucceeded() {
-		return succeeded;
-	}
-
-	public boolean isMkdirIfNotExists() {
-		return mkdirIfNotExists;
-	}
-
-	public boolean isShowRules() {
-		return showRules;
-	}
-
-	/**
-	 * Opens the dialog and waits till completion
-	 * 
-	 * If user selected and accepted the dialog, returns true. False otherwise.
-	 */
-	@SuppressWarnings({ "unused", "null" })
-	public boolean open() throws CoreException {
-		final Shell topShell = Display.getCurrent().getActiveShell();
-
-		final Map<String, SMOAConnection> connections = rservices
-				.getConnectionManager().getOpenConnections();
-
-		// re-labelling connections
-		final Set<SMOAConnection> temp = new HashSet<SMOAConnection>(
-				connections.values());
-		connections.clear();
-		for (final SMOAConnection c : temp) {
-			connections.put(c.getRMName(), c);
-		}
-
-		if (connections.isEmpty()) {
-			final MessageBox mb = new MessageBox(topShell, SWT.ICON_INFORMATION
-					| SWT.OK);
-			mb.setText(Messages.SelectConnetionAndDestDir_ErrorNoActiveConnectionTitle);
-			mb.setMessage(Messages.SelectConnetionAndDestDir_ErrorNoActiveConnection);
-			mb.open();
-			return false;
-		}
-
-		final Shell shell = new Shell(topShell, new Shell().getStyle()
-				| SWT.APPLICATION_MODAL);
-		shell.setLayout(new GridLayout(3, false));
-
-		shell.setText(windowTitle != null ? windowTitle
-				: Messages.SelectConnetionAndDestDir_DefaultWindowTitle);
-
-		new Label(shell, SWT.NONE).setText(Messages.SelectConnetionAndDestDir_ResourceManager);
-
-		final Combo combo = new Combo(shell, SWT.READ_ONLY);
-		final GridData gridData1 = new GridData(GridData.FILL_HORIZONTAL);
-		combo.setLayoutData(gridData1);
-		gridData1.horizontalSpan = 2;
-
-		for (final String conn : connections.keySet()) {
-			combo.add(conn);
-		}
-
-		new Label(shell, SWT.NONE)
-				.setText(Messages.SelectConnetionAndDestDir_RemoteRootPath);
-
-		final Text remoteRootPath = new Text(shell, SWT.SINGLE | SWT.BORDER);
-		remoteRootPath.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		final Button browse = new Button(shell, SWT.PUSH | SWT.BORDER);
-		browse.setText(Messages.SelectConnetionAndDestDir_Browse);
-
-		new Label(shell, SWT.NONE);
-
-		final Button cbCreateDir = new Button(shell, SWT.CHECK | SWT.BORDER);
-		cbCreateDir.setText(Messages.SelectConnetionAndDestDir_CreateIfNotExists);
-		cbCreateDir.setSelection(true);
-
-		new Label(shell, SWT.NONE);
-
-		final StyledText rules;
-
-		final boolean showRulesLocal = showRules;
-		if (showRulesLocal) {
-			final Composite rulesComp = new Composite(shell, SWT.NONE);
-			final GridData gridData2 = new GridData(GridData.FILL_HORIZONTAL);
-			rulesComp.setLayoutData(gridData2);
-			gridData2.horizontalSpan = 3;
-			rulesComp.setLayout(new GridLayout(1, false));
-
-			new Label(rulesComp, SWT.NONE)
-					.setText(Messages.SelectConnetionAndDestDir_ExcludeRules);
-
-			rules = new StyledText(rulesComp, SWT.MULTI | SWT.BORDER
-					| SWT.V_SCROLL | SWT.H_SCROLL);
-
-			rules.getHorizontalBar().setVisible(true);
-
-			final GridData gridData = new GridData(GridData.FILL_BOTH);
-			rules.setLayoutData(gridData);
-			gridData.minimumHeight = rules.getLineHeight() * 5;
-		} else {
-			rules = null;
-		}
-
-		final Composite buttons = new Composite(shell, SWT.NONE);
-		final GridData gridData3 = new GridData(GridData.FILL_HORIZONTAL);
-		buttons.setLayoutData(gridData3);
-		gridData3.horizontalSpan = 3;
-
-		buttons.setLayout(new GridLayout(3, false));
-		new Label(buttons, SWT.NONE).setLayoutData(new GridData(
-				GridData.FILL_HORIZONTAL));
-
-		final Button ok = new Button(buttons, SWT.PUSH | SWT.BORDER);
-		ok.setText(Messages.SelectConnetionAndDestDir_Ok);
-
-		final Button cancel = new Button(buttons, SWT.PUSH | SWT.BORDER);
-		cancel.setText(Messages.SelectConnetionAndDestDir_Cancel);
-
-		remoteRootPath.setEnabled(false);
-		browse.setEnabled(false);
-		ok.setEnabled(false);
-
-		final Runnable check = new Runnable() {
-			String previousRM = null;
-			String previousDir = null;
-			boolean previousResult = false;
-
-			public void run() {
-				if (showRulesLocal) {
-					if (rules.getStyleRanges().length != 0) {
-						ok.setEnabled(false);
-						return;
-					}
-				}
-
-				if (combo.getSelectionIndex() == -1) {
-					ok.setEnabled(false);
-					return;
-				}
-
-				if (remoteRootPath.getText().isEmpty()) {
-					ok.setEnabled(false);
-					return;
-				}
-				if (cbCreateDir.getSelection()) {
-					ok.setEnabled(true);
-					return;
-				}
-
-				if (combo.getText().equals(previousRM)
-						&& remoteRootPath.getText().equals(previousDir)) {
-					ok.setEnabled(previousResult);
-					return;
-				}
-
-				previousRM = combo.getText();
-				previousDir = remoteRootPath.getText();
-				final IRemoteFileManager fileManager = rservices
-						.getFileManager(connections.get(previousRM));
-				final IFileStore resource = fileManager.getResource(previousDir);
-				try {
-					ok.setEnabled(resource.fetchInfo(0, null).isDirectory());
-				} catch (final CoreException e) {
-					final MessageBox mb = new MessageBox(shell, SWT.ICON_ERROR
-							| SWT.OK);
-					mb.setText(Messages.SelectConnetionAndDestDir_ErrorByFetchInfoTitle);
-					mb.setMessage(e.getMessage());
-				}
-				previousResult = ok.getEnabled();
-			}
-		};
-
-		combo.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-				widgetSelected(arg0);
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				remoteRootPath.setEnabled(true);
-				browse.setEnabled(true);
-				remoteRootPath.setText(connections.get(combo.getText())
-						.getHomeDir() + "/" + project.getName()); //$NON-NLS-1$
-				check.run();
-			}
-		});
-
-		remoteRootPath.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				check.run();
-			}
-		});
-
-		browse.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				final SMOAUIFileManager uifm = new SMOAUIFileManager(rservices);
-				uifm.showConnections(false);
-				uifm.setConnection(connections.get(combo.getText()));
-				final String chosen = uifm.browseDirectory(shell,
-						Messages.SelectConnetionAndDestDir_DirBrowserTitle, remoteRootPath.getText(), 0);
-				if (chosen != null) {
-					remoteRootPath.setText(chosen);
-				}
-			}
-		});
-
-		if (showRulesLocal) {
-			rules.addModifyListener(new ModifyListener() {
-
-				public void modifyText(ModifyEvent arg0) {
-					rules.setStyleRanges(new StyleRange[0]);
-					int start = 0;
-					final String[] array = rules.getText().split("\n"); //$NON-NLS-1$
-					for (int i = 0; i < array.length; ++i) {
-						if (array[i].isEmpty()) {
-							start++;
-							continue;
-						}
-						try {
-							Pattern.compile(array[i]);
-						} catch (final PatternSyntaxException e) {
-							final TextStyle textStyle = new TextStyle();
-							textStyle.underline = true;
-							textStyle.underlineColor = new Color(rules
-									.getDisplay(), 255, 0, 0);
-							textStyle.underlineStyle = SWT.UNDERLINE_ERROR;
-							final StyleRange style = new StyleRange(textStyle);
-							style.start = start;
-							style.length = array[i].length();
-
-							rules.setStyleRange(style);
-
-						}
-						start += array[i].length() + 1;
-					}
-
-					check.run();
-				}
-			});
-		}
-
-		cancel.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				shell.close();
-			}
-		});
-
-		cbCreateDir.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				check.run();
-			}
-		});
-
-		final String[] result = new String[2];
-		final SMOAConnection[] conn = new SMOAConnection[1];
-		final boolean[] mkdir = new boolean[1];
-
-		ok.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				result[0] = remoteRootPath.getText();
-				if (showRulesLocal) {
-					result[1] = rules.getText();
-				}
-				conn[0] = connections.get(combo.getText());
-				mkdir[0] = cbCreateDir.getSelection();
-				shell.close();
-			}
-		});
-
-		final String create = project.getPersistentProperty(SMOA_SYNC_CREATE);
-		if (create != null) {
-			cbCreateDir.setSelection(create.equals("true")); //$NON-NLS-1$
-		}
-
-		final String rm = project.getPersistentProperty(SMOA_SYNC_RM);
-		if (rm != null) {
-			final SMOAConnection c = connections.get(rm);
-			if (c != null) {
-				combo.select(combo.indexOf(rm));
-			}
-			remoteRootPath.setEnabled(true);
-			browse.setEnabled(true);
-		}
-
-		final String path = project.getPersistentProperty(SMOA_SYNC_PATH);
-		if (path != null) {
-			remoteRootPath.setText(path);
-		}
-
-		if (showRulesLocal) {
-			final String rulesVar = project.getPersistentProperty(SMOA_SYNC_RULES);
-			if (rulesVar != null) {
-				rules.setText(rulesVar);
-			} else {
-				rules.setText(DEFAULT_RULES);
-			}
-		}
-
-		shell.pack();
-
-		shell.open();
-		while (!shell.isDisposed()) {
-			if (!shell.getDisplay().readAndDispatch()) {
-				shell.getDisplay().sleep();
-			}
-		}
-
-		if (result[0] == null || result[0].isEmpty()) {
-			return false;
-		}
-
-		connection = conn[0];
-		remoteDir = result[0];
-		mkdirIfNotExists = mkdir[0];
-		if (showRulesLocal) {
-			this.rules = result[1];
-		}
-
-		project.setPersistentProperty(SMOA_SYNC_PATH, result[0]);
-		project.setPersistentProperty(SMOA_SYNC_RM, conn[0].getRMName());
-		project.setPersistentProperty(SMOA_SYNC_CREATE, mkdir[0] ? "true" //$NON-NLS-1$
-				: "false"); //$NON-NLS-1$
-
-		if (showRulesLocal) {
-			project.setPersistentProperty(SMOA_SYNC_RULES, result[1]);
-		}
-
-		succeeded = true;
-		return true;
-	}
-
-	/** Adds to the GUI proper dialog for the ignore rules */
-	public void setShowRules(boolean showRules) {
-		this.showRules = showRules;
-	}
-
-	public void setWindowTitle(String title) {
-		windowTitle = title;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/messages.properties b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/messages.properties
deleted file mode 100644
index 2874fae..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/actions/messages.properties
+++ /dev/null
@@ -1,40 +0,0 @@
-SelectConnetionAndDestDir_Browse=Browse...
-SelectConnetionAndDestDir_Cancel=Cancel
-SelectConnetionAndDestDir_CreateIfNotExists=Create dir if not exists
-SelectConnetionAndDestDir_DefaultRules=\\..*\n.*~
-SelectConnetionAndDestDir_DefaultWindowTitle=Choose connection and destination directory
-SelectConnetionAndDestDir_DirBrowserTitle=Synchronise (SMOA Comp)
-SelectConnetionAndDestDir_ErrorByFetchInfoTitle=Error\!
-SelectConnetionAndDestDir_ErrorNoActiveConnection=There is no active connection\!\nPlease start target SMOA Resource Manager first
-SelectConnetionAndDestDir_ErrorNoActiveConnectionTitle=Synchronise (SMOA Comp)
-SelectConnetionAndDestDir_ExcludeRules=File exclude rules (Java Pattern):
-SelectConnetionAndDestDir_Ok=Ok
-SelectConnetionAndDestDir_RemoteRootPath=Remote root path for synchronisation:
-SelectConnetionAndDestDir_ResourceManager=Resource manager:
-SMOACustomSyncAction_CurrentFile=Current:
-SMOACustomSyncAction_ErrorAccessingRemoteFS=Error accessing remote FS\!\!\!
-SMOACustomSyncAction_ErrorDialogTitle=Error\!
-SMOACustomSyncAction_ErrorOverwritePolicyTitle=Synchronise (SMOA Comp)
-SMOACustomSyncAction_ExceptionByReadingSettings=Synchronise (SMOA Comp)
-SMOACustomSyncAction_ExceptionBySynchro=Exception occured by synchronizing files
-SMOACustomSyncAction_ExceptionByWritingSettings=Synchronise (SMOA Comp)
-SMOACustomSyncAction_FileOverwritePolicy=File overwrite policy:
-SMOACustomSyncAction_FilesCopied=Files copied:
-SMOACustomSyncAction_FilesTotal=Files total:
-SMOACustomSyncAction_FromLocal=from local to remote [>>]
-SMOACustomSyncAction_FromRemote=[<<] from remote to local
-SMOACustomSyncAction_IncorretOverwritePolicy=Incorrect overwrite policy\!
-SMOACustomSyncAction_Local=Local
-SMOACustomSyncAction_PleaswWait=Please wait...
-SMOACustomSyncAction_ProgressWindowTitle=SMOA Computing file synchronization
-SMOACustomSyncAction_RegeneratingTree=Regenerating tree...
-SMOACustomSyncAction_RegeneratingTree_FoundFiles=Regenerating tree. Found files: 
-SMOACustomSyncAction_Remote=Remote
-SMOACustomSyncAction_WindowTitle=SMOA Computing file synchronization
-SMOAToLocalSyncAction_WindowTitle=Synchronise from remote to local
-SMOAToRemoteSyncAction_WindowTitle=Synchronise from local to remote
-SMOASyncAction_RsyncInProgress=rsyncing...
-SMOASyncAction_ExceptionBySynchro=Exception occurred by synchronising files
-SMOASyncAction_ErrorByRsync_desc=Caught exception while executing rsync:\n
-SMOASyncAction_ErrorByRsync_title=Error!
-SMOASyncAction_RsyncInProgress=rsyncing...
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/Messages.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/Messages.java
deleted file mode 100644
index 9a4bf42..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/Messages.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.launch;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.smoa.ui.launch.messages"; //$NON-NLS-1$
-	public static String SMOARMLaunchConfigurationDynamicTab_AllMachines;
-	public static String SMOARMLaunchConfigurationDynamicTab_APP_REGEX;
-	public static String SMOARMLaunchConfigurationDynamicTab_CpuCountBounds;
-	public static String SMOARMLaunchConfigurationDynamicTab_CustomMakeCommand;
-	public static String SMOARMLaunchConfigurationDynamicTab_CustomMakeIsEmptyError;
-	public static String SMOARMLaunchConfigurationDynamicTab_Description;
-	public static String SMOARMLaunchConfigurationDynamicTab_MaxCpuCount;
-	public static String SMOARMLaunchConfigurationDynamicTab_MinCpuCount;
-	public static String SMOARMLaunchConfigurationDynamicTab_Name;
-	public static String SMOARMLaunchConfigurationDynamicTab_NativeSpec;
-	public static String SMOARMLaunchConfigurationDynamicTab_PreferredMachines;
-	public static String SMOARMLaunchConfigurationDynamicTab_QueueName;
-	public static String SMOARMLaunchConfigurationDynamicTab_RunMake;
-	public static String SMOARMLaunchConfigurationDynamicTab_WrapperScript;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/SMOARMLaunchConfigurationDynamicTab.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/SMOARMLaunchConfigurationDynamicTab.java
deleted file mode 100644
index 1707082..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/SMOARMLaunchConfigurationDynamicTab.java
+++ /dev/null
@@ -1,648 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.launch;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Vector;
-
-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.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.ptp.core.attributes.ArrayAttribute;
-import org.eclipse.ptp.core.attributes.ArrayAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IAttribute;
-import org.eclipse.ptp.core.attributes.IAttributeDefinition;
-import org.eclipse.ptp.core.attributes.IllegalValueException;
-import org.eclipse.ptp.core.attributes.IntegerAttribute;
-import org.eclipse.ptp.core.elements.IPMachine;
-import org.eclipse.ptp.core.elements.IPNode;
-import org.eclipse.ptp.core.elements.IPQueue;
-import org.eclipse.ptp.core.elements.IPResourceManager;
-import org.eclipse.ptp.core.elements.attributes.ElementAttributes;
-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.smoa.core.SMOAConfiguration;
-import org.eclipse.ptp.rm.smoa.core.attrib.SMOAJobAttributes;
-import org.eclipse.ptp.rm.smoa.core.attrib.SMOANodeAttributes;
-import org.eclipse.ptp.rm.smoa.core.attrib.StringMapAttribute;
-import org.eclipse.ptp.rm.smoa.core.attrib.StringMapAttributeDefinition;
-import org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManager;
-import org.eclipse.ptp.rm.smoa.ui.SMOAUIPlugin;
-import org.eclipse.ptp.rmsystem.IResourceManager;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-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.Combo;
-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.List;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * This GUI element is drawn within the Launch dialog, under Resources tab.
- * 
- * The configuration is saved outside this class.
- */
-public class SMOARMLaunchConfigurationDynamicTab extends AbstractRMLaunchConfigurationDynamicTab {
-
-	/** The regular expression for filtering application names for combo box */
-	public static final String APP_REGEX = Messages.SMOARMLaunchConfigurationDynamicTab_APP_REGEX;
-
-	// Main GUI composite
-	private Composite control = null;
-
-	// Controls for user:
-	private Text jobName = null;
-	private Text jobDescription = null;
-	private Text jobNativeSpecification = null;
-	private List machinesAll = null;
-	private List machinesPreferred = null;
-	private Spinner minCPUs = null;
-	private Spinner maxCPUs = null;
-	private Button cboxMin = null;
-	private Button cboxMax = null;
-	private Combo application = null;
-	private Button cboxMake = null;
-	private Text queue = null;
-	private Text customMake = null;
-	private Button cboxCustomMake = null;
-
-	public SMOARMLaunchConfigurationDynamicTab(IResourceManager rm, ILaunchConfigurationDialog dialog) {
-		super(dialog);
-	}
-
-	public RMLaunchValidation canSave(Control control, IResourceManager rm, IPQueue queue) {
-		return new RMLaunchValidation(true, null);
-	}
-
-	public void createControl(Composite parent, IResourceManager rm, IPQueue ipqueue) throws CoreException {
-		control = new Composite(parent, SWT.NONE);
-		control.setLayout(new GridLayout(1, false));
-
-		Label label;
-		Group group;
-
-		// Job name
-
-		final Composite nameComposite = new Composite(control, SWT.NONE);
-		nameComposite.setLayout(new GridLayout(2, false));
-		nameComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		label = new Label(nameComposite, SWT.NONE);
-		label.setText(Messages.SMOARMLaunchConfigurationDynamicTab_Name);
-		label.setLayoutData(new GridData());
-
-		jobName = new Text(nameComposite, SWT.SINGLE | SWT.BORDER);
-		jobName.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		label = new Label(nameComposite, SWT.NONE);
-		label.setText(Messages.SMOARMLaunchConfigurationDynamicTab_Description);
-		label.setLayoutData(new GridData());
-
-		jobDescription = new Text(nameComposite, SWT.MULTI | SWT.BORDER);
-		GridData gridData = new GridData(GridData.FILL_BOTH);
-		gridData.minimumHeight = jobDescription.getLineHeight();
-		jobDescription.setLayoutData(gridData);
-
-		// App & make
-
-		final Composite appComposite = new Composite(control, SWT.NONE);
-		appComposite.setLayout(new GridLayout(4, false));
-		appComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		label = new Label(appComposite, SWT.NONE);
-		label.setText(Messages.SMOARMLaunchConfigurationDynamicTab_WrapperScript);
-		label.setLayoutData(new GridData());
-
-		application = new Combo(appComposite, SWT.BORDER | SWT.READ_ONLY);
-		application.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		label = new Label(appComposite, SWT.NONE);
-		label.setText("     "); /* Now I know where the name "spacer" comes from *///$NON-NLS-1$
-		label.setLayoutData(new GridData());
-
-		cboxMake = new Button(appComposite, SWT.CHECK | SWT.BORDER);
-		cboxMake.setLayoutData(new GridData());
-
-		cboxMake.setText(Messages.SMOARMLaunchConfigurationDynamicTab_RunMake);
-
-		// Queue and make app
-
-		final Composite queue_makenameComposite = new Composite(control, SWT.NONE);
-		queue_makenameComposite.setLayout(new GridLayout(2, false));
-		queue_makenameComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		cboxCustomMake = new Button(queue_makenameComposite, SWT.CHECK | SWT.BORDER);
-		cboxCustomMake.setText(Messages.SMOARMLaunchConfigurationDynamicTab_CustomMakeCommand);
-		cboxCustomMake.setLayoutData(new GridData());
-		cboxCustomMake.setEnabled(false);
-
-		customMake = new Text(queue_makenameComposite, SWT.SINGLE | SWT.BORDER);
-		customMake.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		customMake.setEnabled(false);
-
-		label = new Label(queue_makenameComposite, SWT.NONE);
-		label.setText(Messages.SMOARMLaunchConfigurationDynamicTab_QueueName);
-		label.setLayoutData(new GridData());
-
-		queue = new Text(queue_makenameComposite, SWT.SINGLE | SWT.BORDER);
-		queue.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// CPU count
-
-		group = new Group(control, SWT.NONE);
-		group.setText(Messages.SMOARMLaunchConfigurationDynamicTab_CpuCountBounds);
-		group.setLayout(new GridLayout(6, false));
-		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		label = new Label(group, SWT.NONE);
-		label.setText(Messages.SMOARMLaunchConfigurationDynamicTab_MinCpuCount);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_END));
-
-		minCPUs = new Spinner(group, SWT.SINGLE | SWT.BORDER);
-		minCPUs.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-		cboxMin = new Button(group, SWT.CHECK);
-		cboxMin.setSelection(true);
-		cboxMin.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-		label = new Label(group, SWT.NONE);
-		label.setText(Messages.SMOARMLaunchConfigurationDynamicTab_MaxCpuCount);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_END));
-
-		maxCPUs = new Spinner(group, SWT.SINGLE | SWT.BORDER);
-		maxCPUs.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-
-		cboxMax = new Button(group, SWT.CHECK);
-		cboxMax.setSelection(true);
-		cboxMax.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-		// Machines
-
-		group = new Group(control, SWT.NONE);
-		group.setText(Messages.SMOARMLaunchConfigurationDynamicTab_PreferredMachines);
-		group.setLayout(new GridLayout(2, true));
-		group.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		label = new Label(group, SWT.NONE);
-		label.setText(Messages.SMOARMLaunchConfigurationDynamicTab_AllMachines);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		label = new Label(group, SWT.NONE);
-		label.setText(Messages.SMOARMLaunchConfigurationDynamicTab_PreferredMachines);
-		label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		machinesAll = new List(group, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
-		gridData = new GridData(GridData.FILL_BOTH);
-		gridData.minimumHeight = (int) (2.25 * machinesAll.getItemHeight());
-		machinesAll.setLayoutData(gridData);
-
-		machinesPreferred = new List(group, SWT.MULTI | SWT.BORDER | SWT.V_SCROLL);
-		machinesPreferred.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// Descriptions
-
-		final Composite descsComposite = new Composite(control, SWT.NONE);
-		descsComposite.setLayout(new GridLayout(2, false));
-		descsComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		label = new Label(descsComposite, SWT.NONE);
-		label.setText(Messages.SMOARMLaunchConfigurationDynamicTab_NativeSpec);
-		label.setLayoutData(new GridData());
-
-		jobNativeSpecification = new Text(descsComposite, SWT.MULTI | SWT.BORDER);
-		gridData = new GridData(GridData.FILL_BOTH);
-		gridData.minimumHeight = jobNativeSpecification.getLineHeight();
-		jobNativeSpecification.setLayoutData(gridData);
-
-	}
-
-	/**
-	 * Passes all attributes from ILaunchConfiguration to the proper launch
-	 * filtering only those returned by SMOAJobAttributes.getLaunchAttributes()
-	 * method
-	 */
-	@SuppressWarnings("unchecked")
-	public IAttribute<?, ?, ?>[] getAttributes(IResourceManager rm, IPQueue queue, ILaunchConfiguration configuration, String mode)
-			throws CoreException {
-		final Map<String, IAttribute<?, ?, ?>> launchAttributes = new HashMap<String, IAttribute<?, ?, ?>>();
-
-		final Map<?, ?> configurationAttributes = configuration.getAttributes();
-
-		final Map<String, IAttributeDefinition<?, ?, ?>> possibleAttributesMap = SMOAJobAttributes.getLaunchAttributes();
-		try {
-			for (final Object name : configurationAttributes.entrySet()) {
-				final Entry<?, ?> entry = (Entry<?, ?>) name;
-
-				final Object value = entry.getValue();
-				final IAttributeDefinition<?, ?, ?> definition = possibleAttributesMap.get(entry.getKey());
-
-				if (definition != null && value != null) {
-					if (definition instanceof ArrayAttributeDefinition<?>) {
-						// ArrayAttributeDefinition
-						assert value instanceof java.util.List<?>;
-						final java.util.List<String> list = (java.util.List<String>) value;
-						final ArrayAttributeDefinition<String> arrayDef = (ArrayAttributeDefinition<String>) definition;
-
-						final ArrayAttribute<String> attribute = arrayDef.create(list.toArray(new String[list.size()]));
-						launchAttributes.put(entry.getKey().toString(), attribute);
-					} else if (definition instanceof StringMapAttributeDefinition) {
-						// StringMapAttributeDefinition
-						if (value instanceof Map<?, ?>) {
-							final Map<String, String> map = (Map<String, String>) entry.getValue();
-							final StringMapAttribute attribute = ((StringMapAttributeDefinition) definition).create(map);
-							launchAttributes.put(entry.getKey().toString(), attribute);
-						} else {
-							throw new IllegalValueException("Bad format of some map attr"); //$NON-NLS-1$
-						}
-					} else {
-						// Others
-						launchAttributes.put(entry.getKey().toString(), definition.create(value.toString()));
-					}
-				}
-			}
-		} catch (final IllegalValueException e) {
-			throw new CoreException(new Status(IStatus.WARNING, SMOAUIPlugin.PLUGIN_ID, "getAttributes", e)); //$NON-NLS-1$
-		}
-
-		return launchAttributes.values().toArray(new IAttribute<?, ?, ?>[launchAttributes.size()]);
-	}
-
-	public Control getControl() {
-		return control;
-	}
-
-	public RMLaunchValidation initializeFrom(Control control, IResourceManager rm, IPQueue ipqueue,
-			ILaunchConfiguration configuration) {
-		boolean success = false;
-		String message = null;
-
-		success = true;
-
-		// We get machine names and sum of processor counts
-		int maxCpuCount = 0;
-
-		final IPResourceManager rmp = (IPResourceManager) rm.getAdapter(IPResourceManager.class);
-		final IPMachine[] machines = rmp.getMachines();
-		if (machines != null && machines.length > 0) {
-			final IPMachine machine = machines[0];
-			for (final IPNode node : machine.getNodes()) {
-				machinesAll.add(node.getName());
-				final IntegerAttribute cpuCountAttribute = node.getAttribute(SMOANodeAttributes.getCpuCountDef());
-				if (cpuCountAttribute != null) {
-					final Integer cpusOnNode = cpuCountAttribute.getValue();
-					if (cpusOnNode != null) {
-						maxCpuCount += cpusOnNode;
-					}
-				}
-			}
-		}
-
-		final java.util.List<String> apps = new Vector<String>();
-		if (rm instanceof SMOAResourceManager && ((SMOAResourceManager) rm).getConfiguration() instanceof SMOAConfiguration) {
-			final SMOAConfiguration conf = (SMOAConfiguration) ((SMOAResourceManager) rm).getConfiguration();
-			for (final String app : conf.getAvailableAppList()) {
-				if (app.matches(APP_REGEX)) {
-					apps.add(app);
-				}
-			}
-		}
-		apps.add(SMOAJobAttributes.NO_WRAPPER_SCRIPT);
-		Collections.sort(apps);
-		application.setItems(apps.toArray(new String[apps.size()]));
-		application.select(application.indexOf(SMOAJobAttributes.NO_WRAPPER_SCRIPT));
-
-		if (maxCpuCount == 0) {
-			maxCpuCount = 1;
-		}
-
-		minCPUs.setMinimum(1);
-		maxCPUs.setMinimum(1);
-		minCPUs.setMaximum(maxCpuCount);
-		maxCPUs.setMaximum(maxCpuCount);
-
-		minCPUs.setSelection(1);
-		maxCPUs.setSelection(maxCpuCount);
-
-		minCPUs.setEnabled(false);
-		maxCPUs.setEnabled(false);
-
-		cboxMin.setSelection(false);
-		cboxMax.setSelection(false);
-
-		try {
-			final Map<?, ?> confAttributes = configuration.getAttributes();
-
-			final String nameEntry = (String) confAttributes.get(ElementAttributes.getNameAttributeDefinition().getId());
-			if (nameEntry != null) {
-				jobName.setText(nameEntry);
-			}
-
-			final String appEntry = (String) confAttributes.get(SMOAJobAttributes.getAppNameDef().getId());
-			if (appEntry != null) {
-				if (application.indexOf(appEntry) != -1) {
-					application.select(application.indexOf(appEntry));
-				}
-			}
-
-			final Boolean b = (Boolean) confAttributes.get(SMOAJobAttributes.getMakeDef().getId());
-			if (b != null) {
-				cboxMake.setSelection(b);
-				if (b) {
-					cboxCustomMake.setEnabled(true);
-				}
-			}
-
-			final Boolean c = (Boolean) confAttributes.get(SMOAJobAttributes.getIfCustomMakeDef().getId());
-			if (c != null) {
-				cboxCustomMake.setSelection(c);
-			}
-			{
-				if (b != null && b && c) {
-					customMake.setEnabled(true);
-				}
-			}
-
-			final String makeCmdEntry = (String) confAttributes.get(SMOAJobAttributes.getCustomMakeCommandDef().getId());
-			if (makeCmdEntry != null) {
-				customMake.setText(makeCmdEntry);
-			}
-
-			final String queueEntry = (String) confAttributes.get(SMOAJobAttributes.getQueueNameDef().getId());
-			if (queueEntry != null) {
-				queue.setText(queueEntry);
-			}
-
-			final Integer minEntry = (Integer) confAttributes.get(SMOAJobAttributes.getMinCpuDef().getId());
-			if (minEntry != null) {
-				minCPUs.setSelection(minEntry);
-				cboxMin.setSelection(true);
-				minCPUs.setEnabled(true);
-			}
-
-			final Integer maxEntry = (Integer) confAttributes.get(SMOAJobAttributes.getMaxCpuDef().getId());
-			if (maxEntry != null) {
-				maxCPUs.setSelection(maxEntry);
-				cboxMax.setSelection(true);
-				maxCPUs.setEnabled(true);
-			}
-
-			final String descEntry = (String) confAttributes.get(SMOAJobAttributes.getDescDef().getId());
-			if (descEntry != null) {
-				jobDescription.setText(descEntry);
-			}
-
-			final String nativeEntry = (String) confAttributes.get(SMOAJobAttributes.getNativeSpecDef().getId());
-			if (nativeEntry != null) {
-				jobNativeSpecification.setText(nativeEntry);
-			}
-
-			@SuppressWarnings("unchecked")
-			final java.util.List<String> prefEntry = (java.util.List<String>) confAttributes.get(SMOAJobAttributes
-					.getPrefferedDef().getId());
-			if (prefEntry != null) {
-				for (final String string : prefEntry) {
-					machinesPreferred.add(string);
-				}
-			}
-
-		} catch (final CoreException e) {
-			e.printStackTrace();
-			success = false;
-			message = e.getMessage();
-		}
-
-		prepareListeners(control, rm, ipqueue, configuration);
-
-		return new RMLaunchValidation(success, message);
-	}
-
-	public RMLaunchValidation isValid(ILaunchConfiguration launchConfig, IResourceManager rm, IPQueue queue) {
-
-		final boolean isCustomCommandValid = !(customMake.isEnabled() && customMake.getText().isEmpty());
-
-		return new RMLaunchValidation(isCustomCommandValid, isCustomCommandValid ? null
-				: Messages.SMOARMLaunchConfigurationDynamicTab_CustomMakeIsEmptyError);
-	}
-
-	/**
-	 * Called by each context change, tab change and by initialization (after
-	 * initializeForm).
-	 */
-	public RMLaunchValidation performApply(ILaunchConfigurationWorkingCopy configuration, IResourceManager rm, IPQueue ipqueue) {
-
-		configuration.setAttribute(ElementAttributes.getNameAttributeDefinition().getId(), jobName.getText());
-
-		configuration.setAttribute(SMOAJobAttributes.getDescDef().getId(), jobDescription.getText());
-
-		configuration.setAttribute(SMOAJobAttributes.getQueueNameDef().getId(), queue.getText());
-
-		configuration.setAttribute(SMOAJobAttributes.getAppNameDef().getId(), application.getItem(application.getSelectionIndex()));
-
-		configuration.setAttribute(SMOAJobAttributes.getMakeDef().getId(), cboxMake.getSelection());
-
-		configuration.setAttribute(SMOAJobAttributes.getIfCustomMakeDef().getId(), cboxCustomMake.getSelection());
-
-		configuration.setAttribute(SMOAJobAttributes.getCustomMakeCommandDef().getId(), customMake.getText());
-
-		if (cboxMin.getSelection()) {
-			configuration.setAttribute(SMOAJobAttributes.getMinCpuDef().getId(), minCPUs.getSelection());
-		} else {
-			configuration.removeAttribute(SMOAJobAttributes.getMinCpuDef().getId());
-		}
-
-		if (cboxMax.getSelection()) {
-			configuration.setAttribute(SMOAJobAttributes.getMaxCpuDef().getId(), maxCPUs.getSelection());
-		} else {
-			configuration.removeAttribute(SMOAJobAttributes.getMaxCpuDef().getId());
-		}
-
-		configuration.setAttribute(SMOAJobAttributes.getNativeSpecDef().getId(), jobNativeSpecification.getText());
-		final Vector<String> pref = new Vector<String>();
-		for (final String s : machinesPreferred.getItems()) {
-			pref.add(s);
-		}
-		configuration.setAttribute(SMOAJobAttributes.getPrefferedDef().getId(), pref);
-
-		return new RMLaunchValidation(true, null);
-	}
-
-	private void prepareListeners(Control c, final IResourceManager rm, IPQueue ipqueue, final ILaunchConfiguration configuration) {
-		jobName.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				fireContentsChanged();
-			}
-		});
-
-		jobDescription.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				fireContentsChanged();
-			}
-		});
-
-		jobNativeSpecification.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				fireContentsChanged();
-			}
-		});
-
-		minCPUs.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				if (minCPUs.getSelection() > maxCPUs.getSelection()) {
-					final int swap = maxCPUs.getSelection();
-					maxCPUs.setSelection(minCPUs.getSelection());
-					minCPUs.setSelection(swap);
-				}
-				fireContentsChanged();
-			}
-		});
-
-		maxCPUs.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				if (minCPUs.getSelection() > maxCPUs.getSelection()) {
-					final int swap = maxCPUs.getSelection();
-					maxCPUs.setSelection(minCPUs.getSelection());
-					minCPUs.setSelection(swap);
-				}
-				fireContentsChanged();
-			}
-		});
-
-		machinesAll.addMouseListener(new MouseListener() {
-			public void mouseDoubleClick(MouseEvent arg0) {
-				for (final String s : machinesAll.getSelection()) {
-					if (machinesPreferred.indexOf(s) == -1) {
-						machinesPreferred.add(s);
-					}
-				}
-				fireContentsChanged();
-			}
-
-			public void mouseDown(MouseEvent arg0) {
-			}
-
-			public void mouseUp(MouseEvent arg0) {
-			}
-		});
-
-		machinesPreferred.addMouseListener(new MouseListener() {
-			public void mouseDoubleClick(MouseEvent arg0) {
-				machinesPreferred.remove(machinesPreferred.getSelectionIndices());
-				fireContentsChanged();
-			}
-
-			public void mouseDown(MouseEvent arg0) {
-			}
-
-			public void mouseUp(MouseEvent arg0) {
-			}
-		});
-
-		cboxMin.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				minCPUs.setEnabled(cboxMin.getSelection());
-				fireContentsChanged();
-			}
-		});
-
-		cboxMax.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				maxCPUs.setEnabled(cboxMax.getSelection());
-				fireContentsChanged();
-			}
-		});
-
-		queue.addModifyListener(new ModifyListener() {
-
-			public void modifyText(ModifyEvent arg0) {
-				fireContentsChanged();
-			}
-		});
-
-		cboxMake.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				cboxCustomMake.setEnabled(cboxMake.getSelection());
-				customMake.setEnabled(cboxMake.getSelection() && cboxCustomMake.getSelection());
-				fireContentsChanged();
-			}
-		});
-
-		cboxCustomMake.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				customMake.setEnabled(cboxMake.getSelection() && cboxCustomMake.getSelection());
-				fireContentsChanged();
-			}
-		});
-
-		customMake.addModifyListener(new ModifyListener() {
-
-			public void modifyText(ModifyEvent arg0) {
-				fireContentsChanged();
-			}
-		});
-
-		application.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-				widgetSelected(arg0);
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				fireContentsChanged();
-			}
-		});
-	}
-
-	/**
-	 * Called only by creating a new Launch
-	 */
-	public RMLaunchValidation setDefaults(ILaunchConfigurationWorkingCopy configuration, IResourceManager rm, IPQueue queue) {
-
-		configuration.setAttribute(ElementAttributes.getNameAttributeDefinition().getId(), ""); //$NON-NLS-1$
-
-		configuration.removeAttribute(JobAttributes.getWorkingDirectoryAttributeDefinition().getId());
-
-		return new RMLaunchValidation(true, null);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/SMOARMLaunchConfigurationFactory.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/SMOARMLaunchConfigurationFactory.java
deleted file mode 100644
index 7f66ae4..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/SMOARMLaunchConfigurationFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.launch;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.ptp.launch.ui.extensions.AbstractRMLaunchConfigurationFactory;
-import org.eclipse.ptp.launch.ui.extensions.IRMLaunchConfigurationDynamicTab;
-import org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManager;
-import org.eclipse.ptp.rmsystem.IResourceManager;
-
-/**
- * Part of an extension of PTP plug-in. Shows where to take launch tab from.
- */
-public class SMOARMLaunchConfigurationFactory extends AbstractRMLaunchConfigurationFactory {
-
-	@Override
-	protected IRMLaunchConfigurationDynamicTab doCreate(IResourceManager rm, ILaunchConfigurationDialog dialog)
-			throws CoreException {
-		return new SMOARMLaunchConfigurationDynamicTab(rm, dialog);
-	}
-
-	@Override
-	public Class<? extends IResourceManager> getResourceManagerClass() {
-		return SMOAResourceManager.class;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/messages.properties b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/messages.properties
deleted file mode 100644
index b9063cc..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/launch/messages.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-SMOARMLaunchConfigurationDynamicTab_AllMachines=All machines
-SMOARMLaunchConfigurationDynamicTab_APP_REGEX=.*[pP][tT][pP].*
-SMOARMLaunchConfigurationDynamicTab_CpuCountBounds=CPU count bounds
-SMOARMLaunchConfigurationDynamicTab_CustomMakeCommand=Custom make command:
-SMOARMLaunchConfigurationDynamicTab_CustomMakeIsEmptyError=Custom make command may not be empty
-SMOARMLaunchConfigurationDynamicTab_Description=Description
-SMOARMLaunchConfigurationDynamicTab_MaxCpuCount=Maximum CPU count
-SMOARMLaunchConfigurationDynamicTab_MinCpuCount=Minimum CPU count
-SMOARMLaunchConfigurationDynamicTab_Name=Name
-SMOARMLaunchConfigurationDynamicTab_NativeSpec=Native Spec.
-SMOARMLaunchConfigurationDynamicTab_PreferredMachines=Preferred machines
-SMOARMLaunchConfigurationDynamicTab_QueueName=Queue name
-SMOARMLaunchConfigurationDynamicTab_RunMake=Run 'make' before run
-SMOARMLaunchConfigurationDynamicTab_WrapperScript=Wrapper script
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/Messages.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/Messages.java
deleted file mode 100644
index ad1ff74..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/Messages.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.preferences;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.smoa.ui.preferences.messages"; //$NON-NLS-1$
-	public static String SMOAPreferencePage_OutputPooling;
-	public static String SMOAPreferencePage_TaskPooling;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/SMOAPreferencePage.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/SMOAPreferencePage.java
deleted file mode 100644
index 5f6f9ba..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/SMOAPreferencePage.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.ptp.rm.smoa.core.rmsystem.PoolingIntervalsAndStatic;
-import org.eclipse.ptp.rm.smoa.ui.SMOAUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-/**
- * Represents preferences page for SMOA Computing plug-in.
- * 
- * Currently only pooling intervals are set up here.
- */
-public class SMOAPreferencePage extends PreferencePage implements
-		IWorkbenchPreferencePage {
-
-	private Composite parent;
-	private Spinner taskInterval;
-	private Spinner outInterval;
-
-	public SMOAPreferencePage() {
-	}
-
-	@Override
-	protected Control createContents(Composite arg0) {
-		parent = new Composite(arg0, SWT.NONE);
-
-		final GridLayout layout = new GridLayout(2, false);
-		parent.setLayout(layout);
-
-		final IPreferenceStore store = SMOAUIPlugin.getDefault().getPreferenceStore();
-
-		// Task
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(Messages.SMOAPreferencePage_TaskPooling);
-		label.setLayoutData(new GridData());
-
-		taskInterval = new Spinner(parent, SWT.BORDER);
-		taskInterval.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		int taskCheck = store.getInt(SMOAUIPlugin.KEY_INTERVAL_TASK);
-		if (taskCheck < 100) {
-			taskCheck = doGetPreferenceStore().getDefaultInt(
-					SMOAUIPlugin.KEY_INTERVAL_TASK);
-		}
-
-		taskInterval.setValues(taskCheck, 100, 3600000, 3, 1000, 10000);
-
-		// out
-		label = new Label(parent, SWT.NONE);
-		label.setText(Messages.SMOAPreferencePage_OutputPooling);
-		label.setLayoutData(new GridData());
-
-		outInterval = new Spinner(parent, SWT.BORDER);
-		outInterval.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		int outCheck = store.getInt(SMOAUIPlugin.KEY_INTERVAL_OUT);
-		if (outCheck < 100) {
-			outCheck = doGetPreferenceStore().getDefaultInt(
-					SMOAUIPlugin.KEY_INTERVAL_OUT);
-		}
-
-		outInterval.setValues(outCheck, 100, 3600000, 3, 1000, 10000);
-
-		return parent;
-	}
-
-	@Override
-	protected IPreferenceStore doGetPreferenceStore() {
-		return SMOAUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	public void init(IWorkbench arg0) {
-
-		doGetPreferenceStore().setDefault(SMOAUIPlugin.KEY_INTERVAL_TASK,
-				PoolingIntervalsAndStatic.DEFAULT_POOLING_STATE);
-		doGetPreferenceStore().setDefault(SMOAUIPlugin.KEY_INTERVAL_OUT,
-				PoolingIntervalsAndStatic.DEFAULT_POOLING_OUT);
-	}
-
-	@Override
-	public boolean performOk() {
-		final IPreferenceStore preferenceStore = doGetPreferenceStore();
-		preferenceStore.setValue(SMOAUIPlugin.KEY_INTERVAL_TASK,
-				taskInterval.getSelection());
-		preferenceStore.setValue(SMOAUIPlugin.KEY_INTERVAL_OUT,
-				outInterval.getSelection());
-
-		PoolingIntervalsAndStatic.setPoolingIntervalTask(taskInterval.getSelection());
-		PoolingIntervalsAndStatic.setPoolingIntervalOut(outInterval.getSelection());
-
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/messages.properties b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/messages.properties
deleted file mode 100644
index a4ceff4..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/preferences/messages.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-SMOAPreferencePage_OutputPooling=Output pooling interval [s]:
-SMOAPreferencePage_TaskPooling=Task status pooling interval [s]:
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIConnectionManager.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIConnectionManager.java
deleted file mode 100644
index 7cd94a2..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIConnectionManager.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.rservices;
-
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.ui.IRemoteUIConnectionManager;
-import org.eclipse.swt.widgets.Shell;
-
-public class SMOAUIConnectionManager implements IRemoteUIConnectionManager {
-
-	public IRemoteConnection newConnection(Shell shell) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public IRemoteConnection newConnection(Shell shell, String[] attrHints, String[] attrHintValues) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public void openConnectionWithProgress(Shell shell, IRunnableContext context, IRemoteConnection connection) {
-		// TODO Auto-generated method stub
-
-	}
-
-	public void updateConnection(Shell shell, IRemoteConnection connection) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIFileManager.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIFileManager.java
deleted file mode 100644
index a72a76d..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIFileManager.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.rservices;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.ptp.remote.core.IRemoteConnection;
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.dialogs.RemoteResourceBrowser;
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * GUI control allowing file browsing, selecting a single/multiple
- * file/directory.
- * 
- * Current implementation does not provide selecting connection.
- */
-public class SMOAUIFileManager implements IRemoteUIFileManager {
-	private IRemoteServices services = null;
-	private IRemoteConnection connection = null;
-	private boolean showConnections = false;
-
-	public SMOAUIFileManager(IRemoteServices services) {
-		this.services = services;
-	}
-
-	public String browseDirectory(Shell shell, String message,
-			String filterPath, int flags) {
-		final RemoteResourceBrowser browser = new RemoteResourceBrowser(services,
-				connection, shell, RemoteResourceBrowser.SINGLE);
-		browser.setType(RemoteResourceBrowser.DIRECTORY_BROWSER);
-		browser.setInitialPath(filterPath);
-		browser.showConnections(showConnections);
-		if (browser.open() == Window.CANCEL) {
-			return null;
-		}
-		connection = browser.getConnection();
-		final String path = browser.getPath();
-		if (path == null) {
-			return null;
-		}
-		return path;
-	}
-
-	public String browseFile(Shell shell, String message, String filterPath,
-			int flags) {
-		final RemoteResourceBrowser browser = new RemoteResourceBrowser(services,
-				connection, shell, RemoteResourceBrowser.SINGLE);
-		browser.setType(RemoteResourceBrowser.FILE_BROWSER);
-		browser.setInitialPath(filterPath);
-		browser.showConnections(showConnections);
-		if (browser.open() == Window.CANCEL) {
-			return null;
-		}
-		connection = browser.getConnection();
-		final String path = browser.getPath();
-		if (path == null) {
-			return null;
-		}
-		return path;
-	}
-
-	public String[] browseFiles(Shell shell, String message, String filterPath,
-			int flags) {
-		final RemoteResourceBrowser browser = new RemoteResourceBrowser(services,
-				connection, shell, RemoteResourceBrowser.MULTI);
-		browser.setType(RemoteResourceBrowser.FILE_BROWSER);
-		browser.setInitialPath(filterPath);
-		browser.showConnections(showConnections);
-		if (browser.open() == Window.CANCEL) {
-			return null;
-		}
-		connection = browser.getConnection();
-		final String path[] = browser.getPaths();
-		if (path == null) {
-			return null;
-		}
-		return path;
-	}
-
-	public IRemoteConnection getConnection() {
-		return connection;
-	}
-
-	public void setConnection(IRemoteConnection connection) {
-		this.connection = connection;
-	}
-
-	public void showConnections(boolean enable) {
-		showConnections = enable;
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIServices.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIServices.java
deleted file mode 100644
index 3c5e56c..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIServices.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.rservices;
-
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.ui.IRemoteUIConnectionManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIFileManager;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.rm.smoa.core.rservices.SMOARemoteServices;
-
-/**
- * Extends PTP for providing GUI access to {@link SMOARemoteServices}.
- */
-public class SMOAUIServices implements IRemoteUIServices {
-
-	static private SMOAUIServices instance;
-
-	public static SMOAUIServices getInstance(IRemoteServices services) {
-		if (instance == null) {
-			instance = new SMOAUIServices(services);
-		}
-		return instance;
-	}
-
-	private final IRemoteServices remoteServices;
-
-	public SMOAUIServices(IRemoteServices services) {
-		remoteServices = services;
-	}
-
-	public String getId() {
-		return remoteServices.getId();
-	}
-
-	public String getName() {
-		return remoteServices.getName();
-	}
-
-	public IRemoteUIConnectionManager getUIConnectionManager() {
-		return new SMOAUIConnectionManager();
-	}
-
-	public IRemoteUIFileManager getUIFileManager() {
-		return new SMOAUIFileManager(remoteServices);
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIServicesFactory.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIServicesFactory.java
deleted file mode 100644
index 82061f2..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/rservices/SMOAUIServicesFactory.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.rservices;
-
-import org.eclipse.ptp.remote.core.IRemoteServices;
-import org.eclipse.ptp.remote.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.IRemoteUIServicesFactory;
-
-/**
- * Part of extension, creates {@link SMOAUIServices} on demand.
- */
-public class SMOAUIServicesFactory implements IRemoteUIServicesFactory {
-
-	public IRemoteUIServices getServices(IRemoteServices services) {
-		return SMOAUIServices.getInstance(services);
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/Messages.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/Messages.java
deleted file mode 100644
index cbf6ca7..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/Messages.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.wizards;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.ptp.rm.smoa.ui.wizards.messages"; //$NON-NLS-1$
-	public static String SMOAResourceManagerConfigurationWizardPage_AuthTypeAnonymous;
-	public static String SMOAResourceManagerConfigurationWizardPage_AuthTypeGSI;
-	public static String SMOAResourceManagerConfigurationWizardPage_AuthTypeUserTokenProfile;
-	public static String SMOAResourceManagerConfigurationWizardPage_Browse;
-	public static String SMOAResourceManagerConfigurationWizardPage_CaCert;
-	public static String SMOAResourceManagerConfigurationWizardPage_ChooseAuthenticationType;
-	public static String SMOAResourceManagerConfigurationWizardPage_Hostname;
-	public static String SMOAResourceManagerConfigurationWizardPage_Password;
-	public static String SMOAResourceManagerConfigurationWizardPage_Port;
-	public static String SMOAResourceManagerConfigurationWizardPage_SecureStorageError;
-	public static String SMOAResourceManagerConfigurationWizardPage_ServiceDN;
-	public static String SMOAResourceManagerConfigurationWizardPage_SmoaComputingConfiguration;
-	public static String SMOAResourceManagerConfigurationWizardPage_SmoaComputingConfiguration_description;
-	public static String SMOAResourceManagerConfigurationWizardPage_Username;
-	public static String SMOAResourceManagerFileServicesPage_ChooseFileTransferMethods;
-	public static String SMOAResourceManagerFileServicesPage_Connection;
-	public static String SMOAResourceManagerFileServicesPage_FileServicesChoice;
-	public static String SMOAResourceManagerFileServicesPage_FileServicesChoice_description;
-	public static String SMOAResourceManagerFileServicesPage_New;
-	public static String SMOAResourceManagerFileServicesPage_RemoteServices;
-	public static String SMOAResourceManagerFileServicesPage_TextForChoosingAdditionalSsh;
-	public static String SMOAResourceManagerFileServicesPage_TextForChoosingSmoaOnly;
-	public static String SMOAResourceManagerFileServicesPage_WarningAboutUsingSmoaOnly;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOARMConfigurationWizardPageFactory.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOARMConfigurationWizardPageFactory.java
deleted file mode 100644
index 704a0a4..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOARMConfigurationWizardPageFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.smoa.ui.wizards;
-
-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory;
-
-public class SMOARMConfigurationWizardPageFactory extends RMConfigurationWizardPageFactory {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see
-	 * org.eclipse.ptp.ui.wizards.RMConfigurationWizardPageFactory#getPages(
-	 * org.eclipse.ptp.ui.wizards.IRMConfigurationWizard)
-	 */
-	@Override
-	public RMConfigurationWizardPage[] getPages(IRMConfigurationWizard wizard) {
-		RMConfigurationWizardPage wizardPages[];
-
-		wizardPages = new RMConfigurationWizardPage[2];
-		wizardPages[0] = new SMOAResourceManagerConfigurationWizardPage(wizard);
-		wizardPages[1] = new SMOAResourceManagerFileServicesPage(wizard);
-		return wizardPages;
-	}
-
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOAResourceManagerConfigurationWizardPage.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOAResourceManagerConfigurationWizardPage.java
deleted file mode 100644
index 04aeaaa..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOAResourceManagerConfigurationWizardPage.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.wizards;
-
-import java.io.File;
-
-import org.eclipse.equinox.security.storage.StorageException;
-import org.eclipse.ptp.rm.smoa.core.SMOAConfiguration.AuthType;
-import org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManager;
-import org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManagerConfiguration;
-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-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.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * GUI for configuring {@link SMOAResourceManager} (or rather:
- * {@link SMOAResourceManagerConfiguration}).
- * 
- * Is part of the new Resource Manager wizard, pointed by
- * {@link SMOAProviderContributor}.
- */
-public class SMOAResourceManagerConfigurationWizardPage extends RMConfigurationWizardPage {
-
-	private final SMOAResourceManagerConfiguration conf;
-
-	// GUI elements
-
-	// main part
-	private Text host;
-	private Spinner port;
-
-	// selecting authentication
-	private Button anonymous;
-	private Button username;
-	private Button gsiauth;
-
-	// adaptive GUI
-	private Composite userData;
-	private StackLayout stackLayout;
-
-	// adaptive GUI composites
-	private Composite anonymousTab;
-	private Composite userpasswdTab;
-	private Composite gsiTab;
-
-	// contents of userpasswdTab
-	private Text user;
-	private Text passwd;
-	private Text cacert;
-	private Text dn;
-
-	// contents of gsiTab
-	private Text gsi_dn;
-
-	AuthType previousAuth = null;
-
-	public SMOAResourceManagerConfigurationWizardPage(IRMConfigurationWizard wizard) {
-		super(wizard, Messages.SMOAResourceManagerConfigurationWizardPage_SmoaComputingConfiguration);
-		setTitle(Messages.SMOAResourceManagerConfigurationWizardPage_SmoaComputingConfiguration);
-		setDescription(Messages.SMOAResourceManagerConfigurationWizardPage_SmoaComputingConfiguration_description);
-		conf = (SMOAResourceManagerConfiguration) wizard.getBaseConfiguration();
-	}
-
-	/** Host and port part */
-	private void createAddress(Composite parent) {
-
-		final Composite myMainComp = new Composite(parent, SWT.NONE);
-
-		final GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 2;
-		gridLayout.marginWidth = 0;
-
-		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		myMainComp.setLayoutData(gd);
-
-		myMainComp.setLayout(gridLayout);
-
-		Label label;
-		// URI
-
-		label = new Label(myMainComp, SWT.NONE);
-		label.setText(Messages.SMOAResourceManagerConfigurationWizardPage_Hostname);
-		label.setLayoutData(new GridData());
-
-		host = new Text(myMainComp, SWT.SINGLE | SWT.BORDER);
-		if (conf.getUrl() != null) {
-			host.setText(conf.getUrl());
-		}
-		host.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		host.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				setPageComplete(isValid());
-				conf.setUrl(host.getText());
-			}
-		});
-
-		// PORT
-
-		label = new Label(myMainComp, SWT.NONE);
-		label.setText(Messages.SMOAResourceManagerConfigurationWizardPage_Port);
-		label.setLayoutData(new GridData());
-
-		port = new Spinner(myMainComp, SWT.SINGLE | SWT.BORDER);
-		port.setMaximum(65535);
-		port.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		port.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				final int portNo = Integer.parseInt(port.getText());
-				assert portNo >= 0 && portNo < 65536 : "Java spinner violates boundaries"; //$NON-NLS-1$
-				conf.setPort(portNo);
-			}
-		});
-		if (conf.getPort() != null) {
-			port.setSelection(conf.getPort());
-		} else {
-			port.setSelection(19000);
-		}
-	}
-
-	/** Anonymous authentication part */
-	private Composite createAnonymous(Composite topComposite) {
-		return new Composite(topComposite, SWT.NONE);
-	}
-
-	private void createContents(Composite parent) {
-
-		final GridLayout mainLayout = new GridLayout();
-		mainLayout.numColumns = 1;
-		mainLayout.marginWidth = 0;
-
-		parent.setLayout(mainLayout);
-
-		createAddress(parent);
-
-		new Label(parent, SWT.NONE).setLayoutData(new GridData());
-
-		createUserData(parent);
-	}
-
-	@Override
-	public void createControl(Composite parent) {
-		final Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		createContents(composite);
-		setControl(composite);
-		setPageComplete(isValid());
-	}
-
-	/** GSI authentication part */
-	private Composite createGSI(Composite topComposite) {
-
-		final Composite c = new Composite(topComposite, SWT.NONE);
-		c.setLayout(new GridLayout(2, false));
-
-		new Label(c, SWT.NONE).setText(Messages.SMOAResourceManagerConfigurationWizardPage_ServiceDN);
-
-		gsi_dn = new Text(c, SWT.SINGLE | SWT.BORDER);
-		if (conf.getServiceDN() != null) {
-			gsi_dn.setText(conf.getServiceDN());
-		}
-		gsi_dn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		gsi_dn.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				if (!dn.getText().equals(gsi_dn.getText())) {
-					dn.setText(gsi_dn.getText());
-				}
-			}
-		});
-
-		return c;
-	}
-
-	/** Authentication selection part */
-	private void createUserData(Composite mainComp) {
-
-		final Composite authType = new Composite(mainComp, SWT.NONE);
-		final GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 3;
-		authType.setLayout(gridLayout);
-
-		final GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		authType.setLayoutData(gd);
-
-		final Label l = new Label(authType, SWT.NONE);
-		l.setText(Messages.SMOAResourceManagerConfigurationWizardPage_ChooseAuthenticationType);
-		final GridData gridData = new GridData(GridData.CENTER);
-		gridData.horizontalSpan = 3;
-		l.setLayoutData(gridData);
-
-		anonymous = new Button(authType, SWT.RADIO);
-		anonymous.setText(Messages.SMOAResourceManagerConfigurationWizardPage_AuthTypeAnonymous);
-		anonymous.setLayoutData(new GridData());
-
-		username = new Button(authType, SWT.RADIO);
-		username.setText(Messages.SMOAResourceManagerConfigurationWizardPage_AuthTypeUserTokenProfile);
-		username.setLayoutData(new GridData());
-
-		gsiauth = new Button(authType, SWT.RADIO);
-		gsiauth.setText(Messages.SMOAResourceManagerConfigurationWizardPage_AuthTypeGSI);
-		gsiauth.setLayoutData(new GridData());
-
-		// ///////
-
-		userData = new Composite(mainComp, SWT.NONE);
-		userData.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		stackLayout = new StackLayout();
-		userData.setLayout(stackLayout);
-
-		anonymousTab = createAnonymous(userData);
-		userpasswdTab = createUserPassword(userData);
-		gsiTab = createGSI(userData);
-
-		userData.layout();
-
-		previousAuth = conf.getAuthType();
-		switch (previousAuth) {
-		case Anonymous:
-			anonymous.setSelection(true);
-			toggleUsernamePassword();
-			break;
-		case UsernamePassword:
-			username.setSelection(true);
-			toggleUsernamePassword();
-			break;
-		case GSI:
-			gsiauth.setSelection(true);
-			toggleUsernamePassword();
-			break;
-		}
-
-		anonymous.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-				widgetSelected(arg0);
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				setPageComplete(isValid());
-				toggleUsernamePassword();
-			}
-		});
-
-		username.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-				widgetSelected(arg0);
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				setPageComplete(isValid());
-				toggleUsernamePassword();
-			}
-		});
-
-		gsiauth.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-				widgetSelected(arg0);
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				setPageComplete(isValid());
-				toggleUsernamePassword();
-			}
-		});
-
-	}
-
-	/** User name & password + certificate authentication part */
-	private Composite createUserPassword(Composite topComposite) {
-		GridData gridData;
-		Label l;
-
-		final Composite userPassword = new Composite(topComposite, SWT.NONE);
-
-		userPassword.setLayout(new GridLayout(3, false));
-
-		final GridData gd2 = new GridData(GridData.FILL_HORIZONTAL);
-		gd2.horizontalSpan = 2;
-		userPassword.setLayoutData(gd2);
-
-		// User name
-
-		final Label userLabel = new Label(userPassword, SWT.NONE);
-		userLabel.setText(Messages.SMOAResourceManagerConfigurationWizardPage_Username);
-		userLabel.setLayoutData(new GridData());
-
-		user = new Text(userPassword, SWT.SINGLE | SWT.BORDER);
-		if (conf.getUser() != null) {
-			user.setText(conf.getUser());
-		}
-		gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		user.setLayoutData(gridData);
-
-		user.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				setPageComplete(isValid());
-				conf.setUser(user.getText());
-			}
-		});
-
-		// Password
-
-		final Label passwdLabel = new Label(userPassword, SWT.NONE);
-		passwdLabel.setText(Messages.SMOAResourceManagerConfigurationWizardPage_Password);
-		passwdLabel.setLayoutData(new GridData());
-
-		passwd = new Text(userPassword, SWT.SINGLE | SWT.BORDER | SWT.PASSWORD);
-		if (conf.getPassword() != null) {
-			passwd.setText(conf.getPassword());
-		}
-		gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		passwd.setLayoutData(gridData);
-
-		passwd.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				conf.setPassword(passwd.getText());
-
-			}
-		});
-
-		// CA cert
-
-		l = new Label(userPassword, SWT.NONE);
-		l.setText(Messages.SMOAResourceManagerConfigurationWizardPage_CaCert);
-		l.setLayoutData(new GridData());
-
-		cacert = new Text(userPassword, SWT.SINGLE | SWT.BORDER);
-		if (conf.getCaCertPath() != null) {
-			cacert.setText(conf.getCaCertPath());
-		}
-		cacert.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		final Button cacertBrowser = new Button(userPassword, SWT.PUSH);
-		cacertBrowser.setText(Messages.SMOAResourceManagerConfigurationWizardPage_Browse);
-		cacertBrowser.setLayoutData(new GridData());
-		cacertBrowser.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent arg0) {
-			}
-
-			public void widgetSelected(SelectionEvent arg0) {
-				final FileDialog dialog = new FileDialog(new Shell(), SWT.OPEN);
-				dialog.setFileName(cacert.getText());
-				final String _ = dialog.open();
-				if (null != _) {
-					cacert.setText(_);
-				}
-			}
-		});
-
-		// DN
-
-		final Label label = new Label(userPassword, SWT.NONE);
-		label.setText(Messages.SMOAResourceManagerConfigurationWizardPage_ServiceDN);
-		label.setLayoutData(new GridData());
-
-		dn = new Text(userPassword, SWT.SINGLE | SWT.BORDER);
-		if (conf.getServiceDN() != null) {
-			dn.setText(conf.getServiceDN());
-		}
-		gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		dn.setLayoutData(gridData);
-		dn.setEnabled(!cacert.getText().isEmpty());
-		dn.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				gsi_dn.setText(dn.getText());
-				conf.setServiceDn(dn.getText());
-				setPageComplete(isValid());
-			}
-		});
-
-		// Finalizing
-
-		cacert.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent arg0) {
-				conf.setCacertPath(cacert.getText());
-				dn.setEnabled(!cacert.getText().isEmpty());
-				setPageComplete(isValid());
-			}
-		});
-
-		return userPassword;
-	}
-
-	/**
-	 * Checks if the settings are acceptable (i.e. is it worth to try to connect
-	 * using them)
-	 */
-	public boolean isValid() {
-		if (host != null && host.getText().isEmpty()) {
-			return false;
-		}
-
-		if (username != null && username.getSelection()) {
-			if (user.getText().isEmpty()) {
-				return false;
-			}
-			if ((!cacert.getText().isEmpty()) && (!new File(cacert.getText()).exists())) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/** Reacts on the authentication type change */
-	private void toggleUsernamePassword() {
-
-		if (username.getSelection()) {
-			conf.setAuthType(AuthType.UsernamePassword);
-			stackLayout.topControl = userpasswdTab;
-			userData.layout();
-			if (previousAuth != AuthType.UsernamePassword) {
-				try {
-					previousAuth = AuthType.UsernamePassword;
-					conf.trigerSecureStorage();
-				} catch (final StorageException e) {
-					final MessageBox mb = new MessageBox(getShell(), SWT.ERROR | SWT.OK | SWT.ICON_ERROR);
-					mb.setText(Messages.SMOAResourceManagerConfigurationWizardPage_SecureStorageError);
-					mb.setMessage(e.getLocalizedMessage());
-					mb.open();
-				}
-			}
-		} else if (anonymous.getSelection()) {
-			conf.setAuthType(AuthType.Anonymous);
-			stackLayout.topControl = anonymousTab;
-			userData.layout();
-		} else if (gsiauth.getSelection()) {
-			conf.setAuthType(AuthType.GSI);
-			stackLayout.topControl = gsiTab;
-			userData.layout();
-		} else {
-			throw new RuntimeException("Boo!"); //$NON-NLS-1$
-		}
-
-		previousAuth = conf.getAuthType();
-		setPageComplete(isValid());
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOAResourceManagerFileServicesPage.java b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOAResourceManagerFileServicesPage.java
deleted file mode 100644
index e0799dc..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/SMOAResourceManagerFileServicesPage.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Poznan Supercomputing and Networking Center
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Jan Konczak (PSNC) - initial implementation
- ******************************************************************************/
-
-package org.eclipse.ptp.rm.smoa.ui.wizards;
-
-import java.util.Vector;
-
-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.ui.IRemoteUIServices;
-import org.eclipse.ptp.remote.ui.PTPRemoteUIPlugin;
-import org.eclipse.ptp.rm.smoa.core.SMOARemoteServicesFactory;
-import org.eclipse.ptp.rm.smoa.core.rmsystem.SMOAResourceManagerConfiguration;
-import org.eclipse.ptp.ui.wizards.IRMConfigurationWizard;
-import org.eclipse.ptp.ui.wizards.RMConfigurationWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * Prompts user for selecting desired method of file transfer.
- */
-public class SMOAResourceManagerFileServicesPage extends RMConfigurationWizardPage {
-
-	private Button rbSmoa;
-	private Button rbSsh;
-
-	private Composite connectionComposite;
-	private Combo rservies;
-	private Combo connCombo;
-	private Button newConnection;
-	private Label warnSmoa;
-
-	private final Vector<IRemoteServices> remoteServices = new Vector<IRemoteServices>();
-	private IRemoteConnection[] connections;
-	private int selectedRservices;
-	private final SMOAResourceManagerConfiguration conf;
-
-	public SMOAResourceManagerFileServicesPage(IRMConfigurationWizard wizard) {
-		super(wizard, Messages.SMOAResourceManagerFileServicesPage_FileServicesChoice);
-		setTitle(Messages.SMOAResourceManagerFileServicesPage_FileServicesChoice);
-		setDescription(Messages.SMOAResourceManagerFileServicesPage_FileServicesChoice_description);
-		conf = (SMOAResourceManagerConfiguration) wizard.getBaseConfiguration();
-	}
-
-	private void createChoice(Composite mainComposite) {
-		final Composite typeSelection = new Composite(mainComposite, SWT.NONE);
-		typeSelection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		typeSelection.setLayout(new GridLayout(2, true));
-
-		final Label caption = new Label(typeSelection, SWT.NONE);
-		caption.setText(Messages.SMOAResourceManagerFileServicesPage_ChooseFileTransferMethods);
-		final GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		caption.setLayoutData(gridData);
-
-		rbSmoa = new Button(typeSelection, SWT.RADIO);
-		rbSmoa.setText(Messages.SMOAResourceManagerFileServicesPage_TextForChoosingSmoaOnly);
-
-		rbSsh = new Button(typeSelection, SWT.RADIO);
-		rbSsh.setText(Messages.SMOAResourceManagerFileServicesPage_TextForChoosingAdditionalSsh);
-	}
-
-	private void createConnectionSelector(Composite mainComposite) {
-		connectionComposite = new Composite(mainComposite, SWT.NONE);
-		connectionComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		connectionComposite.setLayout(new GridLayout(3, false));
-
-		new Label(connectionComposite, SWT.NONE).setText(Messages.SMOAResourceManagerFileServicesPage_RemoteServices);
-
-		rservies = new Combo(connectionComposite, SWT.READ_ONLY);
-		final GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
-		gridData.horizontalSpan = 2;
-		rservies.setLayoutData(gridData);
-
-		new Label(connectionComposite, SWT.NONE).setText(Messages.SMOAResourceManagerFileServicesPage_Connection);
-
-		connCombo = new Combo(connectionComposite, SWT.READ_ONLY);
-		connCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		newConnection = new Button(connectionComposite, SWT.PUSH);
-		newConnection.setText(Messages.SMOAResourceManagerFileServicesPage_New);
-
-	}
-
-	@Override
-	public void createControl(Composite parent) {
-		final Composite mainComposite = new Composite(parent, SWT.NONE);
-		mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		setControl(mainComposite);
-
-		final GridLayout mainLayout = new GridLayout();
-		mainComposite.setLayout(mainLayout);
-
-		createChoice(mainComposite);
-
-		createConnectionSelector(mainComposite);
-
-		warnSmoa = new Label(mainComposite, SWT.NONE);
-		warnSmoa.setText(Messages.SMOAResourceManagerFileServicesPage_WarningAboutUsingSmoaOnly);
-		warnSmoa.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		prepareListeners();
-
-		initValues();
-
-		setPageComplete(isValid());
-	}
-
-	private void enableConnSelection(boolean enabled) {
-		for (final Control c : connectionComposite.getChildren()) {
-			c.setEnabled(enabled);
-		}
-	}
-
-	private void initValues() {
-		final IRemoteServices[] _ = PTPRemoteCorePlugin.getDefault().getAllRemoteServices();
-		for (final IRemoteServices services : _) {
-			final String name = services.getName();
-			if (SMOARemoteServicesFactory.ID.equals(services.getId())) {
-				continue;
-			}
-			remoteServices.add(services);
-			rservies.add(name);
-		}
-
-		connCombo.setEnabled(false);
-		newConnection.setEnabled(false);
-
-		selectedRservices = rservies.getSelectionIndex();
-
-		final IRemoteConnection rconn = conf.getFileRemoteConnection();
-		if (rconn == null) {
-			rbSmoa.setSelection(true);
-			enableConnSelection(false);
-		} else {
-			rbSsh.setSelection(true);
-			int index = remoteServices.indexOf(rconn.getRemoteServices());
-			if (index != -1) {
-				rservies.select(index);
-
-				updateConnectionList();
-
-				index = -1;
-				for (int i = 0; i < connections.length; i++) {
-					// Comparing connections is dangerous, RSE messes up
-					if (connections[i].getName().equals(rconn.getName())) {
-						index = i;
-						break;
-					}
-				}
-
-				connCombo.select(index);
-			}
-		}
-	}
-
-	boolean isValid() {
-		return connCombo.getSelectionIndex() != -1 || rbSmoa.getSelection();
-	}
-
-	private void prepareListeners() {
-		rbSmoa.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				enableConnSelection(false);
-				warnSmoa.setVisible(true);
-				conf.setFileRemoteConnection(null);
-				setPageComplete(isValid());
-			}
-		});
-
-		rbSsh.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				enableConnSelection(true);
-				warnSmoa.setVisible(false);
-				setPageComplete(isValid());
-			}
-		});
-
-		rservies.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-
-				if (selectedRservices == rservies.getSelectionIndex()) {
-					return;
-				}
-
-				updateConnectionList();
-				setPageComplete(isValid());
-			}
-		});
-
-		connCombo.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				setPageComplete(isValid());
-
-				final int index = connCombo.getSelectionIndex();
-				conf.setFileRemoteConnection(connections[index]);
-			}
-		});
-
-		newConnection.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				if (selectedRservices == -1) {
-					return;
-				}
-				final IRemoteServices rseServices = remoteServices.get(selectedRservices);
-				final IRemoteUIServices remUIServices = PTPRemoteUIPlugin.getDefault().getRemoteUIServices(rseServices);
-				if (remUIServices == null) {
-					return;
-				}
-
-				final IRemoteConnection rconn = remUIServices.getUIConnectionManager().newConnection(getShell());
-
-				if (rconn == null) {
-					return;
-				}
-
-				updateConnectionList();
-
-				int index = -1;
-				for (int i = 0; i < connections.length; i++) {
-					if (connections[i].getName().equals(rconn.getName())) {
-						index = i;
-						break;
-					}
-				}
-				assert index != -1;
-				connCombo.select(index);
-
-				conf.setFileRemoteConnection(rconn);
-
-				setPageComplete(isValid());
-
-			}
-		});
-	}
-
-	private void updateConnectionList() {
-		selectedRservices = rservies.getSelectionIndex();
-
-		connCombo.removeAll();
-
-		final int index = rservies.getSelectionIndex();
-		connections = remoteServices.get(index).getConnectionManager().getConnections();
-
-		for (final IRemoteConnection conn : connections) {
-			connCombo.add(conn.getName());
-		}
-
-		connCombo.setEnabled(true);
-		newConnection.setEnabled(true);
-	}
-}
diff --git a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/messages.properties b/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/messages.properties
deleted file mode 100644
index 36497d6..0000000
--- a/rms/org.eclipse.ptp.rm.smoa.ui/src/org/eclipse/ptp/rm/smoa/ui/wizards/messages.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-SMOAResourceManagerConfigurationWizardPage_AuthTypeAnonymous=Anonymous
-SMOAResourceManagerConfigurationWizardPage_AuthTypeGSI=GSI
-SMOAResourceManagerConfigurationWizardPage_AuthTypeUserTokenProfile=Username token profile
-SMOAResourceManagerConfigurationWizardPage_Browse=Browse
-SMOAResourceManagerConfigurationWizardPage_CaCert=CA cert: 
-SMOAResourceManagerConfigurationWizardPage_ChooseAuthenticationType=Choose authentication type:
-SMOAResourceManagerConfigurationWizardPage_Hostname=Hostname
-SMOAResourceManagerConfigurationWizardPage_Password=Password:
-SMOAResourceManagerConfigurationWizardPage_Port=Port
-SMOAResourceManagerConfigurationWizardPage_SecureStorageError=Secure storage error\!
-SMOAResourceManagerConfigurationWizardPage_ServiceDN=Service DN:
-SMOAResourceManagerConfigurationWizardPage_SmoaComputingConfiguration=SMOA Computing Configuration
-SMOAResourceManagerConfigurationWizardPage_SmoaComputingConfiguration_description=Enter information to connect to an SMOA Computing system
-SMOAResourceManagerConfigurationWizardPage_Username=Username:
-SMOAResourceManagerFileServicesPage_ChooseFileTransferMethods=Choose file transfer method:
-SMOAResourceManagerFileServicesPage_Connection=Connection:
-SMOAResourceManagerFileServicesPage_FileServicesChoice=File services choice
-SMOAResourceManagerFileServicesPage_FileServicesChoice_description=Choose access method for remote filesystem
-SMOAResourceManagerFileServicesPage_New=New...
-SMOAResourceManagerFileServicesPage_RemoteServices=Remote Services:
-SMOAResourceManagerFileServicesPage_TextForChoosingAdditionalSsh=Additional SSH connection
-SMOAResourceManagerFileServicesPage_TextForChoosingSmoaOnly=SMOA Computing (experimental)
-SMOAResourceManagerFileServicesPage_WarningAboutUsingSmoaOnly=Warning: SMOA file staging routines are not stable.\nUsing only SMOA does not support debugging.\nPlease consider using additional SSH connection using RemoteTools.
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.classpath b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.project b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.project
deleted file mode 100644
index 196b388..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.etfw.feedback.sample</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/etfw/org.eclipse.ptp.etfw.feedback.sample/.settings/org.eclipse.jdt.core.prefs b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a72f27f..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Nov 06 09:51:25 EST 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/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/META-INF/MANIFEST.MF b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/META-INF/MANIFEST.MF
deleted file mode 100644
index 27313d3..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ETFW Feedback Sample
-Bundle-SymbolicName: org.eclipse.ptp.etfw.feedback.sample; singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.etfw.feedback.sample.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.ptp.etfw.feedback;bundle-version="1.0.0",
- org.eclipse.core.resources;bundle-version="3.5.1"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/build.properties b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/build.properties
deleted file mode 100644
index 38d37f7..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = plugin.xml,\
-               META-INF/,\
-               .,\
-               icons/,\
-               data/
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/data/sample.c b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/data/sample.c
deleted file mode 100644
index 2632918..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/data/sample.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- ============================================================================
- Name        : SampleC.c
- Author      : 
- Version     :
- Copyright   : Your copyright notice
- Description : Hello World in C, Ansi-style
- ============================================================================
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(void) {
-	puts("!!!Hello World!!!"); /* prints !!!Hello World!!! */
-	for (int var = 0; var < max; ++var) {
-		puts("loop");
-	}
-	return EXIT_SUCCESS;
-}
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/data/sample.xml b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/data/sample.xml
deleted file mode 100644
index 3198a3b..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/data/sample.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<SampleXMLRoot>
-   <MyItem name="main is here" parent="mysample" file="sample.c" function="main" lineNo="14"  isFunction="true" id="0"/>
-   <MyItem name="loop is here" parent="mysample" file="sample.c" function="main" lineNo="16"  isFunction="true" id="1"/>
-   <MyItem name="this is return" parent="mysample" file="sample.c" function="turkey" lineNo="19"  isFunction="true" id="2"/>
-   <MyItem name="open brace" parent="braces" file="sample.c" function="turkey" lineNo="14"  isFunction="true" id="3"/>
-   <MyItem name="close brace" parent="braces" file="sample.c" function="turkey" lineNo="18"  isFunction="true" id="4"/>
-</SampleXMLRoot>
\ No newline at end of file
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/feedback_action.gif b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/feedback_action.gif
deleted file mode 100644
index 47580d0..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/feedback_action.gif
+++ /dev/null
Binary files differ
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/feedback_view.gif b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/feedback_view.gif
deleted file mode 100644
index 9fa6f8e..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/feedback_view.gif
+++ /dev/null
Binary files differ
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/sample.gif b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/icons/sample.gif
+++ /dev/null
Binary files differ
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/plugin.xml b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/plugin.xml
deleted file mode 100644
index 057b091..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/plugin.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-  
-   <extension
-         point="org.eclipse.ui.menus">
-         
-      <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu?after=additions">
-         <menu
-               label="Feedback"
-               mnemonic="%menu.mnemonic"
-               id="org.eclipse.ptp.etfw.feedback.actions.menus.sampleMenu">
-            <command
-                  commandId="org.eclipse.ptp.etfw.feedback.actions.commands.sampleCommand"
-                  mnemonic="%command.mnemonic"
-                  id="org.eclipse.ptp.etfw.feedback.actions.menus.sampleCommand">
-            </command>
-         </menu>
-      </menuContribution>
-      <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-         <toolbar
-               id="org.eclipse.ptp.etfw.feedback.actions.toolbars.sampleToolbar">
-            <command
-                  commandId="org.eclipse.ptp.etfw.feedback.actions.commands.sampleCommand"
-                  icon="icons/feedback_action.gif"
-                  tooltip="Show ETFw Feedback view for selected XML file"
-                  id="org.eclipse.ptp.etfw.feedback.actions.toolbars.sampleCommand">
-            </command>
-         </toolbar>
-      </menuContribution>
-   </extension>
-   <!--  from other plugin -->
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            name="%category.name.0"
-            id="org.eclipse.ptp.etfw.feedback.actions.commands.category">
-      </category>
-      <command
-            name="%command.name"
-            categoryId="org.eclipse.ptp.etfw.feedback.actions.commands.category"
-            id="org.eclipse.ptp.etfw.feedback.actions.commands.sampleCommand">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            commandId="org.eclipse.ptp.etfw.feedback.actions.commands.sampleCommand"
-            class="org.eclipse.ptp.etfw.feedback.actions.handlers.ShowFeedbackHandler">
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.ui.bindings">
-      <key
-            commandId="org.eclipse.ptp.etfw.feedback.actions.commands.sampleCommand"
-            contextId="org.eclipse.ui.contexts.window"
-            sequence="M1+6"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-   </extension>
-   <!-- -->
-      <extension
-         id="sampleParser"
-         name="Sample PTP Feedback view report items"
-         point="org.eclipse.ptp.etfw.feedback.parser">
-      <feedtype
-            class="org.eclipse.ptp.etfw.feedback.sample.SampleFeedbackParser"
-            id="org.eclipse.ptp.etfw.feedback.sample.parser"
-            name="Sample feedback parser"
-            nodeName="SampleXMLRoot">
-      </feedtype>
-   </extension>
-     <extension
-         point="org.eclipse.ui.views">
-   <!--   <category
-            name="Sample Feedback View"
-            id="org.eclipse.ptp.etfw.feedback">
-      </category>
-      -->
-      <view
-            name="Sample Feedback items"
-            icon="icons/feedback_view.gif"
-            category="org.eclipse.ptp.etfw.feedback"
-            class="org.eclipse.ptp.etfw.feedback.sample.SampleFeedbackView"
-            id="org.eclipse.ptp.etfw.feedback.sample.view">
-      </view>
-   </extension>
-      <extension
-         id="sampleAction"
-         name="Sample Added Action"
-         point="org.eclipse.ptp.etfw.feedback.action">
-      <action
-            class="org.eclipse.ptp.etfw.feedback.sample.actions.SampleFeedbackAction"
-            icon="icons/feedback_action.gif"
-            id="sampleFeedbackAction1"
-            name="Sample Feedback Action"
-            viewID="org.eclipse.ptp.etfw.feedback.sample.view">
-      </action>
-   </extension>
-
-</plugin>
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/Activator.java b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/Activator.java
deleted file mode 100644
index 384bac5..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/Activator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2009,2011 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.etfw.feedback.sample;
-
-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 = "org.eclipse.ptp.etfw.feedback.sample";
-	public static final String MARKER_ID = "org.eclipse.ptp.etfw.feedback.sample.marker";
-	public static final String VIEW_ID = "org.eclipse.ptp.etfw.feedback.sample.view";
-
-	// 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/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackItem.java b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackItem.java
deleted file mode 100644
index 6cfd305..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackItem.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2009,2010 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.etfw.feedback.sample;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.ptp.etfw.feedback.AbstractFeedbackItem;
-import org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem;
-import org.eclipse.ptp.etfw.feedback.sample.internal.FeedbackIDs;
-
-/**
- * @author Beth Tibbitts
- * 
- */
-public class SampleFeedbackItem extends AbstractFeedbackItem implements IFeedbackItem {
-	private String name;
-	private String parentID;
-	private String id;
-	private String description;
-	private String filename;
-	private int lineNo;
-
-	/**
-	 * map of values by attribute name, that the view LabelProvider will want to ask for
-	 */
-	Map<String, String> map = new HashMap<String, String>();
-
-	public SampleFeedbackItem(String name, String parentID, String id, String filename, int lineNo, String description) {
-		this.name = name;
-		this.parentID = parentID;
-		this.id = id;
-		this.filename = filename;
-		this.lineNo = lineNo;
-		this.description = description;
-
-		map.put(FeedbackIDs.FEEDBACK_ATTR_NAME, name);
-		map.put(FeedbackIDs.FEEDBACK_ATTR_FILENAME, filename);
-		map.put(FeedbackIDs.FEEDBACK_ATTR_ID, id);
-		map.put(IMarker.LINE_NUMBER, Integer.toString(lineNo));
-		map.put(FeedbackIDs.FEEDBACK_ATTR_DESC, description);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem#getChildren()
-	 */
-	public List<IFeedbackItem> getChildren() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem#getDescription()
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem#getFile()
-	 */
-	public String getFile() {
-		return filename;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem#getID()
-	 */
-	public String getID() {
-		return id;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem#getLineNoStart()
-	 */
-	public int getLineNoStart() {
-		return this.lineNo;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem#getName()
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem#getParentID()
-	 */
-	public String getParentID() {
-		return parentID;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem#hasChildren()
-	 */
-	public boolean hasChildren() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public Object getObject() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getAttr(String key) {
-		return map.get(key);
-	}
-
-	public Object getObject(String key) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackParser.java b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackParser.java
deleted file mode 100644
index 3cf4f2d..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackParser.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2009,2010 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.etfw.feedback.sample;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.xpath.XPathExpression;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.etfw.feedback.AbstractFeedbackParser;
-import org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-/**
- * Sample parser to return items for the ETFw Feedback view
- * 
- * @author beth
- * 
- */
-public class SampleFeedbackParser extends AbstractFeedbackParser {
-	private boolean traceOn = false;
-	private List<IFeedbackItem> items = new ArrayList<IFeedbackItem>();
-
-	public List<IFeedbackItem> getFeedbackItems(IFile ifile) {
-		if (traceOn)
-			System.out.println("Reading xml file: " + ifile.getLocation());
-
-		items = new ArrayList<IFeedbackItem>();
-		try {
-			items = parse(ifile);
-		} catch (XPathExpressionException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (ParserConfigurationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (SAXException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		return items;
-	}
-
-	/**
-	 * @deprecated use getFeedbackItems(IFile) instead
-	 */
-	public List<IFeedbackItem> getFeedbackItems(File file) {
-		// this is probably twisted around, too much converting back and forth
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IPath location = Path.fromOSString(file.getAbsolutePath());
-		IFile ifile = workspace.getRoot().getFileForLocation(location);
-		List<IFeedbackItem> items = getFeedbackItems(ifile);
-		return items;
-	}
-
-	/**
-	 * Marker ID for markers added by this feedback parser.
-	 * For now they are all the same, using plugin id.
-	 */
-	public String getMarkerID() {
-		return Activator.MARKER_ID;
-	}
-
-	public String getViewID() {
-		return Activator.VIEW_ID;
-	}
-
-	/**
-	 * Populate objects from the xml file given
-	 * 
-	 * @param xmlfile
-	 * @throws ParserConfigurationException
-	 * @throws SAXException
-	 * @throws IOException
-	 * @throws XPathExpressionException
-	 */
-	public List<IFeedbackItem> parse(IFile ifile) throws ParserConfigurationException, SAXException, IOException,
-			XPathExpressionException {
-		List<IFeedbackItem> items = new ArrayList<IFeedbackItem>();
-
-		// We will look for file in same dir as xml file; save its locn here
-		IPath p = ifile.getFullPath();
-		p = p.removeLastSegments(1);
-		String filepath = p.toPortableString() + IPath.SEPARATOR;
-
-		DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
-		domFactory.setNamespaceAware(true); // never forget this!
-		Document document = super.getXMLDocument(ifile);
-		XPathFactory factory = XPathFactory.newInstance();
-		XPath xpath = factory.newXPath();
-
-		/* get the items */
-		XPathExpression expr = xpath.compile("//*[local-name()='MyItem']");
-		Object result = expr.evaluate(document, XPathConstants.NODESET);
-		NodeList nodes = (NodeList) result;
-		for (int i = 0; i < nodes.getLength(); i++) {
-			NamedNodeMap attributes = nodes.item(i).getAttributes();
-			if (attributes == null)
-				continue;
-			try {
-				String name = attributes.getNamedItem("name").getNodeValue();
-				String fname = attributes.getNamedItem("file").getNodeValue();
-				// Remote: assure we save enough info to regurgitate even a remote file
-				// Note: we never had an IResource/IFile for this to begin with.
-				// must create enough info
-				fname = filepath + fname; // fully qualify
-				String function = attributes.getNamedItem("function").getNodeValue();
-				String line = attributes.getNamedItem("lineNo").getNodeValue();
-				int lineNo = Integer.parseInt(line);
-				String id = attributes.getNamedItem("id").getNodeValue();
-				Node parentNode = attributes.getNamedItem("parent");
-				String parentID = "noParent";
-				if (parentNode != null) {
-					parentID = attributes.getNamedItem("parent").getNodeValue();
-				}
-				SampleFeedbackItem item = new SampleFeedbackItem(name, parentID, id, fname, lineNo, function);
-				items.add(item);
-			} catch (Exception e) {
-				System.out.println("SampleFeedbackParser: Exception creating item " + i);
-			}
-
-		}// end for
-
-		if (traceOn)
-			System.out.println("SFP found items: " + items.size() + " elements");
-		return items;
-	}
-
-	/**
-	 * For testing only:
-	 * try to create an IFile/IResource from the info we have
-	 * 
-	 * @param fname
-	 */
-	private void tryCreateFile(String fname, IFile xmlFile) {
-		System.out.println("xmlFile: " + xmlFile);
-		IProject proj = xmlFile.getProject();
-		IResource foundRes = proj.findMember(fname);
-		boolean exists = foundRes.exists();
-		IPath path = foundRes.getFullPath();
-		String s = path.toString();
-		String s2 = path.toPortableString();
-		String s3 = path.toOSString();
-		IResource recreatedRes = getResourceInProject(proj, fname);
-		exists = recreatedRes.exists();
-
-	}
-
-}
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackView.java b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackView.java
deleted file mode 100644
index 4e71441..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleFeedbackView.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.etfw.feedback.sample;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ptp.etfw.feedback.preferences.PreferenceConstants;
-import org.eclipse.ptp.etfw.feedback.sample.internal.FeedbackIDs;
-import org.eclipse.ptp.etfw.feedback.views.SimpleTreeTableMarkerView;
-
-/**
- * Expose xlC compiler transformation information in an eclipse view
- * 
- * @author beth
- * 
- */
-public class SampleFeedbackView extends SimpleTreeTableMarkerView {
-	/**
-	 * Assure that parent nodes will get created as needed: that is,
-	 * we don't have IFeedbackItem objects for the parents. Parent "nodes"
-	 * are created for each unique parentID, thus "categorizing" the items
-	 * automatically
-	 */
-	private static boolean CREATE_PARENT_NODES = true;
-
-	/**
-	 * Attribute names, used to store info in the marker, corresponding to each column in the view.
-	 * Use these constants or values of your own.
-	 * To add/remove a column, modify this: (1)
-	 */
-	private static String[] attrNames = new String[] {
-			FeedbackIDs.FEEDBACK_ATTR_NAME,
-			FeedbackIDs.FEEDBACK_ATTR_FILENAME,
-			FeedbackIDs.FEEDBACK_ATTR_ID,
-			FeedbackIDs.FEEDBACK_ATTR_FUNCTION_CALLEE,
-			IMarker.LINE_NUMBER, // Note: currently column 5 (index=4) must be an int value, presumably line number.
-									// This restriction will be lifted and generalized later.
-			/* IMarker.CHAR_START,IMarker.CHAR_END */
-			FeedbackIDs.FEEDBACK_ATTR_DESC };
-	/** To add/remove a column, modify this: (2) */
-	private static String[] colNames = new String[] { "Type/Name", "File", "ID", "blank", "LineNo",
-			/* "Char start","Char end" */"Description*" };
-	/** To add/remove a column, modify this: (3) */
-	private static int[] widths = new int[] { 160, 100, 50, 50, 80, 200 };
-
-	protected IPreferenceStore preferenceStore;
-	protected boolean maintainExpandCollapseState;
-
-	/**
-	 * Use the ctor that allows an arbitrary number of extra columns.
-	 * This ctor is called (1). FIXME need to generalize the name "Xform" used here?
-	 */
-	public SampleFeedbackView() {
-		super(Activator.getDefault(), "XForm", "XForms", attrNames, colNames, widths,
-				Activator.MARKER_ID, "parent", CREATE_PARENT_NODES);
-		preferenceStore = Activator.getDefault().getPreferenceStore();
-		maintainExpandCollapseState = preferenceStore.getBoolean(PreferenceConstants.P_MAINTAIN_EXPAND_COLLAPSE_STATE);
-
-	}
-
-	/**
-	 * Provide something for the "Info" popup action, based on the marker <br>
-	 * Since we didn't use the Artifact, Artifact Manager, etc in the base class we need something to look useful here.
-	 */
-	@Override
-	public String extractMarkerInfo(IMarker marker) {
-		StringBuffer infoBuffer = new StringBuffer();
-		String filename = marker.getResource().getName();
-		String name = getStrAttr(marker, FeedbackIDs.FEEDBACK_ATTR_NAME);
-		infoBuffer.append("\nThis information provided by SampleFeedbackView.extractMarkerInfo()");
-		infoBuffer.append("\nFile name: ").append(filename);
-
-		infoBuffer.append("\nLine number: ").append(getStrAttr(marker, IMarker.LINE_NUMBER));
-		infoBuffer.append("\nName: ").append(name);
-		String parent = getStrAttr(marker, FeedbackIDs.FEEDBACK_ATTR_PARENT);
-		infoBuffer.append("\nParent (Item type): ").append(parent);
-		infoBuffer.append("\nDescription: ").append(getStrAttr(marker, FeedbackIDs.FEEDBACK_ATTR_DESC));
-		return infoBuffer.toString();
-	}
-
-	public String getStrAttr(IMarker marker, String attrName) {
-		try {
-			String str = marker.getAttribute(attrName).toString();
-
-			return str;
-		} catch (CoreException e) {
-			System.out.println("Exception getting marker attr in CompilerXFormTreeTableView.getStrAttr() " + e.getMessage());
-			return "*error*";
-		}
-
-	}
-
-	/**
-	 * 
-	 */
-	@Override
-	protected void maintainExpandCollapseStatus() {
-		// re-query each time, in case prefs have changed
-		maintainExpandCollapseState = preferenceStore.getBoolean(PreferenceConstants.P_MAINTAIN_EXPAND_COLLAPSE_STATE);
-		if (maintainExpandCollapseState) {
-			switch (expandCollapseStatus) {
-			case EXPAND_COLLAPSE_EXPANDALL:
-				expandAllAction.run();
-				break;
-			case EXPAND_COLLAPSE_COLLAPSEALL:
-				collapseAllAction.run();
-				break;
-			case EXPAND_COLLAPSE_NONE:
-				// do nothing: user hasn't done expandAll or collapseAll yet.
-			}
-		}
-	}
-
-}
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleShowFeedbackHandler.java b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleShowFeedbackHandler.java
deleted file mode 100644
index 0895906..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/SampleShowFeedbackHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2009 IBM Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.ptp.etfw.feedback.sample;
-
-import org.eclipse.ptp.etfw.feedback.actions.handlers.ShowFeedbackHandler;
-
-/**
- * Handler to handle actions from this plug-in to show its data in the Feedback View
- * 
- * @author beth tibbitts
- * 
- */
-public class SampleShowFeedbackHandler extends ShowFeedbackHandler {
-
-}
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/actions/SampleFeedbackAction.java b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/actions/SampleFeedbackAction.java
deleted file mode 100644
index cdc4b83..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/actions/SampleFeedbackAction.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2010 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.etfw.feedback.sample.actions;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ptp.etfw.feedback.AbstractFeedbackAction;
-import org.eclipse.ptp.etfw.feedback.obj.IFeedbackItem;
-import org.eclipse.ptp.etfw.feedback.sample.Activator;
-
-/**
- * A sample action that can be added to the ETFw Feedback view
- * 
- * @author beth
- * 
- */
-public class SampleFeedbackAction extends AbstractFeedbackAction {
-
-	public void run(IMarker marker) {
-		String name = "(unknown)";
-		try {
-			name = (String) marker.getAttribute("name");
-		} catch (CoreException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		MessageDialog.openInformation(null, "Sample action", "Do something interesting here with marker: " + name);
-
-	}
-
-	public void run(IFeedbackItem item) {
-		MessageDialog.openInformation(null, "Sample action", "Do something interesting here with IFeedbackItem");
-
-	}
-
-	public String getToolTip() {
-		return "SampleFeedbackAction tooltip";
-	}
-
-	@Override
-	public String getText() {
-		return "SampleFeedbackAction text";
-	}
-
-	@Override
-	public String getPluginId() {
-		return Activator.PLUGIN_ID;
-	}
-
-}
diff --git a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/internal/FeedbackIDs.java b/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/internal/FeedbackIDs.java
deleted file mode 100644
index bbdabe3..0000000
--- a/tools/etfw/org.eclipse.ptp.etfw.feedback.sample/src/org/eclipse/ptp/etfw/feedback/sample/internal/FeedbackIDs.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2009,2011 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.etfw.feedback.sample.internal;
-
-/**
- * Feedback view Plugin constants
- * 
- * <p>
- * <strong>EXPERIMENTAL</strong>. This class or interface has been added as part of a work in progress. There is no guarantee that
- * this API will work or that it will remain the same. We do not recommending using this API without consulting with the
- * etfw.feedback team.
- */
-public interface FeedbackIDs
-{
-
-	/** View ID */
-	String FEEDBACK_VIEW_ID = "org.eclipse.ptp.etfw.feedback.views.feedbackView"; //$NON-NLS-1$
-
-	// attribute names
-	String FEEDBACK_ATTR_NAME = "name"; //$NON-NLS-1$
-	String FEEDBACK_ATTR_ID = "itemID"; //$NON-NLS-1$
-	String FEEDBACK_ATTR_FILENAME = "filename"; //$NON-NLS-1$
-	String FEEDBACK_ATTR_PATHNAME = "pathname"; //$NON-NLS-1$
-	String FEEDBACK_ATTR_PARENT = "parent"; //$NON-NLS-1$
-	String FEEDBACK_ATTR_FUNCTION = "functionCaller"; //$NON-NLS-1$
-	String FEEDBACK_ATTR_FUNCTION_CALLEE = "functionCallee"; // unused? others? //$NON-NLS-1$
-	String FEEDBACK_ATTR_DESC = "description"; //$NON-NLS-1$
-	String FEEDBACK_ATTR_LOOP_ID = "LoopId"; //attr name in xml file AND attr name in marker //$NON-NLS-1$
-	// //Note: we use IMarker.LINE_NUMBER too
-
-	/**
-	 * @since 5.0
-	 */
-	String FEEDBACK_ATTR_ITEM = "item"; //$NON-NLS-1$
-
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.classpath b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.cvsignore
deleted file mode 100644
index cd73485..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-bin
-@dot
-icons-old
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.project b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.project
deleted file mode 100644
index c50ef92..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.mpi.fortran</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 310a180..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Apr 16 12:51:09 EDT 2010
-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/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/META-INF/MANIFEST.MF
deleted file mode 100644
index 3aa32e3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/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.mpi.fortran;singleton:=true
-Bundle-Version: 5.0.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.ptp.pldt.mpi.fortran.Activator
-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.photran.cdtinterface;bundle-version="7.0.0",
- org.eclipse.photran.core.vpg;bundle-version="7.0.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/about.html b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/build.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/build.properties
deleted file mode 100644
index 41c9fe3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/plugin.properties
deleted file mode 100644
index 71c91e8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/plugin.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2011 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 Parallel Language Development Tools Fortran MPI Support
-pluginProvider=Eclipse.org
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/pom.xml b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/pom.xml
deleted file mode 100644
index 44db3f3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse.ptp</groupId>
-    <artifactId>ptp-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <relativePath>../../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.ptp.pldt.mpi.fortran</artifactId>
-  <version>5.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/Activator.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/Activator.java
deleted file mode 100644
index 14ac9cc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/Activator.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2011 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.mpi.fortran;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used for MPI development Tools.
- */
-public class Activator extends AbstractUIPlugin {
-	/** The shared instance */
-	private static Activator plugin;
-	protected static final boolean traceOn = false;
-
-	private static final String PLUGIN_ID = "org.eclipse.ptp.pldt.mpi.fortran"; //$NON-NLS-1$
-
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * Returns the standard display to be used. The method first checks, if the
-	 * thread calling this method has an associated display. If so, this display
-	 * is returned. Otherwise the method returns the default display.
-	 */
-	public static Display getStandardDisplay() {
-		Display display;
-		display = Display.getCurrent();
-		if (display == null) {
-			display = Display.getDefault();
-		}
-		return display;
-	}
-
-	public static String getPluginId() {
-		return PLUGIN_ID;
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/actions/AnalyseMPIFortranHandler.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/actions/AnalyseMPIFortranHandler.java
deleted file mode 100644
index 08d02d8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/actions/AnalyseMPIFortranHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2010 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.mpi.fortran.actions;
-
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.photran.internal.cdtinterface.core.FortranLanguage;
-import org.eclipse.photran.internal.core.lexer.ASTLexerFactory;
-import org.eclipse.photran.internal.core.parser.ASTExecutableProgramNode;
-import org.eclipse.photran.internal.core.parser.Parser;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.mpi.fortran.analysis.MpiFortranASTVisitor;
-
-/**
- * @since 4.0
- */
-public class AnalyseMPIFortranHandler {
-	public void run(String languageID, ITranslationUnit tu, String fileName, ScanReturn msr) {
-		if (languageID.equals(FortranLanguage.LANGUAGE_ID)) {
-			IResource res = tu.getUnderlyingResource();
-			if (!(res instanceof IFile))
-				throw new IllegalStateException();
-			IFile file = (IFile) res;
-
-			try {
-				ASTExecutableProgramNode ast = new Parser().parse(new ASTLexerFactory().createLexer(file));
-				ast.accept(new MpiFortranASTVisitor(fileName, msr));
-			} catch (Exception e) {
-				e.printStackTrace(); // TODO
-			}
-		}
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/analysis/MpiFortranASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/analysis/MpiFortranASTVisitor.java
deleted file mode 100644
index 1437a64..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.mpi.fortran/src/org/eclipse/ptp/pldt/mpi/fortran/analysis/MpiFortranASTVisitor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2010 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.mpi.fortran.analysis;
-
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.parser.ASTCallStmtNode;
-import org.eclipse.photran.internal.core.parser.ASTNameNode;
-import org.eclipse.photran.internal.core.parser.ASTVarOrFnRefNode;
-import org.eclipse.photran.internal.core.parser.GenericASTVisitor;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-
-/**
- * This dom-walker collects "artifacts" related to the specific domain <br>
- * (e.g. MPI, OpenMP, etc.). Currently these artifacts include function calls
- * and constants. It adds markers to the source file for C code, marking the
- * position of the artifacts found.
- * 
- * @author Beth Tibbitts
- * @since 4.0
- * 
- */
-public class MpiFortranASTVisitor extends GenericASTVisitor {
-	private static final String PREFIX = "MPI_"; //$NON-NLS-1$
-
-	@SuppressWarnings("unused")
-	private static final boolean traceOn = false;
-	private final ScanReturn scanReturn;
-	private final String fileName;
-
-	@Override
-	public void visitASTCallStmtNode(ASTCallStmtNode node) {
-		Token subroutineName = node.getSubroutineName();
-		addArtifact(subroutineName, Artifact.FUNCTION_CALL);
-	}
-
-	@Override
-	public void visitASTVarOrFnRefNode(ASTVarOrFnRefNode node) {
-		ASTNameNode nameNode = node.getName();
-		if (nameNode != null) {
-			Token varName = nameNode.getName();
-			addArtifact(varName, Artifact.CONSTANT);
-		}
-	}
-
-	private void addArtifact(Token subroutineName, int artifactType) {
-		String callname = subroutineName.getText().toUpperCase();
-		if (callname.startsWith(PREFIX)) {
-			int start = subroutineName.getFileOffset();
-			int end = subroutineName.getFileOffset() + subroutineName.getLength();
-			SourceInfo si = new SourceInfo(subroutineName.getLine(), start, end, artifactType);
-			scanReturn.addArtifact(new Artifact(fileName, subroutineName.getLine(), 1, callname, si));
-		}
-	}
-
-	public MpiFortranASTVisitor(String fileName, ScanReturn scanReturn) {
-		super();
-		this.scanReturn = scanReturn;
-		this.fileName = fileName;
-	}
-
-}
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.classpath b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.cvsignore b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.cvsignore
deleted file mode 100644
index 47e3103..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-@dot
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.project b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.project
deleted file mode 100644
index 1404cdc..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.openmp.fortran</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>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6bbf0a1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Apr 16 12:52:10 EDT 2010
-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/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/META-INF/MANIFEST.MF
deleted file mode 100644
index 4ef5d33..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/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.openmp.fortran;singleton:=true
-Bundle-Version: 5.0.0.qualifier
-Bundle-Activator: org.eclipse.ptp.pldt.openmp.fortran.Activator
-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.ptp.pldt.common,
- org.eclipse.photran.cdtinterface,
- org.eclipse.photran.core,
- org.eclipse.photran.core.vpg
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/about.html b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/about.html
deleted file mode 100644
index 3f81093..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/build.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/build.properties
deleted file mode 100644
index b67aba1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/plugin.properties b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/plugin.properties
deleted file mode 100644
index 191fca1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/plugin.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#    test plugin.properties
-# These names will be used in plugin.xml 
-#
-
-pluginName=PTP Parallel Language Development Tools OpenMP Core
-pluginProvider=Eclipse.org
-
-OpenMP.name=OpenMP
-
-view.name=OpenMP Artifact View
-viewcat.name=PTP OpenMP Views
-run.label=Run OpenMP Analysis
-run.tooltip=Run OpenMP Analysis on selected file, folder, or project to find  Artifacts
-
-#need to add more
-extension.name = OpenMP Artifact Marker
-specification.label = OpenMP Annotation Marker
-page.name = OpenMP
-command.name = Show OpenMP artifacts
-extension.name.0 = tempNAME
-command.label = Show OpenMP Artifacts
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/pom.xml b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/pom.xml
deleted file mode 100644
index b2111c6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse.ptp</groupId>
-    <artifactId>ptp-parent</artifactId>
-    <version>6.0.0-SNAPSHOT</version>
-    <relativePath>../../../pom.xml</relativePath>
-  </parent>
-
-  <artifactId>org.eclipse.ptp.pldt.openmp.fortran</artifactId>
-  <version>5.0.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/Activator.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/Activator.java
deleted file mode 100644
index f5b162a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/Activator.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005,2011 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.openmp.fortran;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The shared instance.
-	private static Activator plugin;
-	public static final String PLUGIN_ID = "org.eclipse.ptp.pldt.openmp.fortran"; //$NON-NLS-1$
-
-	/**
-	 * The constructor.
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	public static String getPluginId() {
-		return PLUGIN_ID;
-	}
-
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/actions/AnalyseOpenMPFortranHandler.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/actions/AnalyseOpenMPFortranHandler.java
deleted file mode 100644
index 87587c1..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/actions/AnalyseOpenMPFortranHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2010 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.openmp.fortran.actions;
-
-import org.eclipse.cdt.core.model.ITranslationUnit;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.photran.internal.cdtinterface.core.FortranLanguage;
-import org.eclipse.photran.internal.core.lexer.ASTLexerFactory;
-import org.eclipse.photran.internal.core.parser.ASTExecutableProgramNode;
-import org.eclipse.photran.internal.core.parser.Parser;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.openmp.fortran.analysis.OpenMPFortranASTVisitor;
-
-/**
- * @since 4.0
- */
-public class AnalyseOpenMPFortranHandler {
-	public void run(String languageID, ITranslationUnit tu, String fileName, ScanReturn msr) {
-		if (languageID.equals(FortranLanguage.LANGUAGE_ID)) {
-			IResource res = tu.getUnderlyingResource();
-			if (!(res instanceof IFile))
-				throw new IllegalStateException();
-			IFile file = (IFile) res;
-
-			try {
-				ASTExecutableProgramNode ast = new Parser().parse(new ASTLexerFactory().createLexer(file));
-				ast.accept(new OpenMPFortranASTVisitor(fileName, msr));
-			} catch (Exception e) {
-				e.printStackTrace(); // TODO
-			}
-		}
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/analysis/OpenMPFortranASTVisitor.java b/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/analysis/OpenMPFortranASTVisitor.java
deleted file mode 100644
index 4d0eddf..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.openmp.fortran/src/org/eclipse/ptp/pldt/openmp/fortran/analysis/OpenMPFortranASTVisitor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2010 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.openmp.fortran.analysis;
-
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.parser.ASTNameNode;
-import org.eclipse.photran.internal.core.parser.ASTVarOrFnRefNode;
-import org.eclipse.photran.internal.core.parser.GenericASTVisitor;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ScanReturn;
-import org.eclipse.ptp.pldt.common.util.SourceInfo;
-
-/**
- * This visitor collects OpenMP related constructs (currently function calls and constants), and
- * add markers to the source file for Fortran code.
- * 
- * @author Jeff Overbey
- * @author Beth Tibbitts
- */
-public class OpenMPFortranASTVisitor extends GenericASTVisitor {
-	private static final String PREFIX = "OMP_"; //$NON-NLS-1$
-
-	private ScanReturn scanReturn;
-	private String fileName;
-
-	public OpenMPFortranASTVisitor(String fileName, ScanReturn scanReturn) {
-		this.scanReturn = scanReturn;
-		this.fileName = fileName;
-	}
-
-	@Override
-	public void visitToken(Token node) {
-		/*
-		 * In Fortran, OpenMP directives are comments (e.g., !$omp parallel).
-		 * Photran attaches comments to the following token. Since they appear
-		 * before several types of statements (including END statements), it's
-		 * easiest to just iterate through all the tokens in the AST and collect
-		 * the preceding OpenMP directives.
-		 */
-		for (Token ompDirective : node.getOpenMPComments()) {
-			addArtifact(ompDirective, Artifact.PRAGMA);
-		}
-	}
-
-	@Override
-	public void visitASTVarOrFnRefNode(ASTVarOrFnRefNode node) {
-		ASTNameNode nameNode = node.getName();
-		if (nameNode != null) { // function call
-			addArtifact(nameNode.getName(), Artifact.FUNCTION_CALL);
-		}
-	}
-
-	private void addArtifact(Token token, int artifactType) {
-		String callname = token.getText().toUpperCase();
-		if (artifactType == Artifact.PRAGMA || callname.startsWith(PREFIX)) {
-			int start = token.getFileOffset();
-			int end = token.getFileOffset() + token.getLength();
-			SourceInfo si = new SourceInfo(token.getLine(), start, end, artifactType);
-			scanReturn.addArtifact(new Artifact(fileName, token.getLine(), 1, callname, si));
-		}
-	}
-}
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/.classpath b/tools/pldt/org.eclipse.ptp.pldt.tests/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/.project b/tools/pldt/org.eclipse.ptp.pldt.tests/.project
deleted file mode 100644
index edd88d3..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.ptp.pldt.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/.settings/org.eclipse.jdt.core.prefs b/tools/pldt/org.eclipse.ptp.pldt.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9fda8be..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Thu Jun 19 09:17:08 EDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/META-INF/MANIFEST.MF b/tools/pldt/org.eclipse.ptp.pldt.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index db83e3b..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: PLDT Tests Plug-in
-Bundle-SymbolicName: org.eclipse.ptp.pldt.tests
-Bundle-Version: 1.0.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit;bundle-version="3.8.2",
- org.eclipse.cdt.core.tests,
- org.eclipse.core.resources,
- org.eclipse.cdt.core,
- org.eclipse.ptp.pldt.common,
- org.eclipse.ptp.pldt.mpi.core,
- org.eclipse.ptp.pldt.openmp.core,
- org.eclipse.ptp.pldt.openmp.analysis,
- org.eclipse.ptp.pldt.openmp.ui.pv,
- org.eclipse.ptp.pldt.mpi.analysis,
- org.eclipse.ptp.pldt.upc
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Activator: org.eclipse.ptp.pldt.tests.Activator
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/build.properties b/tools/pldt/org.eclipse.ptp.pldt.tests/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/HelloFortranMPI.f90 b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/HelloFortranMPI.f90
deleted file mode 100644
index 5285547..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/HelloFortranMPI.f90
+++ /dev/null
@@ -1,109 +0,0 @@
-! ============================================================================
-! Name        : HelloFortranMPI.f90
-! Author      : Polly Parallel
-! Version     :
-! Copyright   : Your copyright notice
-! Description : Calculate Pi in MPI
-! ============================================================================
-
-subroutine calc_pi(rank, num_procs)
-    use mpi
-    implicit none
-
-    integer, intent(in) :: rank
-    integer, intent(in) :: num_procs
-
-    integer          :: i
-    integer          :: ierror
-    integer          :: num_intervals
-    double precision :: h
-    double precision :: mypi
-    double precision :: pi
-    double precision :: sum
-    double precision :: x
-
-    ! set number of intervals to calculate
-    if (rank == 0) num_intervals = 100000000
-
-    ! tell other tasks how many intervals
-    call MPI_Bcast(num_intervals, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierror)
-
-    ! now everyone does their calculation
-
-    h = 1.0d0 / num_intervals
-    sum = 0.0d0
-
-    do i = rank + 1, num_intervals, num_procs
-        x = h * (i - 0.5d0);
-        sum = sum + (4.0d0 / (1.0d0 + x*x))
-    end do
-
-    mypi = h * sum
-
-    ! combine everyone's calculations
-    call MPI_Reduce(mypi, pi, 1, MPI_DOUBLE_PRECISION, MPI_SUM, 0, &
-        MPI_COMM_WORLD, ierror)
-
-    if (rank == 0) print *, "PI is approximately ", pi
-end subroutine
-
-program mpi_pi_example
-    use mpi
-    implicit none
-
-    integer, parameter :: LEN = 100               ! message length
-
-    integer            :: ierror                  ! error code
-    integer            :: my_rank                 ! rank of process
-    integer            :: num_procs               ! number of processes
-    integer            :: source                  ! rank of sender
-    integer            :: dest                    ! rank of receiver
-    integer            :: tag                     ! tag for messages
-    character(len=LEN) :: message                 ! storage for message
-    integer            :: status(MPI_STATUS_SIZE) ! return status for receive
-
-    dest = 0
-    tag = 0
-
-    ! start up MPI
-
-    call MPI_Init(ierror)
-
-    ! find out process rank
-    call MPI_Comm_rank(MPI_COMM_WORLD, my_rank, ierror)
-
-    ! find out number of processes
-    call MPI_Comm_size(MPI_COMM_WORLD, num_procs, ierror)
-
-
-    if (my_rank .ne. 0) then
-        ! create message
-        write (message, *) "Greetings from process ", my_rank
-        call MPI_Send(message, LEN, MPI_CHARACTER, &
-                dest, tag, MPI_COMM_WORLD, ierror)
-    else
-        print *, "Num processes: ", num_procs
-        do source = 1, num_procs-1
-            call MPI_Recv(message, LEN, MPI_CHARACTER, source, tag, &
-                    MPI_COMM_WORLD, status, ierror)
-            print *, "Process 0 received ", message
-        end do
-
-        ! now return the compliment
-        write (message, *) "Hi, how are you?"
-    end if
-
-    call MPI_Bcast(message, LEN, MPI_CHARACTER, dest, MPI_COMM_WORLD, ierror)
-
-    if (my_rank .ne. 0) then
-        print *, "Process ", my_rank, " received ", message
-    end if
-
-    ! calculate PI
-    call calc_pi(my_rank, num_procs)
-
-    ! shut down MPI
-    call MPI_Finalize(ierror)
-
-    stop
-end program
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloMPIcpp.cpp b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloMPIcpp.cpp
deleted file mode 100644
index 8b17e76..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloMPIcpp.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- ============================================================================
- Name        : helloMPIcpp.c
- Author      : Polly Parallel
- Version     :
- Copyright   : Your copyright notice
- Description : Compute Pi in MPI C++
- ============================================================================
- */
-#include <math.h>
-#include "mpi.h"
-#include <iostream>
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-    int n, rank, size, i;
-    double PI25DT = 3.141592653589793238462643;
-    double mypi, pi, h, sum, x;
-
-
-    MPI::Init(argc, argv);
-    size = MPI::COMM_WORLD.Get_size();
-    rank = MPI::COMM_WORLD.Get_rank();
-
-    MPI_Comm_rank(MPI_COMM_WORLD, &my_rank);// test of MPI_form
-
-    while (1) {
-	if (rank == 0) {
-
-		 cout << "Enter the number of intervals: (0 quits)"
-				 << endl;
-			    cin >> n;
-
-	}
-
-	MPI::COMM_WORLD.Bcast(&n, 1, MPI::INT, 0);
-	if (n==0)
-	    break;
-	else {
-	    h = 1.0 / (double) n;
-	    sum = 0.0;
-	    for (i = rank + 1; i <= n; i += size) {
-		x = h * ((double)i - 0.5);
-		sum += (4.0 / (1.0 + x*x));
-	    }
-	    mypi = h * sum;
-
-	    MPI::COMM_WORLD.Reduce(&mypi, &pi, 1, MPI::DOUBLE,
-				   MPI::SUM, 0);
-	    if (rank == 0)
-		cout << "pi is approximately " << pi
-		     << ", Error is " << fabs(pi - PI25DT)
-		     << endl;
-	}
-    }
-    MPI::Finalize();
-    return 0;
-}
-
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloOpenMP.c b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloOpenMP.c
deleted file mode 100644
index 381058e..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloOpenMP.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <omp.h>
-#include <stdio.h>
-#include <stdlib.h>
-/**
- * Hello OpenMP World prints the number of threads and the current thread id
- */
-int main (int argc, char *argv[]) {
-
-  int numThreads, tid;
-
-  /* This creates a team of threads; each thread has own copy of variables  */
-#pragma omp parallel private(numThreads, tid)
- {
-   tid = omp_get_thread_num();
-   printf("Hello World from thread number %d\n", tid);
-
-   /* The following is executed by the master thread only (tid=0) */
-   if (tid == 0)
-     {
-       numThreads = omp_get_num_threads();
-       printf("Number of threads is %d\n", numThreads);
-     }
- }
- return 0;
-}
-
-
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloOpenMPpragmas.c b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloOpenMPpragmas.c
deleted file mode 100644
index 726f304..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/helloOpenMPpragmas.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- ============================================================================
- Name        : helloOpenMP2.c
- Author      : Polly Parallel
- Version     :
- Copyright   : Your copyright notice
- Description : Hello OpenMP World in C
- ============================================================================
- */
-#include <omp.h>
-#include <stdio.h>
-#include <stdlib.h>
-/**
- * Hello OpenMP World prints the number of threads and the current thread id
- */
-int main (int argc, char *argv[]) {
-
-  int numThreads, tid;
-
-  /* This creates a team of threads; each thread has own copy of variables  */
-#pragma omp parallel private(numThreads, tid)
- {
-   tid = omp_get_thread_num();
-   printf("Hello World from thread number %d\n", tid);
-
-   /* The following is executed by the master thread only (tid=0) */
-   if (tid == 0)
-     {
-       numThreads = omp_get_num_threads();
-       printf("Number of threads is %d\n", numThreads);
-     }
- }
- // more pragmas, testing their region/scope
-#pragma omp parallel shared(n,a,b)
- {
-   #pragma omp for
-   for (int i=0; i<n; i++)
-   {
-       a[i] = i + 1;
-       #pragma omp parallel for /*-- Okay - This is a parallel region --*/
-       for (int j=0; j<n; j++)
-           b[i][j] = a[i];
-   }
- } /*-- End of parallel region --*/
- return 0;
-}
-
-
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/includes/readme.txt b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/includes/readme.txt
deleted file mode 100644
index a2b0fa8..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/includes/readme.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-this test suite assumes various header files are available in order to run the analysis tests.
-
-To run the tests you will need to put header files in this directory.
-
-For example mpi.h,  such as from openmpi.
-
-The header files you need are indicated near the top of each testcase function
-with a method call to import the required header file.
-For example, in Test_MPI.java, the testMPIartifacts() method has this near the top:
-
-     IFile mpiInclude = importFile("resources/includes","mpi.h");
-     
-     
-     Beth Tibbitts
-     April 2010
-     
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/openMP.f90 b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/openMP.f90
deleted file mode 100644
index b34fb3a..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/openMP.f90
+++ /dev/null
@@ -1,12 +0,0 @@
-! This is a sample OpenMP program  
-program OpenMP                                     
-    integer :: num_threads, id                     
-    !$omp parallel private(num_threads, id)        
-    id = omp_get_thread_num()
-    print *, 'This is thread ', id
-     if (id == 0) then
-      num_threads = omp_get_num_threads()
-      print *, 'Total threads: ', num_threads
-    end if
-    !$omp end parallel
-end program 
\ No newline at end of file
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPI.c b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPI.c
deleted file mode 100644
index efa16ce..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPI.c
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "mpi.h"
-// Sample MPI program
-int main(int argc, char* argv[]){
-	printf("Hello MPI PTP World!\n");	
-	int  my_rank; /* rank of process */
-	int  p;       /* number of processes */
-	int source;   /* rank of sender */
-	int dest;     /* rank of receiver */
-	int tag=0;    /* tag for messages */
-	char message[100];        /* storage for message */
-	MPI_Status status ;   /* return status for receive */
-	
-	/* start up MPI */
-	
-	MPI_Init(&argc, &argv);
-	
-	/* find out process rank */
-	MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); 
-	
-	/* find out number of processes */
-	MPI_Comm_size(MPI_COMM_WORLD, &p); 
-	
-	
-	if (my_rank !=0){
-		/* create message */
-		sprintf(message, "Greetings from process %d!", my_rank);
-		dest = 0;
-		/* use strlen+1 so that '\0' get transmitted */
-		MPI_Send(message, strlen(message)+1, MPI_CHAR,
-		   dest, tag, MPI_COMM_WORLD);
-	}
-	else{
-		printf("From process 0: Num processes: %d\n",p);
-		for (source = 1; source < p; source++) {
-			MPI_Recv(message, 100, MPI_CHAR, source, tag,
-			      MPI_COMM_WORLD, &status);
-			printf("%s\n",message);
-		}
-	}
-	/* shut down MPI */
-	MPI_Finalize(); 
-	
-	
-	return 0;
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIMacro.c b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIMacro.c
deleted file mode 100644
index be5d7ff..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIMacro.c
+++ /dev/null
@@ -1,35 +0,0 @@
-// test recognition of artifacts within preprocessor
-// Note that this is ridiculous code, only used for testing
-#include <mpi.h>
-
-/* for any error messages returned by LAPI */
-char err_msg_buf[MPI_MAX_ERR_STRING];
-#define FOO MPI_Init(&argc, &argv)
-
-#define CHECK(func_and_args)                                      \
-{                                                                 \
-    int rc;                                                       \
-    if ((rc = (func_and_args)) != MPI_SUCCESS) {                 \
-        MPI_Address(rc, 0);                                      \
-        fprintf(stderr,                                           \
-                "MPI returns error message: %s, rc = %d\n",      \
-                 err_msg_buf, rc);                                \
-        exit(1);                                                  \
-    }                                                             \
-                                                                  \
-}
-
-
-
-void do_accumulate(foo_handle_t *handle, void *param)
-{
-	FOO;
-	MPI_Send(null,0,null,0,0,0); // artifact not within preproc
-    CHECK((MPI_Send(*handle, buddy,
-                       (void *)(hdr_hdl_list[buddy]), &uhdr,
-                        sizeof(uhdr_t), &(data_buffer[0]),
-                        len*(sizeof(data_buffer[0])),
-                        NULL, NULL, NULL)));
-
-}
- 
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriers.c b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriers.c
deleted file mode 100644
index 1bd95c4..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriers.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "mpi.h"
-// Sample MPI program
-int main(int argc, char* argv[]){
-	printf("Hello MPI PTP World!\n");	
-	int  my_rank; /* rank of process */
-	int  p;       /* number of processes */
-	int source;   /* rank of sender */
-	int dest;     /* rank of receiver */
-	int tag=0;    /* tag for messages */
-	char message[100];        /* storage for message */
-	MPI_Status status ;   /* return status for receive */
-	
-	/* start up MPI */
-	
-	MPI_Init(&argc, &argv);
-	
-	/* find out process rank */
-	MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); 
-	
-	/* find out number of processes */
-	MPI_Comm_size(MPI_COMM_WORLD, &p); 
-	
-	
-	if (my_rank !=0){
-		/* create message */
-		sprintf(message, "Greetings from process %d!", my_rank);
-		dest = 0;
-		/* use strlen+1 so that '\0' get transmitted */
-		MPI_Send(message, strlen(message)+1, MPI_CHAR,
-		   dest, tag, MPI_COMM_WORLD);
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	else{
-		printf("From process 0: Num processes: %d\n",p);
-		for (source = 1; source < p; source++) {
-			MPI_Recv(message, 100, MPI_CHAR, source, tag,
-			      MPI_COMM_WORLD, &status);
-			printf("%s\n",message);
-		}
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	/* shut down MPI */
-	MPI_Finalize(); 
-	
-	
-	return 0;
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersErr.c b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersErr.c
deleted file mode 100644
index 7934a06..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersErr.c
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "mpi.h"
-// Sample MPI program
-int main(int argc, char* argv[]){
-	printf("Hello MPI PTP World!\n");	
-	int  my_rank; /* rank of process */
-	int  p;       /* number of processes */
-	int source;   /* rank of sender */
-	int dest;     /* rank of receiver */
-	int tag=0;    /* tag for messages */
-	char message[100];        /* storage for message */
-	MPI_Status status ;   /* return status for receive */
-	
-	/* start up MPI */
-	
-	MPI_Init(&argc, &argv);
-	
-	/* find out process rank */
-	MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); 
-	
-	/* find out number of processes */
-	MPI_Comm_size(MPI_COMM_WORLD, &p); 
-	
-	
-	if (my_rank !=0){
-		/* create message */
-		sprintf(message, "Greetings from process %d!", my_rank);
-		dest = 0;
-		/* use strlen+1 so that '\0' get transmitted */
-		MPI_Send(message, strlen(message)+1, MPI_CHAR,
-		   dest, tag, MPI_COMM_WORLD);
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	else{
-		printf("From process 0: Num processes: %d\n",p);
-		for (source = 1; source < p; source++) {
-			MPI_Recv(message, 100, MPI_CHAR, source, tag,
-			      MPI_COMM_WORLD, &status);
-			printf("%s\n",message);
-		}
-		//MPI_Barrier(MPI_COMM_WORLD);
-	}
-	/* shut down MPI */
-	MPI_Finalize(); 
-	
-	
-	return 0;
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersFnCall.c b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersFnCall.c
deleted file mode 100644
index e80d5af..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersFnCall.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "mpi.h"
-// Sample MPI program
-int myBarrier(){
-	MPI_Barrier(MPI_COMM_WORLD);
-}
-int main(int argc, char* argv[]){
-	printf("Hello MPI PTP World!\n");	
-	int  my_rank; /* rank of process */
-	int  p;       /* number of processes */
-	int source;   /* rank of sender */
-	int dest;     /* rank of receiver */
-	int tag=0;    /* tag for messages */
-	char message[100];        /* storage for message */
-	MPI_Status status ;   /* return status for receive */
-	
-	/* start up MPI */
-	
-	MPI_Init(&argc, &argv);
-	
-	/* find out process rank */
-	MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); 
-	
-	/* find out number of processes */
-	MPI_Comm_size(MPI_COMM_WORLD, &p); 
-	
-	
-	if (my_rank !=0){
-		/* create message */
-		sprintf(message, "Greetings from process %d!", my_rank);
-		dest = 0;
-		/* use strlen+1 so that '\0' get transmitted */
-		MPI_Send(message, strlen(message)+1, MPI_CHAR,
-		   dest, tag, MPI_COMM_WORLD);
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	else{
-		printf("From process 0: Num processes: %d\n",p);
-		for (source = 1; source < p; source++) {
-			MPI_Recv(message, 100, MPI_CHAR, source, tag,
-			      MPI_COMM_WORLD, &status);
-			printf("%s\n",message);
-		}
-		myBarrier(); // barrier in fn call should match barrier in 'then' clause above
-	}
-	/* shut down MPI */
-	MPI_Finalize(); 
-	
-	
-	return 0;
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersTiny.c b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersTiny.c
deleted file mode 100644
index ab3e244..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testMPIbarriersTiny.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "mpi.h"
-int main(int argc, char* argv[]){
-	int  my_rank; /* rank of process */
-	MPI_Init(&argc, &argv);
-	MPI_Comm_rank(MPI_COMM_WORLD, &my_rank); 
-	if (my_rank !=0){
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	else{
-		MPI_Barrier(MPI_COMM_WORLD);
-	}
-	MPI_Finalize(); 
-	return 0;
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testUPC.upc b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testUPC.upc
deleted file mode 100644
index e58e8b6..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testUPC.upc
+++ /dev/null
@@ -1,79 +0,0 @@
-/* The ubiquitous cpi program.
-   Compute pi using a simple quadrature rule
-   in parallel
-   Usage: cpi [intervals_per_thread]
-
-   BRT: from http://www.psc.edu/general/software/packages/upc/examples/cpi.upc
-   */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <upc_relaxed.h>
-
-#define INTERVALS_PER_THREAD_DEFAULT 100
-/* Add up all the inputs on all the threads.
-   When the collective spec becomes finalised this
-   will be replaced */
-
-shared double reduce_data[THREADS];
-shared double reduce_result;
-double myreduce(double myinput)
-{
-  reduce_data[MYTHREAD]=myinput;
-  upc_barrier;
-  if(MYTHREAD == 0) {
-    double result = 0;
-    int i;
-    for(i=0;i < THREADS;i++) {
-      result += reduce_data[i];
-    }
-    reduce_result = result;
-  }
-  upc_barrier;
-  return(reduce_result);
-}
-
-/* The function to be integrated */
-double f(double x)
-{
-  double dfour=4;
-  double done=1;
-  return(dfour/(done + (x*x)));
-}
-
-/* Implementation of a simple quadrature rule */
-double integrate(double left,double right,int intervals)
-{
-  int i;
-  double sum = 0;
-  double h = (right-left)/intervals;
-  double hh = h/2;
-  /* Use the midpoint rule */
-  double midpt = left + hh;
-  for(i=0;i < intervals;i++) {
-    sum += f(midpt + i*h);
-  }
-  return(h*sum);
-}
-
-int main(int argc,char **argv)
-{
-  double mystart, myend;
-  double myresult;
-  double piapprox;
-  int intervals_per_thread = INTERVALS_PER_THREAD_DEFAULT;
-  double realpi=3.141592653589793238462643;
-  /* Get the part of the range that I'm responsible for */
-  mystart = (1.0*MYTHREAD)/THREADS;
-  myend = (1.0*(MYTHREAD+1))/THREADS;
-  if(argc > 1) {
-    intervals_per_thread = atoi(argv[1]);
-  }
-  piapprox = myreduce(integrate(mystart,myend,intervals_per_thread));
-  if(MYTHREAD == 0) {
-    printf("Approx: %20.17f Error: %23.17f\n",piapprox,fabs(piapprox - realpi));
-  }
-  upc_addrfield();
-  return(0);
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testUPCmacro.upc b/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testUPCmacro.upc
deleted file mode 100644
index db444b0..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/resources/testUPCmacro.upc
+++ /dev/null
@@ -1,35 +0,0 @@
-// note: this is ridiculous code, not expected to run, just testing macro etc. recognition.
-#include <upc.h>
-#define FOO upc_lock(0)
-
-/* for any error messages returned by LAPI */
-char err_msg_buf[MPI_MAX_ERR_STRING];
-
-#define CHECK(func_and_args)                                      \
-{                                                                 \
-    int rc;                                                       \
-    if ((rc = (func_and_args)) != 0) {                            \
-        upc_string(rc, err_msg_buf);                         \
-        fprintf(stderr,                                           \
-                "UPC returns error message: %s, rc = %d\n",      \
-                 err_msg_buf, rc);                                \
-        exit(1);                                                  \
-    }                                                             \
-                                                                  \
-}
-
-
-
-void do_accumulate(foo_handle_t *handle, void *param)
-{
-	upc_addrfield(null);
-	FOO;
-
-    CHECK((upc_something(*handle, buddy,
-                       (void *)(hdr_hdl_list[buddy]), &uhdr,
-                        sizeof(uhdr_t), &(data_buffer[0]),
-                        len*(sizeof(data_buffer[0])),
-                        NULL, NULL, NULL)));
-
-}
- 
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Activator.java b/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Activator.java
deleted file mode 100644
index 4034187..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Activator.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.eclipse.ptp.pldt.tests;
-
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-//http://wiki.eclipse.org/Eclipse_Plug-in_Development_FAQ#How_do_I_read_from_a_file_that_I.27ve_included_in_my_bundle.2Fplug-in.3F
-//your BundleActivator implementation will probably look something
-//like the following
-
-public class Activator implements BundleActivator {
-	private static Activator instance;
-
-	private Bundle bundle;
-
-	public void start(BundleContext context) throws Exception {
-		instance = this;
-		bundle = context.getBundle();
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		instance = null;
-	}
-
-	public static Activator getDefault() {
-		return instance;
-	}
-
-	public Bundle getBundle() {
-		return bundle;
-	}
-
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/PldtBaseTestFramework.java b/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/PldtBaseTestFramework.java
deleted file mode 100644
index 5b62843..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/PldtBaseTestFramework.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.tests;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.eclipse.cdt.core.tests.BaseTestFramework;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.ptp.pldt.internal.common.IDs;
-import org.osgi.framework.Bundle;
-
-/**
- * Basic Test framework for PLDT tests, extends that of CDT
- * 
- * @author Beth Tibbitts
- * 
- */
-public abstract class PldtBaseTestFramework extends BaseTestFramework {
-	private static HashMap<String, ArrayList<Integer>> lineMaps = new HashMap<String, ArrayList<Integer>>();
-
-	/**
-	 * Return a file imported for use in the tests. Includes determining if the
-	 * file exists
-	 */
-	protected IFile importFile(String srcDir, String filename) throws Exception {
-		assertTrue("Missing file: " + filename, testExists(srcDir, filename));
-		IFile result = super.importFile(filename, readTestFile(srcDir, filename));
-		return result;
-	}
-
-	/**
-	 * Determine if a file exists
-	 * 
-	 * @param srcDir
-	 *            source directory in which the file should be located
-	 * @param filename
-	 *            file name of file to find
-	 * @return
-	 */
-	private boolean testExists(String srcDir, String filename) {
-		String fullname = srcDir + File.separator + filename;
-		IPath path = new Path(fullname);
-		Activator a = Activator.getDefault();
-		Bundle bundle = a.getBundle();
-		URL url = FileLocator.find(bundle, path, null);
-		if (url == null) {
-			// System.out.println(filename+" **NOT FOUND***");
-			return false;
-		}
-		return true;
-
-	}
-
-	protected String readTestFile(String srcDir, String filename) throws IOException, URISyntaxException {
-		ArrayList<Integer> lineMap = new ArrayList<Integer>(50);
-		lineMaps.put(filename, lineMap);
-		lineMap.add(0); // Offset of line 1
-		return readStream(lineMap, getClass().getResourceAsStream("/" + srcDir + "/" + filename));
-	}
-
-	protected String readStream(ArrayList<Integer> lineMap, InputStream inputStream) throws IOException {
-		StringBuffer sb = new StringBuffer(4096);
-		BufferedReader in = new BufferedReader(new InputStreamReader(inputStream));
-		for (int offset = 0, ch = in.read(); ch >= 0; ch = in.read()) {
-			sb.append((char) ch);
-			offset++;
-
-			if (ch == '\n' && lineMap != null) {
-				// System.out.println("Line " + (lineMap.size()+1) +
-				// " starts at offset " + offset);
-				lineMap.add(offset);
-			}
-		}
-		in.close();
-		return sb.toString();
-	}
-
-	protected String readStream(InputStream inputStream) throws IOException {
-		return readStream(null, inputStream);
-	}
-
-	protected String readWorkspaceFile(String filename) throws IOException, CoreException {
-		return readStream(project.getFile(filename).getContents());
-	}
-
-	/**
-	 * @param filename
-	 * @param line
-	 *            line number, starting at 1
-	 * @param col
-	 *            column number, starting at 1
-	 */
-	protected int getLineColOffset(String filename, int line, int col) {
-		return lineMaps.get(filename).get(line - 1) + (col - 1);
-	}
-
-	/**
-	 * Convenience class for sorting artifacts so we compare them in an expected
-	 * order
-	 * 
-	 * @author beth
-	 * 
-	 */
-	public class ArtifactWithLine implements Comparable {
-		public int getLineNo() {
-			return lineNo;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public IMarker getMarker() {
-			return marker;
-		}
-
-		private int lineNo;
-		private String name;
-		private IMarker marker;
-
-		public ArtifactWithLine(int line, String nam) {
-			lineNo = line;
-			name = nam;
-		}
-
-		public ArtifactWithLine(IMarker marker) {
-			try {
-				String nam = marker.getAttribute(IDs.NAME).toString();
-				String line = getLineNoAttr(marker);
-				Integer ii = Integer.decode(line);
-				int theInt = ii.intValue();
-				this.lineNo = theInt;
-				this.name = nam;
-				this.marker = marker;
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-
-		public boolean equals(ArtifactWithLine other) {
-			boolean a = this.lineNo == other.lineNo;
-			boolean b = this.name.equals(other.name);
-			return a && b;
-		}
-
-		public String toString() {
-			return lineNo + ": " + name;
-		}
-
-		boolean traceOn = false;
-
-		public int compareTo(Object o) {
-			int result;
-			String sign = "=";
-			ArtifactWithLine other = (ArtifactWithLine) o;
-			if (this.lineNo < other.lineNo) {
-				result = -1;
-				if (traceOn)
-					sign = "<";
-			} else if (this.lineNo > other.lineNo) {
-				result = 1;
-				if (traceOn)
-					sign = ">";
-			}
-			// lineNo's equal, must compare name
-			else {
-				result = this.name.compareTo(other.name);
-			}
-			// System.out.println("CompareTo: "+this+" -to- "+other+"; result is: "+result);
-			if (traceOn)
-				System.out.println("ArtifactWithLine.compareTo: " + this.lineNo + sign + other.lineNo);
-			return result;
-		}
-	}
-
-	public String getLineNoAttr(IMarker marker) throws CoreException {
-		return marker.getAttribute(IMarker.LINE_NUMBER).toString();
-	}
-
-	public String getNameAttr(IMarker marker) throws CoreException {
-		return (String) marker.getAttribute(IDs.NAME);
-	}
-
-	public String getMethodName() {
-		String name = (new Exception().getStackTrace()[1].getMethodName());
-		return name;
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/TestFortran.java b/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/TestFortran.java
deleted file mode 100644
index eb8f984..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/TestFortran.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.tests;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.pldt.internal.common.IDs;
-import org.eclipse.ptp.pldt.mpi.core.actions.RunAnalyseMPIcommandHandler;
-import org.eclipse.ptp.pldt.mpi.internal.core.MpiIDs;
-import org.eclipse.ptp.pldt.openmp.core.actions.RunAnalyseOpenMPcommandHandler;
-import org.eclipse.ptp.pldt.openmp.core.internal.OpenMPIDs;
-
-/**
- * @author Beth Tibbitts
- * 
- */
-public class TestFortran extends PldtBaseTestFramework {
-
-	@SuppressWarnings("unused")
-	public void testMPIartifacts_Fortran() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-		IFile file = importFile("resources", "HelloFortranMPI.f90");
-		assertNotNull(file);
-		// include file really not needed for Fortran but needed as arg to runResource
-		IFile mpiInclude = importFile("resources/includes", "mpi.h");
-		assertNotNull(mpiInclude);
-		String tempPath = mpiInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/mpi.h
-		System.out.println("tempPath=" + tempPath);
-		String includePath = mpiInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ mpiInclude.getFullPath().toFile().getAbsolutePath();
-		System.out.println("includePath= " + includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseMPIcommandHandler racm = new RunAnalyseMPIcommandHandler();
-
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-
-		IMarker[] markers = file.findMarkers(MpiIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: " + markers.length);
-		String temp = "{";
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			System.out.println(i + " marker: lineNo " + lineNo + " name: " + marker.getAttribute(IDs.NAME));
-			temp += "\"" + marker.getAttribute(IDs.NAME) + "\",";
-
-		}
-		temp += "}";
-		System.out.println(temp);
-
-		assertEquals(23, markers.length);
-
-		IMarker m = markers[0];
-		String name = m.getAttribute(IDs.NAME).toString();
-		for (int i = 0; i < markers.length; i++) {
-
-		}
-
-		int[] expectedLinenos = { 29, 29, 29, 44, 44, 44, 45, 63, 70, 73, 73, 76, 76, 82, 82, 83, 87, 87, 88, 96, 96, 96, 106 };
-		String[] expectedMpiTypes = { "MPI_BCAST", "MPI_INTEGER",
-				"MPI_COMM_WORLD", "MPI_REDUCE", "MPI_DOUBLE_PRECISION",
-				"MPI_SUM", "MPI_COMM_WORLD", "MPI_STATUS_SIZE", "MPI_INIT",
-				"MPI_COMM_RANK", "MPI_COMM_WORLD", "MPI_COMM_SIZE",
-				"MPI_COMM_WORLD", "MPI_SEND", "MPI_CHARACTER",
-				"MPI_COMM_WORLD", "MPI_RECV", "MPI_CHARACTER",
-				"MPI_COMM_WORLD", "MPI_BCAST", "MPI_CHARACTER",
-				"MPI_COMM_WORLD", "MPI_FINALIZE" };
-
-		ArtifactWithLine[] expectedArts = new ArtifactWithLine[expectedLinenos.length];
-		ArtifactWithLine[] markerArts = new ArtifactWithLine[markers.length];
-		for (int i = 0; i < expectedArts.length; i++) {
-			expectedArts[i] = new ArtifactWithLine(expectedLinenos[i], expectedMpiTypes[i]);
-		}
-		for (int i = 0; i < markerArts.length; i++) {
-			markerArts[i] = new ArtifactWithLine(markers[i]);
-		}
-
-		Arrays.sort(expectedArts);
-		Arrays.sort(markerArts);
-
-		assertEquals(expectedArts.length, markerArts.length);
-
-		// Since these tests are in a loop, if one fails, must inspect the Console output to know which ones finished and which one
-		// failed.
-		for (int i = 0; i < markers.length; i++) {
-			// Marker should be on the line number we expect
-			System.out.println(i + ". " + expectedArts[i].getLineNo() + " = " + markerArts[i].getLineNo());
-			assertEquals(expectedArts[i].getLineNo(), markerArts[i].getLineNo());
-
-			// Marker should be of the type name we expect
-			System.out.println("    " + expectedArts[i].getName() + " = " + markerArts[i].getName());
-			assertEquals(expectedArts[i].getName(), markerArts[i].getName());
-
-			boolean test = markerArts[i].equals(expectedArts[i]);
-			// the following never works, so we'll be happy enough with the two assertEquals above.
-			// assertEquals(expectedArts[i], markerArts[i]);
-		}
-
-	}
-
-	public void testOpenMPartifacts_Fortran() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-		IFile file = importFile("resources", "openMP.f90");
-		assertNotNull(file);
-		// include file really not needed for Fortran but needed as arg to runResource
-		IFile mpiInclude = importFile("resources/includes", "mpi.h");
-		assertNotNull(mpiInclude);
-		String tempPath = mpiInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/mpi.h
-		System.out.println("tempPath=" + tempPath);
-		String includePath = mpiInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ mpiInclude.getFullPath().toFile().getAbsolutePath();
-		System.out.println("includePath= " + includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseOpenMPcommandHandler racm = new RunAnalyseOpenMPcommandHandler();
-
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-
-		IMarker[] markers = file.findMarkers(OpenMPIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: " + markers.length);
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			System.out.println(i + " marker: lineNo " + lineNo + " name: " + marker.getAttribute(IDs.NAME));
-		}
-		// the only test of "correctness" now is the number of markers it finds
-		int expectedNum = 4;
-		System.out.println("found " + markers.length + " markers, expected " + expectedNum);
-		assertEquals(expectedNum, markers.length);
-
-		// See other tests for ideas on how to test more details in the markers found.
-
-	}
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_MPI.java b/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_MPI.java
deleted file mode 100644
index 0e7bc72..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_MPI.java
+++ /dev/null
@@ -1,350 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010,2011 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.tests;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.pldt.internal.common.IDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.eclipse.ptp.pldt.mpi.core.actions.RunAnalyseMPIcommandHandler;
-import org.eclipse.ptp.pldt.mpi.internal.core.MpiIDs;
-
-/**
- * @author beth
- * 
- */
-public class Test_MPI extends PldtBaseTestFramework {
-
-	public void testMPIartifacts() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-
-		IFile file = importFile("resources", "testMPI.c");
-		assertNotNull(file);
-
-		IFile mpiInclude = importFile("resources/includes", "mpi.h");
-		assertNotNull(mpiInclude);
-		String tempPath = mpiInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/mpi.h
-		System.out.println("tempPath=" + tempPath);
-		String includePath = mpiInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ mpiInclude.getFullPath().toFile().getAbsolutePath();
-		System.out.println("includePath= " + includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseMPIcommandHandler racm = new RunAnalyseMPIcommandHandler();
-
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-
-		IMarker[] markers = file.findMarkers(MpiIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: " + markers.length);
-		// need to sort markers, since they are not returned in a pre-determined order??
-
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			System.out.println(i + " marker: lineNo " + lineNo + " name: " + marker.getAttribute(IDs.NAME));
-		}
-
-		// When strings don't match, click on the first entry (ComparisonFailure) in the Failure Trace in the JUnit view to get a
-		// diff view
-		// assertEquals("This\nis\na\ntest", "This\nwas\na\ntest");
-
-		int[] expectedLinenos = { 17, 20, 23, 31, 37, 43 };
-		String[] expectedMpiTypes = { "MPI_Init", "MPI_Comm_rank", "MPI_Comm_size", "MPI_Send", "MPI_Recv", "MPI_Finalize" };
-		ArtifactWithLine[] expectedArts = new ArtifactWithLine[expectedLinenos.length];
-		ArtifactWithLine[] markerArts = new ArtifactWithLine[markers.length];
-		for (int i = 0; i < expectedArts.length; i++) {
-			expectedArts[i] = new ArtifactWithLine(expectedLinenos[i], expectedMpiTypes[i]);
-		}
-		for (int i = 0; i < markerArts.length; i++) {
-			markerArts[i] = new ArtifactWithLine(markers[i]);
-		}
-		Arrays.sort(expectedArts);
-		Arrays.sort(markerArts);
-
-		assertEquals(expectedArts.length, markerArts.length);
-		// Since these tests are in a loop, if one fails, must inspect the Console output to know which ones finished and which one
-		// failed.
-		for (int i = 0; i < markers.length; i++) {
-			// Marker should be on the line number we expect
-			System.out.println(i + ". " + expectedArts[i].getLineNo() + " = " + markerArts[i].getLineNo());
-			assertEquals(expectedArts[i].getLineNo(), markerArts[i].getLineNo());
-
-			// Marker should be of the type name we expect
-			System.out.println("    " + expectedArts[i].getName() + " = " + markerArts[i].getName());
-			assertEquals(expectedArts[i].getName(), markerArts[i].getName());
-
-			boolean test = markerArts[i].equals(expectedArts[i]);
-			// the following never works, so we'll be happy enough with the two assertEquals above.
-			// assertEquals(expectedArts[i], markerArts[i]);
-
-		}
-
-	}
-
-	public void testMPI_CPPartifacts() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-		IFile file = importFile("resources", "helloMPIcpp.cpp");
-		assertNotNull(file);
-
-		IFile mpiInclude = importFile("resources/includes", "mpi.h");
-		assertNotNull(mpiInclude);
-		String tempPath = mpiInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/mpi.h
-		System.out.println("tempPath=" + tempPath);
-		String includePath = mpiInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ mpiInclude.getFullPath().toFile().getAbsolutePath();
-		System.out.println("includePath= " + includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseMPIcommandHandler racm = new RunAnalyseMPIcommandHandler();
-
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-
-		IMarker[] markers = file.findMarkers(MpiIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: " + markers.length);
-		int max = markers.length; // Math.min(10, markers.length);
-		for (int i = 0; i < max; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			System.out.println(i + " marker: lineNo " + lineNo + " name: " + marker.getAttribute(IDs.NAME));
-		}
-		int[] expectedLinenos = { 22, 23, 24, 26, 37, 49, 57 };
-		final String mpiCW = "MPI::COMM_WORLD";
-		String[] expectedMpiTypes = { "MPI::Init", mpiCW, mpiCW, "MPI_Comm_rank", mpiCW, mpiCW, "MPI::Finalize" };
-		// ////////////////
-		ArtifactWithLine[] expectedArts = new ArtifactWithLine[expectedLinenos.length];
-		ArtifactWithLine[] markerArts = new ArtifactWithLine[markers.length];
-		for (int i = 0; i < expectedArts.length; i++) {
-			expectedArts[i] = new ArtifactWithLine(expectedLinenos[i], expectedMpiTypes[i]);
-		}
-		for (int i = 0; i < markerArts.length; i++) {
-			markerArts[i] = new ArtifactWithLine(markers[i]);
-		}
-		Arrays.sort(expectedArts);
-		Arrays.sort(markerArts);
-
-		assertEquals(expectedArts.length, markerArts.length);
-
-		// Since these tests are in a loop, if one fails, must inspect the Console output to know which ones finished and which one
-		// failed.
-		for (int i = 0; i < markers.length; i++) {
-			// Marker should be on the line number we expect
-			System.out.println(i + ". " + expectedArts[i].getLineNo() + " = " + markerArts[i].getLineNo());
-			assertEquals(expectedArts[i].getLineNo(), markerArts[i].getLineNo());
-
-			// Marker should be of the type name we expect
-			System.out.println("    " + expectedArts[i].getName() + " = " + markerArts[i].getName());
-			assertEquals(expectedArts[i].getName(), markerArts[i].getName());
-
-			boolean test = markerArts[i].equals(expectedArts[i]);
-			// the following never works, so we'll be happy enough with the two assertEquals above.
-			// assertEquals(expectedArts[i], markerArts[i]);
-		}
-	}
-
-	public void testMPI_CPPartifacts_wPref() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-		testMPI_CPPartifacts_wPref(true);
-
-		// this doesn't work from test: works ok and finds cpp artifacts ok with live workspace.
-		// why?? In PldtAstVisitor.processFuncName(), line 211: IName[] names = tu.getDeclarations(binding) is an empty array in
-		// Junit test.
-		// testMPI_CPPartifacts_wPref(false);
-
-		// for now, we will consider the workaround (which is the default setting) to be set "recognize artifacts by prefix" to true
-
-		// do the same for C?
-
-	}
-
-	public void testMPI_CPPartifacts_wPref(boolean prefValue) throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...  prefValue=" + prefValue);
-		MpiPlugin.getDefault().getPreferenceStore().setValue(MpiIDs.MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE, prefValue);
-		IFile file = importFile("resources", "helloMPIcpp.cpp");
-		assertNotNull(file);
-
-		IFile mpiInclude = importFile("resources/includes", "mpi.h");
-		System.out.println("Recognize APIs by prefix is set to " + prefValue);
-		assertNotNull(mpiInclude);
-		String tempPath = mpiInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/mpi.h
-		System.out.println("tempPath=" + tempPath);
-		String includePath = mpiInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ mpiInclude.getFullPath().toFile().getAbsolutePath();
-		System.out.println("includePath= " + includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseMPIcommandHandler racm = new RunAnalyseMPIcommandHandler();
-
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-
-		IMarker[] markers = file.findMarkers(MpiIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: " + markers.length);
-		int max = markers.length; // Math.min(10, markers.length);
-		for (int i = 0; i < max; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			System.out.println(i + ". marker: lineNo " + lineNo + " name: " + marker.getAttribute(IDs.NAME));
-		}
-
-		int[] expectedLinenos = { 22, 23, 24, 26, 37, 49, 57 };
-		final String mpiCW = "MPI::COMM_WORLD";
-		String[] expectedMpiTypes = { "MPI::Init", mpiCW, mpiCW, "MPI_Comm_rank", mpiCW, mpiCW, "MPI::Finalize" };
-
-		ArtifactWithLine[] expectedArts = new ArtifactWithLine[expectedLinenos.length];
-		ArtifactWithLine[] markerArts = new ArtifactWithLine[markers.length];
-		for (int i = 0; i < expectedArts.length; i++) {
-			expectedArts[i] = new ArtifactWithLine(expectedLinenos[i], expectedMpiTypes[i]);
-		}
-		for (int i = 0; i < markerArts.length; i++) {
-			markerArts[i] = new ArtifactWithLine(markers[i]);
-		}
-		Arrays.sort(expectedArts);
-		Arrays.sort(markerArts);
-
-		assertEquals(expectedArts.length, markerArts.length);
-
-		// Since these tests are in a loop, if one fails, must inspect the Console output to know which ones finished and which one
-		// failed.
-		for (int i = 0; i < markers.length; i++) {
-			// Marker should be on the line number we expect
-			System.out.println(i + ". " + expectedArts[i].getLineNo() + " = " + markerArts[i].getLineNo());
-			assertEquals(expectedArts[i].getLineNo(), markerArts[i].getLineNo());
-
-			// Marker should be of the type name we expect
-			System.out.println("    " + expectedArts[i].getName() + " = " + markerArts[i].getName());
-			assertEquals(expectedArts[i].getName(), markerArts[i].getName());
-
-			boolean test = markerArts[i].equals(expectedArts[i]);
-			// the following never works, so we'll be happy enough with the two assertEquals above.
-			// assertEquals(expectedArts[i], markerArts[i]);
-		}
-
-	}
-
-	public void testMPIartifactsInMacro() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-		MpiPlugin.getDefault().getPreferenceStore().setValue(MpiIDs.MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE, true);
-		IFile file = importFile("resources", "testMPIMacro.c");
-		assertNotNull(file);
-
-		IFile mpiInclude = importFile("resources/includes", "mpi.h");
-		assertNotNull(mpiInclude);
-		String tempPath = mpiInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/mpi.h
-		System.out.println("tempPath=" + tempPath);
-		String includePath = mpiInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ mpiInclude.getFullPath().toFile().getAbsolutePath();
-		System.out.println("includePath= " + includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseMPIcommandHandler racm = new RunAnalyseMPIcommandHandler();
-
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-
-		IMarker[] markers = file.findMarkers(MpiIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: " + markers.length);
-		// need to sort markers, since they are not returned in a pre-determined order??
-
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			System.out.println(i + " marker: lineNo " + lineNo + " name: " + marker.getAttribute(IDs.NAME));
-		}
-
-		// When strings don't match, click on the first entry (ComparisonFailure) in the Failure Trace in the JUnit view to get a
-		// diff view
-		// assertEquals("This\nis\na\ntest", "This\nwas\na\ntest");
-
-		int[] expectedLinenos = { 26, 27, 28, 28 };
-		// the "(" is just the beginning of a long expanded macro. will not do exact match. see below.
-		String[] expectedMpiTypes = { "MPI_Init  (FOO)", "MPI_Send", "MPI_Send  (", "MPI_Address  (" };
-		ArtifactWithLine[] expectedArts = new ArtifactWithLine[expectedLinenos.length];
-		ArtifactWithLine[] markerArts = new ArtifactWithLine[markers.length];
-		for (int i = 0; i < expectedArts.length; i++) {
-			expectedArts[i] = new ArtifactWithLine(expectedLinenos[i], expectedMpiTypes[i]);
-		}
-		for (int i = 0; i < markerArts.length; i++) {
-			markerArts[i] = new ArtifactWithLine(markers[i]);
-		}
-		Arrays.sort(expectedArts);
-		Arrays.sort(markerArts);
-
-		assertEquals(expectedArts.length, markerArts.length);
-		// Since these tests are in a loop, if one fails, must inspect the Console output to know which ones finished and which one
-		// failed.
-		for (int i = 0; i < markers.length; i++) {
-			// Marker should be on the line number we expect
-			System.out.println(i + ". " + expectedArts[i].getLineNo() + " = " + markerArts[i].getLineNo());
-			assertEquals(expectedArts[i].getLineNo(), markerArts[i].getLineNo());
-
-			// Marker should be of the type name we expect
-			System.out.println("    " + expectedArts[i].getName() + " = " + markerArts[i].getName());
-			// assertEquals(expectedArts[i].getName(), markerArts[i].getName());
-			// Note: the whole text of the expanded artifact name is longer; we're not doing an exact match here
-			String expectedName = expectedArts[i].getName();
-			assertTrue(markerArts[i].getName().startsWith(expectedName));
-			boolean test = markerArts[i].equals(expectedArts[i]);
-
-		}
-
-	}
-
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_MPI_barriers.java b/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_MPI_barriers.java
deleted file mode 100644
index d140f9f..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_MPI_barriers.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.tests;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ptp.pldt.mpi.analysis.actions.RunAnalyseMPIAnalysiscommandHandler;
-
-/**
- * 
- * Test MPI Barrier Analysis
- * 
- * Current status of tests: 29 April 2010
- * 
- * testMPI_barriers_tiny():
- * OK, this very trivial test case of two barriers does match, and no error is found
- * 
- * testMPI_barriers_helloBarrier
- * (not working) Barriers are not found to be in the same set, and a barrier error is found when it should not.
- * 
- * testMPI_barriers_error()
- * (not working) does not detect an error, when it should.
- * 
- * Most changes are in org.eclipse.ptp.pldt.mpi.analysis.analysis package
- * most significant changes are in MPIMVAnalaysis.java
- * notation of my initials (BRT) accompany most changes made by me, and notes
- * regarding these problems.
- * See also https://bugs.eclipse.org/bugs/show_bug.cgi?id=306064 Barrier Analysis bug
- * 
- * @author beth
- * 
- */
-public class Test_MPI_barriers extends PldtBaseTestFramework {
-
-	public void testMPI_barriers_tiny() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-		int[] expectedMarkerLocn = { 7, 10 };
-		BarrierSetBasics bsb = new BarrierSetBasics(2, 2);// 2 sets, 2 members in each
-		barrierBase("testMPIbarriersTiny.c", expectedMarkerLocn, bsb);
-	}
-
-	public void testMPI_barriers_helloBarrier() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-		int[] expectedMarkerLocn = { 33, 42 };
-		BarrierSetBasics bsb = new BarrierSetBasics(2, 2);
-		barrierBase("testMPIbarriers.c", expectedMarkerLocn, bsb);
-	}
-
-	public void testMPI_barriers_helloBarrierFnCall() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-		int[] expectedMarkerLocn = { 6, 36 };
-		BarrierSetBasics bsb = new BarrierSetBasics(2, 2);
-		barrierBase("testMPIbarriersFnCall.c", expectedMarkerLocn, bsb);
-	}
-
-	public void testMPI_barriers_error() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-		int[] expectedMarkerLocn = { 33 };
-		BarrierSetBasics bsb = new BarrierSetBasics(1, 1, true);
-		barrierBase("testMPIbarriersErr.c", expectedMarkerLocn, bsb);
-	}
-
-	public void barrierBase(String filename, int[] expectedLinenos, BarrierSetBasics bsb) throws Exception {
-
-		IFile file = importFile("resources", filename);
-		assertNotNull(file);
-
-		IFile mpiInclude = importFile("resources/includes", "mpi.h");
-		assertNotNull(mpiInclude);
-		String tempPath = mpiInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/mpi.h
-		System.out.println("tempPath=" + tempPath);
-		String includePath = mpiInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ mpiInclude.getFullPath().toFile().getAbsolutePath();
-		System.out.println("includePath= " + includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseMPIAnalysiscommandHandler racm = new RunAnalyseMPIAnalysiscommandHandler();
-
-		// racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-		// =================================
-		IStructuredSelection selection = new StructuredSelection(file);
-		final boolean reportErrors = false;
-		boolean error = racm.analyseBarriers(selection, reportErrors);
-		System.out.println("Barrier error?=" + error + "; expected " + bsb.getError());
-		if (bsb.getError()) {
-			assertTrue("Expected to find barrier error in " + filename, error);
-		}
-		else {
-			assertFalse("No barrier errors should be found in " + filename, error);
-		}
-
-		String barrierMarkerID = org.eclipse.ptp.pldt.mpi.analysis.internal.IDs.barrierMarkerID;
-
-		// =================================
-		IMarker[] markers = file.findMarkers(barrierMarkerID, true, IResource.DEPTH_INFINITE);
-		int expectedNumber = expectedLinenos.length;
-		assertNotNull(expectedNumber + " Barrier Markers should be found", markers);
-		System.out.println("numMarkers: " + markers.length + "    number expected: " + expectedNumber);
-		assertEquals(expectedNumber + " barrier markers should be found on " + filename, expectedNumber, markers.length);
-
-		// ////////////
-		ArtifactWithLine[] expectedArts = new ArtifactWithLine[expectedLinenos.length];
-		ArtifactWithLine[] markerArts = new ArtifactWithLine[markers.length];
-		for (int i = 0; i < expectedArts.length; i++) {
-			expectedArts[i] = new ArtifactWithLine(expectedLinenos[i], "barrier");
-		}
-		for (int i = 0; i < markerArts.length; i++) {
-			markerArts[i] = new ArtifactWithLine(markers[i]);
-		}
-		Arrays.sort(expectedArts);
-		Arrays.sort(markerArts);
-
-		assertEquals(expectedArts.length, markerArts.length);
-
-		// Since these tests are in a loop, if one fails, must inspect the Console output to know which ones finished and which one
-		// failed.
-		for (int i = 0; i < markers.length; i++) {
-			// Marker should be on the line number we expect
-			System.out.println(i + ". " + expectedArts[i].getLineNo() + " = " + markerArts[i].getLineNo());
-			assertEquals(expectedArts[i].getLineNo(), markerArts[i].getLineNo());
-			// /
-			// IMarker marker = markers[i];
-			// //showMarker(marker);
-			// int lineNo=(Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			// System.out.println(i+ " marker: lineNo "+lineNo+
-			// " name: "+marker.getAttribute(IDs.NAME)+"   expectedLocn: "+expectedLinenos[i]);
-			// assertEquals("expected barrier marker locn",expectedLinenos[i], lineNo);
-		}
-
-		barrierSetTest(filename, file, bsb);
-
-	}
-
-	public void barrierSetTest(String filename, IFile file, BarrierSetBasics bsb) throws CoreException {
-		IMarker[] markers;
-		// Barrier Sets
-		final String barrierSetMarkerID = org.eclipse.ptp.pldt.mpi.analysis.internal.IDs.matchingSetMarkerID;
-		final String barrierParentID = org.eclipse.ptp.pldt.mpi.analysis.internal.IDs.parentIDAttr;
-		final String barrierMyID = org.eclipse.ptp.pldt.mpi.analysis.internal.IDs.myIDAttr;
-
-		markers = file.findMarkers(barrierSetMarkerID, true, IResource.DEPTH_INFINITE);
-		// assertNotNull("2 Barrier Markers should be found",markers);
-
-		int[] expectedMarkerLocn2 = { 7, 10, 7, 10, 7, 10 };// actual values are unused? 6 members: 2 parents, two child nodes each?
-
-		int expectedLen = expectedMarkerLocn2.length;
-		System.out.println("===============Barrier Sets: numMarkers: " + markers.length + "  expected: " + expectedLen);
-		// assertEquals(expectedLen+" barrier markers should be found on "+filename,expectedLen, markers.length);
-
-		// int expectedRoots=2;
-		// get parent root markers (parentID=0)
-		List<IMarker> setRoots = new ArrayList<IMarker>();
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-
-			int parentID = ((Integer) marker.getAttribute(barrierParentID)).intValue();
-			if (parentID == 0) {
-				setRoots.add(marker);
-				System.out.println("found set starting at line " + lineNo);
-			}
-		}
-		System.out.println("num barrier sets found: " + setRoots.size() + "    num expected: " + bsb.getNumSets());
-		assertEquals("Number of barrier sets", bsb.getNumSets(), setRoots.size());
-
-		// list what's in each set
-		for (Iterator<IMarker> iterator = setRoots.iterator(); iterator.hasNext();) {
-			IMarker iMarker = (IMarker) iterator.next();
-			int setParentID = ((Integer) iMarker.getAttribute(barrierMyID)).intValue();
-			int setParentLineNo = ((Integer) iMarker.getAttribute(IMarker.LINE_NUMBER)).intValue();
-			System.out.println("set parentID: " + setParentID + " lineNo: " + setParentLineNo);
-			ArrayList<IMarker> barrierSet = new ArrayList<IMarker>();
-			for (int i = 0; i < markers.length; i++) {
-				IMarker setMemberMarker = markers[i];
-				int parentID = ((Integer) setMemberMarker.getAttribute(barrierParentID)).intValue();
-				int memberID = ((Integer) setMemberMarker.getAttribute(barrierMyID)).intValue();
-				if (parentID == setParentID) {
-					int lineNo = (Integer) setMemberMarker.getAttribute(IMarker.LINE_NUMBER);
-					System.out.println("  set member: lineNo: " + lineNo + "  parentID: " + parentID + " memberMyID: " + memberID);
-					barrierSet.add(setMemberMarker);
-				}
-			}
-			System.out.println("Barrier set with parentID " + setParentID + " expected " + bsb.numInEachSet + " members and found "
-					+ barrierSet.size() + " members.");
-		}
-		// System.out.println("Barrier Sets: expect "+expectedRoots+"; found "+setRoots.size());
-		// assertEquals("Expected "+expectedRoots+" barrier set roots", expectedRoots,setRoots.size());
-		// // for each set, inspect what we expect in the set
-		// for (int i = 0; i < markers.length; i++) {
-		// IMarker marker = markers[i];
-		// int lineNo=(Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-		//
-		// int parentID = ((Integer) marker.getAttribute(barrierParentID)).intValue();
-		// System.out.println(i+ " marker: lineNo "+lineNo+ " name: "+marker.getAttribute(IDs.NAME)
-		// +" parent="+parentID);
-		//
-		// //assertEquals("expected barrier marker locn",expectedMarkerLocn2[i], lineNo);
-		// }
-		System.out.println("end barrier set inspection. ");
-	}
-
-	String showMarker(IMarker marker) {
-		return showMarker(marker, "");
-	}
-
-	String showMarker(IMarker marker, String title) {
-		StringBuffer buf = new StringBuffer(" ");
-		buf.append("Marker: " + title);
-		Map map = null;
-
-		try {
-			map = marker.getAttributes();
-			Set keyset = map.keySet();
-			System.out.println("Marker has " + keyset.size() + " values");
-			for (Iterator<String> iterator = keyset.iterator(); iterator.hasNext();) {
-				String key = (String) iterator.next();
-				Object obj = marker.getAttribute(key);
-				String value = obj.toString();
-				System.out.println("  " + key + ": " + value);
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		return "";
-	}
-
-	/**
-	 * Holds the basic parameters of what we expect to find in a Barrier Set. <br>
-	 * Admittedly lightweight for now
-	 * 
-	 * @author beth
-	 * 
-	 */
-	class BarrierSetBasics {
-
-		int numSets;
-		int numInEachSet; // note: all sets don't have to be the same size but in our very simple test cases so far, this is true
-		boolean hasError = false;
-
-		BarrierSetBasics(int numSets, int numInEachSet) {
-			this.numSets = numSets;
-			this.numInEachSet = numInEachSet;
-
-		}
-
-		BarrierSetBasics(int numSets, int numInEachSet, boolean hasError) {
-			this(numSets, numInEachSet);
-			this.hasError = hasError;
-
-		}
-
-		public int getNumSets() {
-			return numSets;
-		}
-
-		public int getNumInEachSet() {
-			return numInEachSet;
-		}
-
-		public boolean getError() {
-			return hasError;
-		}
-	}
-
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_OpenMP.java b/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_OpenMP.java
deleted file mode 100644
index 7f33d32..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_OpenMP.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010,2011 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.tests;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.cdt.core.dom.ast.IASTNode;
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.cdt.internal.core.dom.parser.ASTNode;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.pldt.common.Artifact;
-import org.eclipse.ptp.pldt.common.ArtifactManager;
-import org.eclipse.ptp.pldt.common.IArtifact;
-import org.eclipse.ptp.pldt.internal.common.IDs;
-import org.eclipse.ptp.pldt.openmp.analysis.PAST.PASTOMPPragma;
-import org.eclipse.ptp.pldt.openmp.core.actions.RunAnalyseOpenMPcommandHandler;
-import org.eclipse.ptp.pldt.openmp.core.internal.OpenMPIDs;
-
-/**
- * @author beth
- * 
- */
-public class Test_OpenMP extends PldtBaseTestFramework {
-
-	public void testOpenMPartifacts() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-
-		IFile file = importFile("resources", "helloOpenMP.c");
-		assertNotNull(file);
-
-		IFile openmpInclude = importFile("resources/includes", "omp.h");
-		assertNotNull(openmpInclude);
-		String tempPath = openmpInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/mpi.h
-		// System.out.println("tempPath="+tempPath);
-		String includePath = openmpInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ openmpInclude.getFullPath().toFile().getAbsolutePath();
-		// System.out.println("includePath= "+includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseOpenMPcommandHandler racm = new RunAnalyseOpenMPcommandHandler();
-
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-
-		IMarker[] markers = file.findMarkers(OpenMPIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: " + markers.length);
-		// need to sort markers, since they are not returned in a pre-determined order??
-
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			System.out.println(i + " marker: lineNo " + lineNo + " name: " + marker.getAttribute(IDs.NAME));
-		}
-
-		// When strings don't match, click on the first entry (ComparisonFailure) in the Failure Trace in the JUnit view to get a
-		// diff view
-		// assertEquals("This\nis\na\ntest", "This\nwas\na\ntest");
-		// there really should be three, including a pragma. testOpenMP_pragmas will
-		// concentrate on these
-		int[] expectedLinenos = { 12, 14, 20 };
-		final String pragma = "#pragma omp parallel private(numThreads, tid)";
-		String[] expectedOpenMPTypes = { pragma, "omp_get_thread_num", "omp_get_num_threads" };
-		ArtifactWithLine[] expectedArts = new ArtifactWithLine[expectedLinenos.length];
-		ArtifactWithLine[] markerArts = new ArtifactWithLine[markers.length];
-		for (int i = 0; i < expectedArts.length; i++) {
-			expectedArts[i] = new ArtifactWithLine(expectedLinenos[i], expectedOpenMPTypes[i]);
-		}
-		for (int i = 0; i < markerArts.length; i++) {
-			markerArts[i] = new ArtifactWithLine(markers[i]);
-		}
-		Arrays.sort(expectedArts);
-		Arrays.sort(markerArts);
-
-		assertEquals(expectedArts.length, markerArts.length);
-		// Since these tests are in a loop, if one fails, must inspect the Console output to know which ones finished and which one
-		// failed.
-		for (int i = 0; i < markers.length; i++) {
-			// Marker should be on the line number we expect
-			System.out.println(i + ". " + expectedArts[i].getLineNo() + " = " + markerArts[i].getLineNo());
-			assertEquals(expectedArts[i].getLineNo(), markerArts[i].getLineNo());
-
-			// Marker should be of the type name we expect
-			System.out.println("    " + expectedArts[i].getName() + " = " + markerArts[i].getName());
-			assertEquals(expectedArts[i].getName(), markerArts[i].getName());
-
-			boolean test = markerArts[i].equals(expectedArts[i]);
-			System.out.println("   markerArts.equals expectedArts: " + test);
-			// the following never works, so we'll be happy enough with the two assertEquals above.
-			// assertEquals(expectedArts[i], markerArts[i]);
-
-		}
-
-	}
-
-	public void testOpenMP_pragmas() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-
-		IFile file = importFile("resources", "helloOpenMPpragmas.c");
-		assertNotNull(file);
-
-		IFile openmpInclude = importFile("resources/includes", "omp.h");
-		assertNotNull(openmpInclude);
-		String tempPath = openmpInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/mpi.h
-		// System.out.println("tempPath="+tempPath);
-		String includePath = openmpInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ openmpInclude.getFullPath().toFile().getAbsolutePath();
-		// System.out.println("includePath= "+includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseOpenMPcommandHandler racm = new RunAnalyseOpenMPcommandHandler();
-
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-
-		IMarker[] markers = file.findMarkers(OpenMPIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: " + markers.length);
-		// need to sort markers, since they are not returned in a pre-determined order??
-
-		// When strings don't match, click on the first entry (ComparisonFailure) in the Failure Trace in the JUnit view to get a
-		// diff view
-		// assertEquals("This\nis\na\ntest", "This\nwas\na\ntest");
-
-		int[] expectedLinenos = { 21, 23, 29, 34, 36, 40 };
-		final String prag = "#pragma omp parallel private(numThreads, tid)";
-		final String prag2 = "#pragma omp parallel shared(n,a,b)";
-		final String pragFor = "#pragma omp for";
-		final String pragParFor = "#pragma omp parallel for";
-		String[] expectedMpiTypes = { prag, "omp_get_thread_num", "omp_get_num_threads", prag2, pragFor, pragParFor };
-		ArtifactWithLine[] expectedArts = new ArtifactWithLine[expectedLinenos.length];
-		ArtifactWithLine[] markerArts = new ArtifactWithLine[markers.length];
-		for (int i = 0; i < expectedArts.length; i++) {
-			expectedArts[i] = new ArtifactWithLine(expectedLinenos[i], expectedMpiTypes[i]);
-		}
-		for (int i = 0; i < markerArts.length; i++) {
-			markerArts[i] = new ArtifactWithLine(markers[i]);
-		}
-		Arrays.sort(expectedArts);
-		Arrays.sort(markerArts);
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			System.out.println(i + " marker: lineNo " + lineNo + " name: " + marker.getAttribute(IDs.NAME));
-		}
-
-		// should find pragma and two other openmp artifacts
-		assertEquals(expectedArts.length, markerArts.length);
-		// Since these tests are in a loop, if one fails, must inspect the Console output to know which ones finished and which one
-		// failed.
-		for (int i = 0; i < markers.length; i++) {
-			// Marker should be on the line number we expect
-			System.out.println(i + ". " + expectedArts[i].getLineNo() + " = " + markerArts[i].getLineNo());
-			assertEquals(expectedArts[i].getLineNo(), markerArts[i].getLineNo());
-
-			// Marker should be of the type name we expect
-			System.out.println("    " + expectedArts[i].getName() + " = " + markerArts[i].getName());
-			assertEquals(expectedArts[i].getName(), markerArts[i].getName());
-
-			boolean test = markerArts[i].equals(expectedArts[i]);
-			// the following never works, so we'll be happy enough with the two assertEquals above.
-			// assertEquals(expectedArts[i], markerArts[i]);
-
-		}
-		System.out.println("== Check regions for 'show pragma region' usage");
-		// check information needed for pragma show region action
-		RegionInfo ri0 = getRegion(ArtifactManager.getArtifact(markerArts[0].getMarker()));
-		assertNotNull(ri0);
-		System.out.println("0. region offset:" + ri0.offset + " length:" + ri0.length + "  " + markerArts[0].getName());
-		assertEquals(642, ri0.offset);
-		assertEquals(290, ri0.length);
-
-		RegionInfo ri1 = getRegion(ArtifactManager.getArtifact(markerArts[1].getMarker()));
-		assertNull(ri1);
-		// System.out.println("1. region offset:"+ri1.offset+ " length:"+ri1.length);
-		System.out.println("1. not a pragma    " + markerArts[1].getName());
-
-		RegionInfo ri2 = getRegion(ArtifactManager.getArtifact(markerArts[2].getMarker()));
-		assertNull(ri2);
-		System.out.println("2. not a pragma    " + markerArts[2].getName());
-		// assertEquals(642,ri0.offset);
-		// assertEquals(290, ri0.length);
-
-		RegionInfo ri3 = getRegion(ArtifactManager.getArtifact(markerArts[3].getMarker()));
-		assertNotNull(ri3);
-		System.out.println("3. region offset:" + ri3.offset + " length:" + ri3.length + "  " + markerArts[3].getName());
-		assertEquals(1014, ri3.offset);
-		assertEquals(214, ri3.length);
-
-		RegionInfo ri4 = getRegion(ArtifactManager.getArtifact(markerArts[4].getMarker()));
-		assertNotNull(ri4);
-		System.out.println("4. region offset:" + ri4.offset + " length:" + ri4.length + "  " + markerArts[4].getName());
-		assertEquals(1038, ri4.offset);
-		assertEquals(187, ri4.length);
-
-		RegionInfo ri5 = getRegion(ArtifactManager.getArtifact(markerArts[5].getMarker()));
-		assertNotNull(ri5);
-		System.out.println("5. region offset:" + ri5.offset + " length:" + ri5.length + "  " + markerArts[5].getName());
-		assertEquals(1170, ri5.offset);
-		assertEquals(50, ri5.length);
-
-		System.out.println("done");
-
-	}
-
-	/**
-	 * copied from OpenMPArtifactView.makeShowInfoAction() more or less - not ideal
-	 * 
-	 * @param a
-	 */
-	RegionInfo getRegion(IArtifact a) {
-		Artifact artifact = (Artifact) a;
-		Object p = artifact.getArtifactAssist();
-		if (p == null || !(p instanceof PASTOMPPragma))
-			return null;
-		;
-		PASTOMPPragma ompPragma = (PASTOMPPragma) p;
-		IASTNode iRegion = ompPragma.getRegion();
-		ASTNode region = (iRegion instanceof ASTNode ? (ASTNode) iRegion : null);
-		if (region == null)
-			return null;
-		int offset = ompPragma.getRegionOffset();
-		int length = ompPragma.getRegionLength();
-		RegionInfo ri = new RegionInfo(offset, length);
-		return ri;
-
-	}
-
-	protected class RegionInfo {
-		int offset;
-		int length;
-
-		RegionInfo(int offset, int length) {
-			this.offset = offset;
-			this.length = length;
-		}
-	}
-
-}
diff --git a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_UPC.java b/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_UPC.java
deleted file mode 100644
index f413a5d..0000000
--- a/tools/pldt/org.eclipse.ptp.pldt.tests/src/org/eclipse/ptp/pldt/tests/Test_UPC.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.tests;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.cdt.core.model.CoreModel;
-import org.eclipse.cdt.core.model.ICElement;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ptp.pldt.internal.common.IDs;
-import org.eclipse.ptp.pldt.mpi.core.MpiPlugin;
-import org.eclipse.ptp.pldt.mpi.internal.core.MpiIDs;
-import org.eclipse.ptp.pldt.upc.actions.RunAnalyseUPCcommandHandler;
-import org.eclipse.ptp.pldt.upc.internal.UPCIDs;
-
-/**
- * @author beth
- * 
- */
-public class Test_UPC extends PldtBaseTestFramework {
-
-	public void testUPCartifacts() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-
-		IFile file = importFile("resources", "testUPC.upc");
-		assertNotNull(file);
-
-		IFile upcInclude = importFile("resources/includes", "upc.h");
-		assertNotNull(upcInclude);
-		String tempPath = upcInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/upc.h
-		System.out.println("tempPath=" + tempPath);
-		String includePath = upcInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ upcInclude.getFullPath().toFile().getAbsolutePath();
-		System.out.println("includePath= " + includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseUPCcommandHandler racm = new RunAnalyseUPCcommandHandler();
-
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-
-		IMarker[] markers = file.findMarkers(UPCIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: " + markers.length);
-		// need to sort markers, since they are not returned in a pre-determined order??
-
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			System.out.println(i + " marker: lineNo " + lineNo + " name: " + marker.getAttribute(IDs.NAME));
-		}
-
-		// When strings don't match, click on the first entry (ComparisonFailure) in the Failure Trace in the JUnit view to get a
-		// diff view
-		// assertEquals("This\nis\na\ntest", "This\nwas\na\ntest");
-
-		int[] expectedLinenos = { 77 };
-		String[] expectedTypes = { "upc_addrfield" };
-		ArtifactWithLine[] expectedArts = new ArtifactWithLine[expectedLinenos.length];
-		ArtifactWithLine[] markerArts = new ArtifactWithLine[markers.length];
-		for (int i = 0; i < expectedArts.length; i++) {
-			expectedArts[i] = new ArtifactWithLine(expectedLinenos[i], expectedTypes[i]);
-		}
-		for (int i = 0; i < markerArts.length; i++) {
-			markerArts[i] = new ArtifactWithLine(markers[i]);
-		}
-		Arrays.sort(expectedArts);
-		Arrays.sort(markerArts);
-
-		assertEquals(expectedArts.length, markerArts.length);
-		// Since these tests are in a loop, if one fails, must inspect the Console output to know which ones finished and which one
-		// failed.
-		for (int i = 0; i < markers.length; i++) {
-			// Marker should be on the line number we expect
-			System.out.println(i + ". " + expectedArts[i].getLineNo() + " = " + markerArts[i].getLineNo());
-			assertEquals(expectedArts[i].getLineNo(), markerArts[i].getLineNo());
-
-			// Marker should be of the type name we expect
-			System.out.println("    " + expectedArts[i].getName() + " = " + markerArts[i].getName());
-			assertEquals(expectedArts[i].getName(), markerArts[i].getName());
-
-			// the following never works, so we'll be happy enough with the two assertEquals above.
-			// assertEquals(expectedArts[i], markerArts[i]);
-
-		}
-
-	}
-
-	public void testUPCartifactsWithMacro() throws Exception {
-		System.out.println("\n==> " + getMethodName() + "()...");
-		MpiPlugin.getDefault().getPreferenceStore().setValue(MpiIDs.MPI_RECOGNIZE_APIS_BY_PREFIX_ALONE, true);
-		IFile file = importFile("resources", "testUPCmacro.upc");
-		assertNotNull(file);
-
-		IFile upcInclude = importFile("resources/includes", "upc.h");
-		assertNotNull(upcInclude);
-		String tempPath = upcInclude.getFullPath().toOSString();// includePath= /RegressionTestProject/upc.h
-		System.out.println("tempPath=" + tempPath);
-		String includePath = upcInclude.getWorkspace().getRoot().getRawLocation().toOSString()
-				+ upcInclude.getFullPath().toFile().getAbsolutePath();
-		System.out.println("includePath= " + includePath);
-
-		assertTrue(file instanceof IAdaptable);
-
-		CoreModel.getDefault().getCModel().makeConsistent(new NullProgressMonitor());// jeff
-
-		assertNotNull(cproject);
-		ICElement ce = cproject.findElement(file.getFullPath());
-
-		// ICElement covers folders and translationunits
-		// final ICElement ce = (ICElement) ((IAdaptable)file).getAdapter(ICElement.class);
-		assertNotNull(ce);
-		List<String> includes = Arrays.asList(new String[] { includePath });
-		RunAnalyseUPCcommandHandler racm = new RunAnalyseUPCcommandHandler();
-
-		racm.runResource(new NullProgressMonitor(), ce, 0, includes);
-
-		IMarker[] markers = file.findMarkers(UPCIDs.MARKER_ID, true, IResource.DEPTH_INFINITE);
-		assertNotNull(markers);
-		System.out.println("numMarkers: " + markers.length);
-		// need to sort markers, since they are not returned in a pre-determined order??
-
-		for (int i = 0; i < markers.length; i++) {
-			IMarker marker = markers[i];
-			int lineNo = (Integer) marker.getAttribute(IMarker.LINE_NUMBER);
-			System.out.println(i + " marker: lineNo " + lineNo + " name: " + marker.getAttribute(IDs.NAME));
-		}
-
-		// When strings don't match, click on the first entry (ComparisonFailure) in the Failure Trace in the JUnit view to get a
-		// diff view
-		// assertEquals("This\nis\na\ntest", "This\nwas\na\ntest");
-
-		int[] expectedLinenos = { 25, 26, 28, 28 };
-		String[] expectedTypes = { "upc_addrfield", "upc_lock  (FOO)", "upc_something  (CHECK", "upc_string  (CHECK" };
-		ArtifactWithLine[] expectedArts = new ArtifactWithLine[expectedLinenos.length];
-		ArtifactWithLine[] markerArts = new ArtifactWithLine[markers.length];
-		for (int i = 0; i < expectedArts.length; i++) {
-			expectedArts[i] = new ArtifactWithLine(expectedLinenos[i], expectedTypes[i]);
-		}
-		for (int i = 0; i < markerArts.length; i++) {
-			markerArts[i] = new ArtifactWithLine(markers[i]);
-		}
-		Arrays.sort(expectedArts);
-		Arrays.sort(markerArts);
-
-		assertEquals(expectedArts.length, markerArts.length);
-		// Since these tests are in a loop, if one fails, must inspect the Console output to know which ones finished and which one
-		// failed.
-		for (int i = 0; i < markers.length; i++) {
-			// Marker should be on the line number we expect
-			System.out.println(i + ". " + expectedArts[i].getLineNo() + " = " + markerArts[i].getLineNo());
-			assertEquals(expectedArts[i].getLineNo(), markerArts[i].getLineNo());
-
-			// Marker should be of the type name we expect - note macro is fairly long so we only test startsWith
-			System.out.println("    " + expectedArts[i].getName() + " = " + markerArts[i].getName());
-			assertTrue(markerArts[i].getName().startsWith(expectedArts[i].getName()));
-
-		}
-
-	}
-}
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);
-	}
-}